github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复一些bug

pull/1623/head
ibuler 2018-07-31 11:00:48 +08:00
parent 23815f87c5
commit 672dd66023
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/fields.py
View File

@ -62,7 +62,7 @@ class EncryptMixin:
def get_prep_value(self, value): def get_prep_value(self, value):
if value is None: if value is None:
return value return value
return signer.sign(value).decode('utf-8') return signer.sign(value)
class EncryptTextField(EncryptMixin, models.TextField): class EncryptTextField(EncryptMixin, models.TextField):

2
apps/terminal/urls/api_urls.py
View File

@ -23,7 +23,7 @@ urlpatterns = [
api.SessionReplayV2ViewSet.as_view({'get': 'retrieve', 'post': 'create'}), api.SessionReplayV2ViewSet.as_view({'get': 'retrieve', 'post': 'create'}),
name='session-replay'), name='session-replay'),
path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'), path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
path('terminal/<uuid:terminal>/access-key', api.TerminalTokenApi.as_view(), path('terminal/<uuid:terminal>/access-key/', api.TerminalTokenApi.as_view(),
name='terminal-access-key'), name='terminal-access-key'),
path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'), path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'),
# v2: get session's replay # v2: get session's replay

2
apps/users/models/user.py
View File

@ -118,7 +118,7 @@ class User(AbstractUser):
@otp_secret_key.setter @otp_secret_key.setter
def otp_secret_key(self, item): def otp_secret_key(self, item):
self._otp_secret_key = signer.sign(item).decode('utf-8') self._otp_secret_key = signer.sign(item)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('users:user-detail', args=(self.id,)) return reverse('users:user-detail', args=(self.id,))

4
requirements/requirements.txt
View File

@ -14,8 +14,7 @@ coreapi==2.3.3
coreschema==0.0.4 coreschema==0.0.4
cryptography==2.1.4 cryptography==2.1.4
decorator==4.1.2 decorator==4.1.2
#Django==1.11 Django==2.0.7
#Django==2.0.7
django-auth-ldap==1.3.0 django-auth-ldap==1.3.0
django-bootstrap3==9.1.0 django-bootstrap3==9.1.0
django-celery-beat==1.1.1 django-celery-beat==1.1.1
@ -25,7 +24,6 @@ django-ranged-response==0.2.0
django-redis-cache==1.7.1 django-redis-cache==1.7.1
django-rest-swagger==2.1.2 django-rest-swagger==2.1.2
django-simple-captcha==0.5.6 django-simple-captcha==0.5.6
#djangorestframework==3.7.3
djangorestframework==3.8.2 djangorestframework==3.8.2
djangorestframework-bulk==0.2.1 djangorestframework-bulk==0.2.1
docutils==0.14 docutils==0.14