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
75134743
Commit
75134743
authored
Oct 17, 2016
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish terminal app
parent
303659cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
2 deletions
+43
-2
api.py
apps/terminal/api.py
+41
-0
models.py
apps/terminal/models.py
+1
-1
serializers.py
apps/terminal/serializers.py
+1
-1
No files found.
apps/terminal/api.py
View file @
75134743
...
@@ -2,7 +2,10 @@
...
@@ -2,7 +2,10 @@
#
#
from
rest_framework.generics
import
ListCreateAPIView
from
rest_framework.generics
import
ListCreateAPIView
from
rest_framework.views
import
APIView
,
Response
from
rest_framework.permissions
import
AllowAny
from
common.utils
import
unsign
,
get_object_or_none
from
.models
import
Terminal
from
.models
import
Terminal
from
.serializers
import
TerminalSerializer
from
.serializers
import
TerminalSerializer
...
@@ -10,5 +13,43 @@ from .serializers import TerminalSerializer
...
@@ -10,5 +13,43 @@ from .serializers import TerminalSerializer
class
TerminalApi
(
ListCreateAPIView
):
class
TerminalApi
(
ListCreateAPIView
):
queryset
=
Terminal
.
objects
.
all
()
queryset
=
Terminal
.
objects
.
all
()
serializer_class
=
TerminalSerializer
serializer_class
=
TerminalSerializer
permission_classes
=
(
AllowAny
,)
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
name
=
unsign
(
request
.
data
.
get
(
'name'
,
''
))
if
name
:
terminal
=
get_object_or_none
(
Terminal
,
name
=
name
)
if
terminal
:
if
terminal
.
is_accepted
and
terminal
.
is_active
:
return
Response
(
data
=
{
'data'
:
{
'name'
:
name
,
'ip'
:
terminal
.
ip
},
'msg'
:
'Success'
},
status
=
200
)
else
:
return
Response
(
data
=
{
'data'
:
{
'name'
:
name
,
'ip'
:
terminal
.
ip
},
'msg'
:
'Need admin accept or active it'
},
status
=
204
)
else
:
ip
=
request
.
META
.
get
(
'X-Real-IP'
)
or
request
.
META
.
get
(
'REMOTE_ADDR'
)
terminal
=
Terminal
.
objects
.
create
(
name
=
name
,
ip
=
ip
)
return
Response
(
data
=
{
'data'
:
{
'name'
:
name
,
'ip'
:
terminal
.
ip
},
'msg'
:
'Need admin accept or active it'
},
status
=
204
)
else
:
return
Response
(
data
=
{
'error'
:
'Secrete key invalid'
},
status
=
401
)
# class TerminalRegister(APIView):
# def post(self, request, format='json'):
# return Response(data={'hello': request.META.get('REMOTE_ADDR')})
# name = unsign(request.data.get('name', ''))
# if name:
# terminal = get_object_or_none(Terminal, name=name)
# if terminal:
# return Response(data={'name': name, 'ip': terminal.ip}, status=200)
# else:
# ip = request.Meta.get('X-Real-IP')
# Terminal.objects.create(name=name, ip=request.META.host)
apps/terminal/models.py
View file @
75134743
...
@@ -11,7 +11,7 @@ class Terminal(models.Model):
...
@@ -11,7 +11,7 @@ class Terminal(models.Model):
(
'S'
,
'SSH Terminal'
),
(
'S'
,
'SSH Terminal'
),
(
'WT'
,
'Web Terminal'
)
(
'WT'
,
'Web Terminal'
)
)
)
name
=
models
.
CharField
(
max_length
=
30
,
verbose_name
=
_
(
'Name'
))
name
=
models
.
CharField
(
max_length
=
30
,
unique
=
True
,
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'
))
...
...
apps/terminal/serializers.py
View file @
75134743
...
@@ -9,7 +9,7 @@ from .models import Terminal
...
@@ -9,7 +9,7 @@ from .models import Terminal
class
TerminalSerializer
(
serializers
.
ModelSerializer
):
class
TerminalSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
Terminal
model
=
Terminal
fields
=
[
'name'
,
'ip'
,
'type'
,
'url'
,
'comment'
,
'is_active'
,
fields
=
[
'name'
,
'ip'
,
'type'
,
'url'
,
'comment'
,
'is_active'
,
'is_accepted'
,
'get_type_display'
]
'get_type_display'
]
...
...
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