307 Commits (ec45c56868c57a1b0b203868ed8fc04e24df84dc)

Author	SHA1	Message	Date
ibuler	e1b23a7cb4	[Bugfix] 修复无法记录日志的bug	7 years ago
ibuler	76df1de634	[Bugfix] 修复一些明显的bug	7 years ago
ibuler	b0eace6ad8	[Bugfix] 基本完成assets模块	7 years ago
ibuler	b4e1ac1953	[Bugfix] 修复资产模块中一些bug	7 years ago
ibuler	a308000d2e	[Bugfix] 修改users模块一些bug	7 years ago
ibuler	08e1788426	[Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃	7 years ago
ibuler	18fbfb449d	[Feature] 修改url pattern 精确匹配uuid	7 years ago
ibuler	cb57002682	[Change] 去掉前端html中的hardcode 99991937	7 years ago
ibuler	722863428d	[Feature] 添加context_processor	7 years ago
ibuler	99b4c66b5e	[Feature] 添加signals 解耦代码	7 years ago
ibuler	cbc000696e	[Feature] 修改adminuser systemuser cluster及他们的关系	7 years ago
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	7 years ago
ibuler	ec8106e43d	[Feature] 完成登陆日志	7 years ago
ibuler	a5f9735906	[Update] 更新index view	7 years ago
ibuler	61a8d95f46	[Change] Rename applications -> terminal	7 years ago
ibuler	19051d36dc	[Update] 修改一些bug	7 years ago
ibuler	26607bc327	[Copyright] 修改copyrite	7 years ago
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	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	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
管宜尧	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
ibuler	cd1d690fd3	[Bugfix] 修复一些bug	7 years ago
中国娃	67e953902b	Update utils.py (#579)	7 years ago
ibuler	1c78526f86	Fix bug	7 years ago
ibuler	d012880a90	[Bugfix] 修复bug	7 years ago
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)	7 years ago
ibuler	4e67749eef	[Docs] 添加api dockers	7 years ago
ibuler	29095a869c	[Demo] update demo mode code	8 years ago
njqaaa	9b14244363	fix id_dsa check error (#458) ... * fix id_dsa check error * fix 邮件修改密码 token错误 * fix 3c8aec9 add )	8 years ago
Caijun	cf07a6ebb7	Fix judging request.user valid on UserToken API (#476)	8 years ago
ibuler	41633be1aa	[Bugfix] 修复无法删除资产组	8 years ago
ibuler	d2620a655c	[Bugfix] 修复模板bug, 修复getattr bug	8 years ago
ibuler	edc631ad60	[Docker] 添加Docker compose	8 years ago
GuangHongwei	458989328e	[Bugfix] 修改bug，使用py3编程	8 years ago
ibuler	2ec0ab871a	Fix form bug	8 years ago
ibuler	695e4da85e	[Fixture] 完成批量更新	8 years ago
ibuler	071d1922d0	stash it	8 years ago
ibuler	95e64d7809	[Change] 修改导出和更新逻辑	8 years ago
ibuler	5418d0b44c	[Change] Using csv replace xlsx	8 years ago
ibuler	bcc065eb8f	[Compat] compat py3 change bootstrap form to bootstrap3	8 years ago
ibuler	a320b9e05e	[Bugfix] 兼容py3	8 years ago
ibuler	c11374ae39	[Bugfix] 修改翻译	8 years ago
ibuler	92ebe85a3f	[Fixture] 详情页添加system user 推送	8 years ago
ibuler	ac3553babb	[Fixture] 修改asset detail	8 years ago
ibuler	709552f14c	[Fixture] 添加首页	8 years ago