58 Commits (b6523da60378088416741d4202829ca55aaf5db6)

Author	SHA1	Message	Date
ibuler	5648dcd7e7	[Update] 修改用户view	6 years ago
ibuler	28e47f33c1	[Update] 修改一些逻辑	6 years ago
ibuler	7412bdcba7	[Update] 完成基本框架	6 years ago
BaiJiangJie	64db02c3f8	[Update] 添加用户来源 db/ldap	7 years ago
BaiJiangJie	b026e86741	[Update] 修改判断MFA是否全局启用的逻辑，放到User.otp_force_enabled中	7 years ago
ibuler	0b4df78393	[Update] 修改permistion utils优化返回的属性	7 years ago
BaiJiangjie	b5fc76d6a5	[Update] 修改用户首次登录页	7 years ago
BaiJiangjie	5b52b907c0	[Update] 创建用户，更新用户，添加MFA设置选项	7 years ago
BaiJiangjie	12c8cf6b76	[Update] 添加OTP认证功能	7 years ago
BaiJiangjie	f450accbf8	[Merge] with dev	7 years ago
BaiJiangjie	0bbfc7433d	[Feature] 支持otp	7 years ago
ibuler	48e8785725	[Update] 修改users otp secret key	7 years ago
ibuler	2398e9acbd	更改表截稿	7 years ago
ibuler	8b3b517bab	[Update] 修改授权规则详情列表页面	7 years ago
ibuler	bbaa35c773	[Update] 修改Perms	7 years ago
ibuler	78f4e5a89a	[Update] 修改用户Opt	7 years ago
ibuler	ed71e7d2d9	[Update] 修改用户Opt	7 years ago
ibuler	759760e7d9	[Update] 服务器可以生成用户密钥	7 years ago
ibuler	e123599735	[Update] 修改一些bug和文案	7 years ago
ibuler	870b863136	[Update] 修改设置的一些require	7 years ago
ibuler	bd4768c147	[Update] 拆分asset api module	7 years ago
ibuler	abb1a40a4f	[Feature] 添加basic settings	7 years ago
ibuler	121f56f44b	[Feature] 添加setting页面	7 years ago
ibuler	450a9495ec	[Bug&Update] 以下bug和功能 ... - 修复新建资产不选管理用户和集群异常bug - profile下拉增加icon - 授权api增加os和platform	7 years ago
ibuler	3b6403b2f2	[Update] 修改一些翻译	7 years ago
ibuler	c48531c586	[Update] 添加和修改部分翻译	7 years ago
ibuler	e0a3fafbd5	[Bugfix] 详见trello	7 years ago
ibuler	f4beccddae	[Update] 修改注册流程	7 years ago
ibuler	bf9bb1b973	[Update] 修改ops task运行	7 years ago
ibuler	d51b3eff6a	[Update] 修改settings和配置文件	7 years ago
ibuler	76df1de634	[Bugfix] 修复一些明显的bug	7 years ago
ibuler	08e1788426	[Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃	7 years ago
ibuler	99b4c66b5e	[Feature] 添加signals 解耦代码	7 years ago
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	7 years ago
ibuler	26607bc327	[Copyright] 修改copyrite	7 years ago
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	7 years ago
ibuler	034f0a02b1	Update terminal api	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
管宜尧	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	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	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
ibuler	7720e9f3fd	[Change] 修改图片	8 years ago
ibuler	61a481f427	[Fixture] 添加用户连接终端	8 years ago
ibuler	3fa5ce5404	[Fixture] 添加用户信息更改	8 years ago
ibuler	0983f294b7	[Fixture] 添加用户profile	8 years ago
xiaokong1937@gmail.com	548d7ef99a	fix #13;fix `user` context conflict problem in user-detail page	8 years ago
xiaokong1937@gmail.com	8a5d0b2d92	remove unused templatetags: users_tags and common_tags	8 years ago