Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
26a8bce2
Commit
26a8bce2
authored
Oct 15, 2016
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change auto_now to auto_now_add
parent
3383b2b5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
18 deletions
+25
-18
models.py
apps/assets/models.py
+10
-10
models.py
apps/audits/models.py
+4
-4
models.py
apps/perms/models.py
+1
-1
models.py
apps/terminal/models.py
+10
-3
No files found.
apps/assets/models.py
View file @
26a8bce2
...
@@ -19,7 +19,7 @@ class IDC(models.Model):
...
@@ -19,7 +19,7 @@ class IDC(models.Model):
address
=
models
.
CharField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
"Address"
))
address
=
models
.
CharField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
"Address"
))
intranet
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Intranet'
))
intranet
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Intranet'
))
extranet
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Extranet'
))
extranet
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Extranet'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
null
=
True
,
verbose_name
=
_
(
'Date added'
))
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
null
=
True
,
verbose_name
=
_
(
'Date added'
))
operator
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Operator'
))
operator
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Operator'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
...
@@ -62,7 +62,7 @@ class AssetExtend(models.Model):
...
@@ -62,7 +62,7 @@ class AssetExtend(models.Model):
key
=
models
.
CharField
(
max_length
=
64
,
verbose_name
=
_
(
'KEY'
))
key
=
models
.
CharField
(
max_length
=
64
,
verbose_name
=
_
(
'KEY'
))
value
=
models
.
CharField
(
max_length
=
64
,
verbose_name
=
_
(
'VALUE'
))
value
=
models
.
CharField
(
max_length
=
64
,
verbose_name
=
_
(
'VALUE'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
"Created by"
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
"Created by"
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
null
=
True
)
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
null
=
True
)
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
def
__unicode__
(
self
):
def
__unicode__
(
self
):
...
@@ -98,7 +98,7 @@ class AdminUser(models.Model):
...
@@ -98,7 +98,7 @@ class AdminUser(models.Model):
_public_key
=
models
.
CharField
(
max_length
=
4096
,
blank
=
True
,
verbose_name
=
_
(
'SSH public key'
))
_public_key
=
models
.
CharField
(
max_length
=
4096
,
blank
=
True
,
verbose_name
=
_
(
'SSH public key'
))
as_default
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'As default'
))
as_default
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'As default'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
null
=
True
)
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
null
=
True
)
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
verbose_name
=
_
(
'Created by'
))
def
__unicode__
(
self
):
def
__unicode__
(
self
):
...
@@ -169,7 +169,7 @@ class SystemUser(models.Model):
...
@@ -169,7 +169,7 @@ class SystemUser(models.Model):
shell
=
models
.
CharField
(
max_length
=
64
,
default
=
'/bin/bash'
,
verbose_name
=
_
(
'Shell'
))
shell
=
models
.
CharField
(
max_length
=
64
,
default
=
'/bin/bash'
,
verbose_name
=
_
(
'Shell'
))
home
=
models
.
CharField
(
max_length
=
64
,
blank
=
True
,
verbose_name
=
_
(
'Home'
))
home
=
models
.
CharField
(
max_length
=
64
,
blank
=
True
,
verbose_name
=
_
(
'Home'
))
uid
=
models
.
IntegerField
(
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Uid'
))
uid
=
models
.
IntegerField
(
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Uid'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
)
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
)
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
comment
=
models
.
TextField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
...
@@ -243,7 +243,7 @@ class AssetGroup(models.Model):
...
@@ -243,7 +243,7 @@ class AssetGroup(models.Model):
name
=
models
.
CharField
(
max_length
=
64
,
unique
=
True
,
verbose_name
=
_
(
'Name'
))
name
=
models
.
CharField
(
max_length
=
64
,
unique
=
True
,
verbose_name
=
_
(
'Name'
))
system_users
=
models
.
ManyToManyField
(
SystemUser
,
related_name
=
'asset_groups'
,
blank
=
True
)
system_users
=
models
.
ManyToManyField
(
SystemUser
,
related_name
=
'asset_groups'
,
blank
=
True
)
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
null
=
True
,
verbose_name
=
_
(
'Date added'
))
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
null
=
True
,
verbose_name
=
_
(
'Date added'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
def
__unicode__
(
self
):
def
__unicode__
(
self
):
...
@@ -321,7 +321,7 @@ class Asset(models.Model):
...
@@ -321,7 +321,7 @@ class Asset(models.Model):
sn
=
models
.
CharField
(
max_length
=
128
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Serial number'
))
sn
=
models
.
CharField
(
max_length
=
128
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Serial number'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Is active'
))
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Is active'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Date added'
))
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Date added'
))
comment
=
models
.
TextField
(
max_length
=
128
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
max_length
=
128
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
tags
=
models
.
ManyToManyField
(
'Tag'
,
verbose_name
=
'标签集合'
,
blank
=
True
)
tags
=
models
.
ManyToManyField
(
'Tag'
,
verbose_name
=
'标签集合'
,
blank
=
True
)
...
@@ -365,15 +365,15 @@ class Asset(models.Model):
...
@@ -365,15 +365,15 @@ class Asset(models.Model):
class
Tag
(
models
.
Model
):
class
Tag
(
models
.
Model
):
name
=
models
.
CharField
(
'标签名'
,
max_length
=
64
,
unique
=
True
)
name
=
models
.
CharField
(
max_length
=
64
,
unique
=
True
,
verbose_name
=
_
(
'Name'
)
)
created_time
=
models
.
DateTimeField
(
'创建时间'
,
auto_now_add
=
True
)
created_time
=
models
.
DateTimeField
(
auto_now_add_add
=
True
,
verbose_name
=
_
(
'Create time'
)
)
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
def
__str__
(
self
):
return
self
.
name
def
__unicode__
(
self
):
def
__unicode__
(
self
):
return
self
.
name
return
self
.
name
__str__
=
__unicode__
class
Meta
:
class
Meta
:
db_table
=
'tag'
db_table
=
'tag'
...
...
apps/audits/models.py
View file @
26a8bce2
...
@@ -10,18 +10,18 @@ from django.utils.translation import ugettext_lazy as _
...
@@ -10,18 +10,18 @@ from django.utils.translation import ugettext_lazy as _
class
LoginLog
(
models
.
Model
):
class
LoginLog
(
models
.
Model
):
LOGIN_TYPE_CHOICE
=
(
LOGIN_TYPE_CHOICE
=
(
(
'W'
,
'Web'
),
(
'W'
,
'Web'
),
(
'
T'
,
'
Terminal'
),
(
'
S'
,
'SSH
Terminal'
),
(
'WT'
,
'Web Terminal'
)
(
'WT'
,
'Web Terminal'
)
)
)
username
=
models
.
CharField
(
max_length
=
20
,
verbose_name
=
_
(
'Username'
))
username
=
models
.
CharField
(
max_length
=
20
,
verbose_name
=
_
(
'Username'
))
name
=
models
.
CharField
(
max_length
=
20
,
blank
=
True
,
verbose_name
=
_
(
'Name'
))
name
=
models
.
CharField
(
max_length
=
20
,
blank
=
True
,
verbose_name
=
_
(
'Name'
))
login_type
=
models
.
CharField
(
choices
=
LOGIN_TYPE_CHOICE
,
max_length
=
1
,
verbose_name
=
_
(
'Login type'
))
login_type
=
models
.
CharField
(
choices
=
LOGIN_TYPE_CHOICE
,
max_length
=
2
,
verbose_name
=
_
(
'Login type'
))
login_ip
=
models
.
GenericIPAddressField
(
verbose_name
=
_
(
'Login ip'
))
login_ip
=
models
.
GenericIPAddressField
(
verbose_name
=
_
(
'Login ip'
))
login_city
=
models
.
CharField
(
max_length
=
100
,
blank
=
True
,
null
=
True
,
verbose_name
=
_
(
'Login city'
))
login_city
=
models
.
CharField
(
max_length
=
100
,
blank
=
True
,
null
=
True
,
verbose_name
=
_
(
'Login city'
))
user_agent
=
models
.
CharField
(
max_length
=
100
,
blank
=
True
,
null
=
True
,
verbose_name
=
_
(
'User agent'
))
user_agent
=
models
.
CharField
(
max_length
=
100
,
blank
=
True
,
null
=
True
,
verbose_name
=
_
(
'User agent'
))
from_terminal
=
models
.
ForeignKey
from_terminal
=
models
.
ForeignKey
date_login
=
models
.
DateTimeField
(
auto_now
=
True
,
verbose_name
=
_
(
'Date login'
))
date_login
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
verbose_name
=
_
(
'Date login'
))
date_logout
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date logout'
))
date_logout
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date logout'
))
class
Meta
:
class
Meta
:
...
@@ -44,7 +44,7 @@ class ProxyLog(models.Model):
...
@@ -44,7 +44,7 @@ class ProxyLog(models.Model):
log_file
=
models
.
CharField
(
max_length
=
1000
,
blank
=
True
,
null
=
True
)
log_file
=
models
.
CharField
(
max_length
=
1000
,
blank
=
True
,
null
=
True
)
was_failed
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Did connect failed'
))
was_failed
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Did connect failed'
))
is_finished
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is finished'
))
is_finished
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is finished'
))
date_start
=
models
.
DateTimeField
(
auto_now
=
True
,
verbose_name
=
_
(
'Date start'
))
date_start
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
verbose_name
=
_
(
'Date start'
))
date_finished
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date finished'
))
date_finished
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date finished'
))
def
__unicode__
(
self
):
def
__unicode__
(
self
):
...
...
apps/perms/models.py
View file @
26a8bce2
...
@@ -27,7 +27,7 @@ class AssetPermission(models.Model):
...
@@ -27,7 +27,7 @@ class AssetPermission(models.Model):
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Active'
))
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Active'
))
date_expired
=
models
.
DateTimeField
(
default
=
date_expired_default
,
verbose_name
=
_
(
'Date expired'
))
date_expired
=
models
.
DateTimeField
(
default
=
date_expired_default
,
verbose_name
=
_
(
'Date expired'
))
created_by
=
models
.
CharField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
created_by
=
models
.
CharField
(
max_length
=
128
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
,
verbose_name
=
_
(
'Date created'
))
date_created
=
models
.
DateTimeField
(
auto_now
_add
=
True
,
verbose_name
=
_
(
'Date created'
))
comment
=
models
.
TextField
(
verbose_name
=
_
(
'Comment'
),
blank
=
True
)
comment
=
models
.
TextField
(
verbose_name
=
_
(
'Comment'
),
blank
=
True
)
def
__unicode__
(
self
):
def
__unicode__
(
self
):
...
...
apps/terminal/models.py
View file @
26a8bce2
...
@@ -7,13 +7,20 @@ from users.models import User
...
@@ -7,13 +7,20 @@ from users.models import User
class
Terminal
(
models
.
Model
):
class
Terminal
(
models
.
Model
):
TYPE_CHOICES
=
(
(
'S'
,
'SSH Terminal'
),
(
'WT'
,
'Web Terminal'
)
)
name
=
models
.
CharField
(
max_length
=
30
,
verbose_name
=
_
(
'Name'
))
name
=
models
.
CharField
(
max_length
=
30
,
verbose_name
=
_
(
'Name'
))
ip
=
models
.
GenericIPAddressField
(
verbose_name
=
_
(
'From ip'
))
ip
=
models
.
GenericIPAddressField
(
verbose_name
=
_
(
'From ip'
))
is_active
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is active'
))
is_active
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is active'
))
is_bound_ip
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is bound ip'
))
is_bound_ip
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
_
(
'Is bound ip'
))
heatbeat_interval
=
models
.
IntegerField
(
default
=
60
,
verbose_name
=
_
(
'Heatbeat interval'
))
heatbeat_interval
=
models
.
IntegerField
(
default
=
60
,
verbose_name
=
_
(
'Heatbeat interval'
))
mail_to
=
models
.
ManyToManyField
(
User
,
verbose_name
=
_
(
'Mail to '
))
type
=
models
.
CharField
(
choices
=
TYPE_CHOICES
,
max_length
=
2
,
verbose_name
=
_
(
'Terminal type'
))
date_created
=
models
.
DateTimeField
(
auto_now
=
True
)
ssh_host
=
models
.
CharField
(
max_length
=
100
,
verbose_name
=
_
(
'SSH host'
))
ssh_port
=
models
.
IntegerField
(
verbose_name
=
_
(
'SSH port'
))
mail_to
=
models
.
ManyToManyField
(
User
,
verbose_name
=
_
(
'Mail to'
))
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
comment
=
models
.
TextField
(
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
verbose_name
=
_
(
'Comment'
))
class
Meta
:
class
Meta
:
...
@@ -22,7 +29,7 @@ class Terminal(models.Model):
...
@@ -22,7 +29,7 @@ class Terminal(models.Model):
class
TerminalHeatbeat
(
models
.
Model
):
class
TerminalHeatbeat
(
models
.
Model
):
terminal
=
models
.
ForeignKey
(
Terminal
,
on_delete
=
models
.
SET_NULL
)
terminal
=
models
.
ForeignKey
(
Terminal
,
on_delete
=
models
.
CASCADE
)
date_timestamp
=
models
.
IntegerField
()
date_timestamp
=
models
.
IntegerField
()
class
Meta
:
class
Meta
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment