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
0954f6d7
Commit
0954f6d7
authored
Oct 08, 2016
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add audits api
parent
59727656
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
5 deletions
+66
-5
api.py
apps/audits/api.py
+12
-0
__init__.py
apps/audits/migrations/__init__.py
+0
-0
models.py
apps/audits/models.py
+16
-2
serializers.py
apps/audits/serializers.py
+20
-0
urls.py
apps/audits/urls.py
+15
-0
urls.py
apps/jumpserver/urls.py
+1
-0
api.py
apps/users/api.py
+2
-3
No files found.
apps/audits/api.py
View file @
0954f6d7
# ~*~ coding: utf-8 ~*~
# ~*~ coding: utf-8 ~*~
#
#
from
rest_framework
import
generics
import
serializers
class
ProxyLogCreateApi
(
generics
.
CreateAPIView
):
serializer_class
=
serializers
.
ProxyLogSerializer
class
CommandLogCreateApi
(
generics
.
CreateAPIView
):
serializer_class
=
serializers
.
CommandLogSerializer
apps/audits/migrations/__init__.py
0 → 100644
View file @
0954f6d7
apps/audits/models.py
View file @
0954f6d7
...
@@ -23,7 +23,7 @@ class LoginLog(models.Model):
...
@@ -23,7 +23,7 @@ class LoginLog(models.Model):
date_logout
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date logout'
))
date_logout
=
models
.
DateTimeField
(
null
=
True
,
verbose_name
=
_
(
'Date logout'
))
class
Meta
:
class
Meta
:
db_table
=
'loginlog'
db_table
=
'login
_
log'
ordering
=
[
'-date_login'
,
'username'
]
ordering
=
[
'-date_login'
,
'username'
]
...
@@ -44,10 +44,24 @@ class ProxyLog(models.Model):
...
@@ -44,10 +44,24 @@ class ProxyLog(models.Model):
date_start
=
models
.
DateTimeField
(
auto_now
=
True
,
verbose_name
=
_
(
'Date start'
))
date_start
=
models
.
DateTimeField
(
auto_now
=
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
):
return
'
%
s-
%
s-
%
s-
%
s'
%
(
self
.
username
,
self
.
hostname
,
self
.
system_user
,
self
.
id
)
class
Meta
:
db_table
=
'proxy_log'
ordering
=
[
'-date_start'
,
'username'
]
class
CommandLog
(
models
.
Model
):
class
CommandLog
(
models
.
Model
):
proxy_log
=
models
.
ForeignKey
(
ProxyLog
,
on_delete
=
models
.
CASCADE
,
related_name
=
'
proxy
_log'
)
proxy_log
=
models
.
ForeignKey
(
ProxyLog
,
on_delete
=
models
.
CASCADE
,
related_name
=
'
command
_log'
)
command
=
models
.
CharField
(
max_length
=
1000
,
blank
=
True
)
command
=
models
.
CharField
(
max_length
=
1000
,
blank
=
True
)
output
=
models
.
TextField
(
blank
=
True
)
output
=
models
.
TextField
(
blank
=
True
)
date_start
=
models
.
DateTimeField
(
null
=
True
)
date_start
=
models
.
DateTimeField
(
null
=
True
)
date_finished
=
models
.
DateTimeField
(
null
=
True
)
date_finished
=
models
.
DateTimeField
(
null
=
True
)
def
__unicode__
(
self
):
return
'
%
s:
%
s'
%
(
self
.
id
,
self
.
command
)
class
Meta
:
db_table
=
'command_log'
ordering
=
[
'-date_start'
,
'command'
]
apps/audits/serializers.py
0 → 100644
View file @
0954f6d7
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
from
rest_framework
import
serializers
import
models
class
ProxyLogSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
models
.
ProxyLog
class
CommandLogSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
models
.
CommandLog
if
__name__
==
'__main__'
:
pass
apps/audits/urls.py
View file @
0954f6d7
from
django.conf.urls
import
url
from
django.conf.urls
import
url
import
api
import
views
app_name
=
'audits'
urlpatterns
=
[
]
urlpatterns
+=
[
url
(
r'^v1/proxy-log$'
,
api
.
ProxyLogCreateApi
.
as_view
(),
name
=
'proxy-log-create-api'
),
url
(
r'^v1/command-log$'
,
api
.
CommandLogCreateApi
.
as_view
(),
name
=
'command-log-create-api'
),
]
apps/jumpserver/urls.py
View file @
0954f6d7
...
@@ -25,6 +25,7 @@ urlpatterns = [
...
@@ -25,6 +25,7 @@ urlpatterns = [
url
(
r'^(api/)?users/'
,
include
(
'users.urls'
)),
url
(
r'^(api/)?users/'
,
include
(
'users.urls'
)),
url
(
r'^assets/'
,
include
(
'assets.urls'
)),
url
(
r'^assets/'
,
include
(
'assets.urls'
)),
url
(
r'^perms/'
,
include
(
'perms.urls'
)),
url
(
r'^perms/'
,
include
(
'perms.urls'
)),
url
(
r'^(api/)?audits/'
,
include
(
'audits.urls'
)),
]
]
...
...
apps/users/api.py
View file @
0954f6d7
# ~*~ coding: utf-8 ~*~
# ~*~ coding: utf-8 ~*~
#
#
import
logging
from
django.shortcuts
import
get_object_or_404
from
django.shortcuts
import
get_object_or_404
from
rest_framework
import
generics
,
status
from
rest_framework
import
generics
,
status
...
@@ -12,7 +10,8 @@ from rest_framework_bulk import ListBulkCreateUpdateDestroyAPIView
...
@@ -12,7 +10,8 @@ from rest_framework_bulk import ListBulkCreateUpdateDestroyAPIView
from
.models
import
User
,
UserGroup
from
.models
import
User
,
UserGroup
from
.serializers
import
UserDetailSerializer
,
UserAndGroupSerializer
,
\
from
.serializers
import
UserDetailSerializer
,
UserAndGroupSerializer
,
\
GroupDetailSerializer
,
UserPKUpdateSerializer
,
UserBulkUpdateSerializer
,
GroupBulkUpdateSerializer
GroupDetailSerializer
,
UserPKUpdateSerializer
,
UserBulkUpdateSerializer
,
GroupBulkUpdateSerializer
from
common.mixins
import
BulkDeleteApiMixin
,
get_logger
from
common.mixins
import
BulkDeleteApiMixin
from
common.utils
import
get_logger
logger
=
get_logger
(
__name__
)
logger
=
get_logger
(
__name__
)
...
...
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