github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,474 Commits
97 Branches
262 Tags
144 MiB
Commit Graph

605 Commits (cb57002682eadf9e6507938cbdae42e613af3edc)

Author SHA1 Message Date
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937 2017-12-12 14:38:51 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系 2017-12-11 17:08:43 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +08:00
ibuler 18fd04d63c [Stash] Test case 通不过，import error 2017-12-08 10:15:27 +08:00
ibuler 27a1849b1d [Change] 修改idc => cluster 2017-12-07 16:25:50 +08:00
ibuler 32fd9bb42f Merge branch 'new_api' into ops 2017-12-07 13:28:29 +08:00
ibuler 15f6d5c9c0 [Bugfix] terminal tasks main()运行时，可能数据库还不存在 2017-12-07 13:28:11 +08:00
ibuler 2b3551f1fc [Feature] 修改ansible和ops 2017-12-07 13:01:33 +08:00
ibuler e57121a780 [Feature] 优化Ops ansible api 2017-12-06 18:31:51 +08:00
ibuler ec8106e43d [Feature] 完成登陆日志 2017-12-05 12:24:31 +08:00
ibuler a5f9735906 [Update] 更新index view 2017-12-04 20:15:47 +08:00
ibuler 71a3079221 [Feature] 离线session完成 2017-12-04 16:41:00 +08:00
ibuler 9b6696bb6e [Feture] session detail页面，包含命令列表 2017-12-04 00:21:26 +08:00
ibuler 01558c985a [Feture] 添加session 列表，并支持kill session 2017-12-03 20:42:36 +08:00
ibuler bf8fa95597 [Update] 修改session 2017-12-01 21:22:32 +08:00
ibuler 94462bddb3 [Bugfix] 修改api view name 2017-12-01 17:55:19 +08:00
ibuler 1920a0f03d [Bugfix] 修改nav小bug 2017-12-01 17:37:46 +08:00
ibuler f74422e4bb [Bugfix] 更改application models后导致 terminalstatus报错 2017-12-01 17:35:28 +08:00
ibuler 3120cef335 [Change] 修改导航列表 2017-12-01 17:29:57 +08:00
ibuler 61a8d95f46 [Change] Rename applications -> terminal 2017-12-01 17:28:47 +08:00
ibuler 19051d36dc [Update] 修改一些bug 2017-12-01 17:00:55 +08:00
ibuler 7910292e0f [Feature] 修改命令上传api 2017-11-29 19:27:04 +08:00
ibuler 26607bc327 [Copyright] 修改copyrite 2017-11-23 14:35:16 +08:00
ibuler e7f38ec894 [Change] 全部使用uuid作为主键 2017-11-23 14:08:01 +08:00
ibuler d80cbe270a [Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构 2017-11-23 11:26:17 +08:00
ibuler 818ead85ca [Feature] 增加上传replay log的api 2017-11-22 10:54:59 +08:00
ibuler 7f9ce57318 修改 terminal上报接口和api 2017-11-14 09:44:16 +08:00
ibuler 3639b190e3 Update perm api 2017-11-01 23:23:11 +08:00
ibuler 034f0a02b1 Update terminal api 2017-10-31 11:34:20 +08:00
ibuler 30c4fc9514 App user get user perms 2017-10-22 17:53:46 +08:00
ibuler 91601cce9e [Feature] Support multiple ou search 2017-10-12 14:29:00 +08:00
ibuler a4fa15a7de Update logging 2017-10-10 15:46:14 +08:00
ibuler d4ed6a97a5 [Bugfix] Update jumpserver settings 2017-10-10 14:28:32 +08:00
ibuler 0db8482873 Update ldap auth 2017-10-10 14:18:08 +08:00
ibuler 8bccaa6ee2 Update issue template 2017-10-08 19:43:55 +08:00
ibuler 2ae3bec335 [Bugfix] Change user public key length to 5000, fixed #631 2017-09-28 21:37:36 +08:00
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646 2017-09-28 20:52:33 +08:00
ibuler d1fbbd3213 [Bugfix] Push system user have not result may be error, fixed #701 2017-09-28 07:23:46 +08:00
ibuler 688a836bbe [Copywriting] Copywriting change fixes #733 2017-09-28 07:15:36 +08:00
ibuler 5446196471 [Bugfix] #695 Asset detail add or delete system user or group mixed 2017-09-27 07:20:16 +08:00
ibuler 0f9ae9efbb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2017-09-25 22:15:42 +08:00
ibuler 4aef5b8229 [Bugfix] export asset pof error when none of assets 2017-09-25 22:15:22 +08:00
ibuler 6903e05af1 [Bugfix] Remove pdfmake js 404 2017-09-25 21:55:48 +08:00
Caijun 43a0c4fe51 Fix importing csv bugs (#717) 
* Fix exporting csv bugs

1. auto detect the encoding of csv
2. if id in csv is empty, let it equal 0
3. if hostname exists, give up this asset

* Add chardet to requirements.txt
 2017-09-24 09:16:47 +08:00
管宜尧 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 e6537699fd [Bugfix] Update asset create template bug 2017-09-13 10:09:17 +08:00
老广 1d950c4f49 Update settings.py 2017-09-12 17:58:09 +08:00
ibuler 594ad0e14f Update db index more than 767 2017-08-31 16:54:45 +08:00