github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,877 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

382 Commits (eeae989c06f3beeefb5caa0cec745971c6d695db)

Author SHA1 Message Date
管宜尧 290872dcad bugfix: 解决用户失效时间为空时，无法使用密码进行ssh登录跳板机的问题 (#659) 
* bugfix: 解决用户失效时间为空时，无法使用密码进行ssh登录跳板机的问题

bugfix: 解决用户失效时间为空时，无法使用密码进行ssh登录跳板机的问题。

```
AttributeError at /api/users/v1/auth/
'NoneType' object has no attribute 'strftime'

Request Method: POST
Request URL: http://127.0.0.1:8080/api/users/v1/auth/
Django Version: 1.11.4
Python Executable: /opt/py3/bin/python
Python Version: 3.6.1
Python Path: ['/data/deployment/jumpserver/apps', '/usr/local/lib/python36.zip', '/usr/local/lib/python3.6', '/usr/local/lib/python3.6/lib-dynload', '/opt/py3/lib/python3.6/site-packages', '/data/deployment/jumpserver', '/data/deployment/jumpserver/apps']
Server time: Wed, 30 Aug 2017 23:18:47 +0800
Installed Applications:
['users.apps.UsersConfig',
 'assets.apps.AssetsConfig',
 'perms.apps.PermsConfig',
 'ops.apps.OpsConfig',
 'audits.apps.AuditsConfig',
 'common.apps.CommonConfig',
 'applications.apps.ApplicationsConfig',
 'rest_framework',
 'rest_framework_swagger',
 'django_filters',
 'bootstrap3',
 'captcha',
 'django.contrib.auth',
 'django.contrib.contenttypes',
 'django.contrib.sessions',
 'django.contrib.messages',
 'django.contrib.staticfiles']
Installed Middleware:
['django.middleware.security.SecurityMiddleware',
 'django.contrib.sessions.middleware.SessionMiddleware',
 'django.middleware.locale.LocaleMiddleware',
 'django.middleware.common.CommonMiddleware',
 'django.middleware.csrf.CsrfViewMiddleware',
 'django.contrib.auth.middleware.AuthenticationMiddleware',
 'django.contrib.messages.middleware.MessageMiddleware',
 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 'jumpserver.middleware.TimezoneMiddleware',
 'jumpserver.middleware.DemoMiddleware']


Traceback:  

File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/exception.py" in inner
  41.             response = get_response(request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
  187.                 response = self.process_exception_by_middleware(e, request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
  185.                 response = wrapped_callback(request, *callback_args, **callback_kwargs)
File "/usr/local/lib/python3.6/contextlib.py" in inner
  53.                 return func(*args, **kwds)
File "/opt/py3/lib/python3.6/site-packages/django/views/decorators/csrf.py" in wrapped_view
  58.         return view_func(*args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/django/views/generic/base.py" in view
  68.             return self.dispatch(request, *args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
  489.             response = self.handle_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in handle_exception
  449.             self.raise_uncaught_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
  486.             response = handler(request, *args, **kwargs)
File "/data/deployment/jumpserver/apps/users/api.py" in post
  166.             return Response({'token': token, 'user': user.to_json()})
File "/data/deployment/jumpserver/apps/users/models/user.py" in to_json
  207.             'date_expired': self.date_expired.strftime('%Y-%m-%d %H:%M:%S')

Exception Type: AttributeError at /api/users/v1/auth/
Exception Value: 'NoneType' object has no attribute 'strftime'
Request information:
USER: AnonymousUser
GET: No GET data
POST: No POST data
FILES: No FILES data
COOKIES: No cookie data
```

* bugfix: 个人信息页面个人信息pannel错位

bugfix: 个人信息页面个人信息pannel错位
 2017-09-24 08:40:59 +08:00
ibuler cd1d690fd3 [Bugfix] 修复一些bug 2017-07-28 21:52:43 +08:00
中国娃 67e953902b Update utils.py (#579) 2017-07-28 20:42:16 +08:00
ibuler 1c78526f86 Fix bug 2017-07-20 07:58:16 +08:00
ibuler d012880a90 [Bugfix] 修复bug 2017-07-13 11:46:56 +08:00
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) 
* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)
 2017-07-10 11:01:20 +08:00
ibuler 4e67749eef [Docs] 添加api dockers 2017-07-10 10:26:17 +08:00
ibuler 29095a869c [Demo] update demo mode code 2017-06-19 17:59:13 +08:00
njqaaa 9b14244363 fix id_dsa check error (#458) 
* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )
 2017-06-06 11:23:39 +08:00
Caijun cf07a6ebb7 Fix judging request.user valid on UserToken API (#476) 2017-06-02 17:15:59 +08:00
ibuler 41633be1aa [Bugfix] 修复无法删除资产组 2017-05-22 20:30:31 +08:00
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug 2017-05-22 20:18:13 +08:00
ibuler edc631ad60 [Docker] 添加Docker compose 2017-05-20 00:19:10 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler 2ec0ab871a Fix form bug 2017-04-12 18:06:32 +08:00
ibuler 695e4da85e [Fixture] 完成批量更新 2017-04-12 11:50:15 +08:00
ibuler 071d1922d0 stash it 2017-04-10 22:55:15 +08:00
ibuler 95e64d7809 [Change] 修改导出和更新逻辑 2017-04-09 17:59:14 +08:00
ibuler 5418d0b44c [Change] Using csv replace xlsx 2017-04-09 00:45:28 +08:00
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3 2017-04-07 23:52:46 +08:00
ibuler a320b9e05e [Bugfix] 兼容py3 2017-04-07 19:11:27 +08:00
ibuler c11374ae39 [Bugfix] 修改翻译 2017-04-07 16:59:09 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler ac3553babb [Fixture] 修改asset detail 2017-04-04 11:14:59 +08:00
ibuler 709552f14c [Fixture] 添加首页 2017-04-02 18:09:40 +08:00
ibuler 66a2262ee9 [Fixture] 增加 asset groups assets api 2017-04-01 00:41:16 +08:00
ibuler 067426d5e0 [Fixture] 完成用户向导页 2017-03-31 23:46:00 +08:00
ibuler 7720e9f3fd [Change] 修改图片 2017-03-31 18:47:50 +08:00
ibuler 61a481f427 [Fixture] 添加用户连接终端 2017-03-31 11:25:25 +08:00
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改 2017-03-30 16:28:00 +08:00
ibuler 0983f294b7 [Fixture] 添加用户profile 2017-03-30 00:51:36 +08:00
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面 2017-03-29 15:26:32 +08:00
ibuler ab62bfca7e [Bugfix] 修改一些bug 2017-03-04 16:38:26 +08:00
ibuler 695dc96ce8 Merge branch 'audits' 2017-03-03 10:24:34 +08:00
ibuler 9518672ad2 Add 2017-03-02 18:29:29 +08:00
ibuler b055144908 Merge with audits 2017-03-01 15:35:11 +08:00
xiaokong1937@gmail.com 548d7ef99a fix #13;fix `user` context conflict problem in user-detail page 2017-02-09 21:19:49 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com fe01f92545 user profile: update ssh pk 2017-02-03 13:37:05 +08:00
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags 2017-01-26 20:24:50 +08:00
xiaokong1937@gmail.com f3647ea46d user-profile page 2017-01-25 21:19:16 +08:00
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug 2017-01-20 20:13:22 +08:00
ibuler df94d11f53 [Fix] 修改一些api bug 2017-01-20 13:59:53 +08:00
ibuler ffed28c9c7 [Change] 修改perm的代码， 强制79个字符内 2017-01-17 17:11:01 +08:00
ibuler 25cb47d2f5 [Change] 拆分user view为多个view 2017-01-17 16:34:47 +08:00
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误 2017-01-10 18:03:00 +08:00
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude 2017-01-08 13:35:59 +08:00
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile 2017-01-07 20:07:33 +08:00
ibuler b670259ab6 Modify terminal reqject templatte 2017-01-03 00:11:44 +08:00
ibuler 301e02bcd8 Update some api 2016-12-30 00:19:47 +08:00
ibuler 70da177ed7 Update api 2016-12-29 19:17:00 +08:00
ibuler 92d854b971 Update api 2016-12-29 00:29:59 +08:00
ibuler d80fec6e60 Update some api 2016-12-28 00:28:52 +08:00
ibuler d56f030dc4 Finish terminal accept 2016-12-27 00:59:52 +08:00
ibuler 775cd523eb Update app terminal name to applications 2016-12-25 23:10:53 +08:00
ibuler a8fa4d2f0c update terminal regist 2016-12-25 17:44:39 +08:00
ibuler 2707012325 Finish access key auth 2016-12-25 13:15:28 +08:00
ibuler fe17bec752 Add access key auth 2016-12-22 01:07:05 +08:00
ibuler 5b4ce709af Add private token and change user group 2016-12-22 00:36:31 +08:00
ibuler 875aaa0029 update user model for create application user 2016-12-21 01:17:36 +08:00
ibuler 649509dec1 Change models dir 2016-12-21 00:43:52 +08:00
ibuler a448fd02e2 merged 2016-12-20 23:07:33 +08:00
ibuler 96d32f2e3e prepare merge ops 2016-12-20 23:06:27 +08:00
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件 2016-12-20 01:19:50 +08:00
ibuler d964221689 Update api 2016-12-16 19:32:05 +08:00
wangjun5 87eed2e59b add asset tool 2016-12-15 19:55:15 +08:00
ibuler 3aea994101 asset import 2016-11-27 14:37:50 +08:00
ibuler c1c9c7b68a update asset 2016-11-25 22:45:47 +08:00
ibuler 6e843533cb Base finish user 2016-11-25 11:00:51 +08:00
ibuler d8a229c09b to Commpany 2016-11-25 08:39:24 +08:00
ibuler 72ad4b44ce update bug 2016-11-24 19:36:49 +08:00
ibuler c1a74aebc5 [BugFix] update some user import bug 2016-11-24 17:08:20 +08:00
ibuler eae580e51f Update user import and export 2016-11-24 15:45:08 +08:00
ibuler e28f7a3bec Add export and import 2016-11-24 00:48:57 +08:00
ibuler be99eb82e8 udpate some bug 2016-11-23 19:37:47 +08:00
ibuler 5af97c969b export csv 2016-11-23 19:09:11 +08:00
ibuler 7dfde3a3c5 Update 2016-11-23 16:17:23 +08:00
ibuler 180af7e0bd Update csv 2016-11-22 00:59:49 +08:00
ibuler e89d3b3807 Update asset 2016-11-17 19:28:45 +08:00
ibuler aff37092bf Rename urls 2016-11-16 18:12:14 +08:00
ibuler 5745c8cc4a Finish url namespace change 2016-11-16 17:45:46 +08:00
ibuler a5e487441f prepare change api name 2016-11-16 17:38:03 +08:00
ibuler 3b30eb3278 Weiteng 2016-11-15 23:09:36 +08:00
ibuler 99c36f2a2c Fix bug 2016-11-15 19:44:08 +08:00
ibuler db8b0022fc Update usergroup detail 2016-11-15 19:33:04 +08:00
ibuler bd882c8bef User group detail 2016-11-15 00:48:48 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 10aa8c40a7 Add login log 2016-11-10 23:54:21 +08:00
ibuler f70abec5ef Finish user detail 2016-11-10 22:06:23 +08:00
ibuler 69f2bf664b Finish user permission revoke 2016-11-10 16:59:50 +08:00
ibuler 47090eb0f7 update some user api 2016-11-09 23:49:10 +08:00
ibuler 8d7759d22f change user api 2016-11-09 19:29:15 +08:00
ibuler ea3f8af161 Fix pubkey auth bug 2016-11-07 16:59:52 +08:00
ibuler a75e1db970 Add form validate 2016-11-07 00:39:26 +08:00
ibuler 072da114db Finish system user list 2016-11-06 22:45:26 +08:00
ibuler 968b1b4cb6 Stash 2016-11-06 21:29:04 +08:00
ibuler 41337d28c3 add proxy log search 2016-11-05 01:15:25 +08:00
ibuler 53e97dac40 stash it 2016-11-04 18:33:16 +08:00
ibuler f437d3f883 update 2016-11-03 19:42:47 +08:00
ibuler 3448f3eb0a Modify init data 2016-11-02 23:00:47 +08:00
ibuler 34a0a37b63 Add token 2016-11-01 19:31:35 +08:00
ibuler 1159d9494c Update signer 2016-11-01 17:21:16 +08:00
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +08:00
ibuler 315af35296 Finish token access api 2016-10-31 18:58:23 +08:00
ibuler 6a510dad6c Update some bug 2016-10-24 19:32:53 +08:00
ibuler df380c343e Update api 2016-10-19 19:30:55 +08:00
ibuler 6164896793 Update some thing 2016-10-19 18:33:14 +08:00
ibuler 303659cb0e Change app name apps => terrminal 2016-10-17 15:24:41 +08:00
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
ibuler 9960a6cd21 Plan create a new app: terminal 2016-10-15 17:14:56 +08:00
ibuler 0446f449e9 Add auth and permission backends 2016-10-15 16:04:54 +08:00
ibuler a62a2178d0 Add user backend 2016-10-15 00:49:59 +08:00
ibuler 0c8922e30f Modify some bug 2016-10-09 19:27:49 +08:00
ibuler 0954f6d7e8 Add audits api 2016-10-09 00:12:18 +08:00
ibuler 59727656c3 Update table desgin doc and audit log 2016-10-07 23:54:29 +08:00
ibuler 6b6105491c Add migrations 2016-10-02 22:13:08 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +08:00
ibuler a04d772501 Merge with master 2016-10-02 21:45:26 +08:00
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api; 2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20 2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15 2016-09-30 20:50:40 +08:00
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration 2016-09-29 21:14:55 +08:00
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
xiaoyu e7fddf80ae user-group-detail: add users support 2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op 2016-09-28 21:11:43 +08:00
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api 2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com 70a6ddc897 fix #27 2016-09-27 20:16:46 +08:00
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page 2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update 2016-09-26 19:39:43 +08:00
xiaoyu 15dcc760b4 user list bulk update modal 2016-09-26 16:33:10 +08:00
xiaoyu d2197d99c2 fix #26 2016-09-26 11:30:43 +08:00
ibuler cfef374454 Update ssh server 2016-09-25 00:11:31 +08:00
ibuler 7ab47916f2 add __init__.py 2016-09-24 22:12:49 +08:00
ibuler 283c53fddf Update gitignore 2016-09-24 22:11:53 +08:00
ibuler da56310db9 update .gitignore 2016-09-24 22:09:20 +08:00
ibuler 4925f3227a update .gitignore 2016-09-24 21:57:24 +08:00
ibuler 88bb620af2 Modify ignore 2016-09-24 11:50:25 +08:00
xiaoyu 22163173fe user bulk delete view 2016-09-23 16:30:59 +08:00
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
xiaoyu 515406c05d temp: deactive test 2016-09-21 16:43:41 +08:00
xiaoyu 61d1d9ec90 temp 2016-09-21 15:48:21 +08:00
ibuler 220892824c Finish some bug 2016-09-20 01:13:50 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
xiaokong1937@gmail.com 65461a09a7 user-group edit implement 2016-09-19 21:08:08 +08:00
xiaoyu 9a81057d95 fix a typo 2016-09-19 15:51:28 +08:00
xiaoyu f00da20764 user-group delete implement 2016-09-19 15:47:58 +08:00
xiaokong1937@gmail.com 4e2a41f4cf user-group draft 2016-09-18 21:00:07 +08:00
xiaoyu 8a5a4f3362 fix #14 2016-09-18 14:28:34 +08:00
xiaoyu 8cdc4674d7 update toastr js and close #8 2016-09-18 10:32:23 +08:00
ibuler 502c7e756b Modify asset 2016-09-17 23:43:41 +08:00