2469 Commits (18fd04d63c6d2622a24516049cd029e13cfb070c)

 

All Branches   

Search

Author	SHA1	Message	Date
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	7 years ago
ibuler	27a1849b1d	[Change] 修改idc => cluster	7 years ago
ibuler	32fd9bb42f	Merge branch 'new_api' into ops	7 years ago
ibuler	15f6d5c9c0	[Bugfix] terminal tasks main()运行时，可能数据库还不存在	7 years ago
ibuler	2b3551f1fc	[Feature] 修改ansible和ops	7 years ago
ibuler	e57121a780	[Feature] 优化Ops ansible api	7 years ago
ibuler	ec8106e43d	[Feature] 完成登陆日志	7 years ago
ibuler	a5f9735906	[Update] 更新index view	7 years ago
ibuler	71a3079221	[Feature] 离线session完成	7 years ago
ibuler	9b6696bb6e	[Feture] session detail页面，包含命令列表	7 years ago
ibuler	01558c985a	[Feture] 添加session 列表，并支持kill session	7 years ago
ibuler	bf8fa95597	[Update] 修改session	7 years ago
ibuler	94462bddb3	[Bugfix] 修改api view name	7 years ago
ibuler	1920a0f03d	[Bugfix] 修改nav小bug	7 years ago
ibuler	f74422e4bb	[Bugfix] 更改application models后导致 terminalstatus报错	7 years ago
ibuler	3120cef335	[Change] 修改导航列表	7 years ago
ibuler	61a8d95f46	[Change] Rename applications -> terminal	7 years ago
ibuler	19051d36dc	[Update] 修改一些bug	7 years ago
ibuler	7910292e0f	[Feature] 修改命令上传api	7 years ago
ibuler	26607bc327	[Copyright] 修改copyrite	7 years ago
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	7 years ago
ibuler	d80cbe270a	[Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构	7 years ago
ibuler	818ead85ca	[Feature] 增加上传replay log的api	7 years ago
ibuler	7f9ce57318	修改 terminal上报接口和api	7 years ago
ibuler	3639b190e3	Update perm api	7 years ago
ibuler	034f0a02b1	Update terminal api	7 years ago
ibuler	30c4fc9514	App user get user perms	7 years ago
ibuler	91601cce9e	[Feature] Support multiple ou search	7 years ago
ibuler	a4fa15a7de	Update logging	7 years ago
ibuler	d4ed6a97a5	[Bugfix] Update jumpserver settings	7 years ago
ibuler	0db8482873	Update ldap auth	7 years ago
ibuler	8bccaa6ee2	Update issue template	7 years ago
ibuler	2ae3bec335	[Bugfix] Change user public key length to 5000, fixed #631	7 years ago
ibuler	da5b9be5ca	[Bugfix] Update some translation and set warning, partial fix #646	7 years ago
ibuler	d1fbbd3213	[Bugfix] Push system user have not result may be error, fixed #701	7 years ago
ibuler	688a836bbe	[Copywriting] Copywriting change fixes #733	7 years ago
ibuler	83c49ae78f	Update readme icon	7 years ago
ibuler	e1a8f4910f	Update readme	7 years ago
ibuler	5ddcc994de	Add issue template	7 years ago
ibuler	5446196471	[Bugfix] #695 Asset detail add or delete system user or group mixed	7 years ago
ibuler	0f9ae9efbb	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	7 years ago
ibuler	4aef5b8229	[Bugfix] export asset pof error when none of assets	7 years ago
ibuler	6903e05af1	[Bugfix] Remove pdfmake js 404	7 years ago
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	7 years ago
老广	8342ba68c0	Update requirements.txt	7 years ago
crisewng	48ef5c421b	更新Mac安装ldap失败解决方法 (#613)	7 years ago
管宜尧	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错位	7 years ago
老广	d4fa082e17	Update Dockerfile	7 years ago
ibuler	e6537699fd	[Bugfix] Update asset create template bug	7 years ago
老广	1d950c4f49	Update settings.py	7 years ago