0f9ae9efbb
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-09-25 22:15:42 +08:00
4aef5b8229
[Bugfix] export asset pof error when none of assets
2017-09-25 22:15:22 +08:00
6903e05af1
[Bugfix] Remove pdfmake js 404
2017-09-25 21:55:48 +08:00
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
8342ba68c0
Update requirements.txt
2017-09-24 08:57:20 +08:00
48ef5c421b
更新Mac安装ldap失败解决方法 ( #613 )
2017-09-24 08:41:42 +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
d4fa082e17
Update Dockerfile
2017-09-14 09:49:42 +08:00
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
5e197fb0db
Update README.md
2017-09-08 07:18:26 +08:00
594ad0e14f
Update db index more than 767
2017-08-31 16:54:45 +08:00
d73d6e943b
update user model charfield max length more than 767 bug
2017-08-31 16:04:57 +08:00
eb8b02d88b
Update README.md
2017-08-03 18:16:32 +08:00
c8728e52d8
Update README.md
2017-08-03 18:14:36 +08:00
8537e3e135
Update settings ( #595 )
...
修改redis有密码无法连接bug
2017-08-03 15:24:16 +08:00
cd1d690fd3
[Bugfix] 修复一些bug
2017-07-28 21:52:43 +08:00
67e953902b
Update utils.py ( #579 )
2017-07-28 20:42:16 +08:00
5ffd1f99fd
[Bugfix] 修复更新bug
2017-07-24 22:42:01 +08:00
cc1a339142
[bugfix] system user update bug
2017-07-24 21:59:55 +08:00
1c78526f86
Fix bug
2017-07-20 07:58:16 +08:00
b0a5289a42
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-07-20 07:55:45 +08:00
477d23ea37
fix some bug
2017-07-20 07:55:24 +08:00
72c2290300
Update settings.py ( #515 )
...
修正Redis连接字符串
2017-07-17 17:18:14 +08:00
61014c747e
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
2017-07-15 13:51:15 +08:00
b2ba1f3ca5
update requirements
2017-07-15 13:50:56 +08:00
7c154abf70
fix bug: variable i should be the host name ( #538 )
...
fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]
2017-07-13 14:00:17 +08:00
d012880a90
[Bugfix] 修复bug
2017-07-13 11:46:56 +08:00
3ce07cf969
Update README
2017-07-12 20:45:21 +08:00
24dd7b6347
update docker config
2017-07-10 15:11:28 +08:00
9237c9dcee
Add requirements
2017-07-10 11:31:33 +08:00
143cabe5fc
update settings
2017-07-10 11:02:51 +08:00
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#453 )
2017-07-10 11:01:20 +08:00
235cbe12ee
Update README.md
2017-07-10 10:57:41 +08:00
26a169d938
fix bug in pagination_range function ( #511 )
...
start and end may be float when current_num >= 3 and display % 2 == 1
2017-07-10 10:39:18 +08:00
4e67749eef
[Docs] 添加api dockers
2017-07-10 10:26:17 +08:00
e120fd56a6
Update readme
2017-06-19 23:48:36 +08:00
51b9e3732f
Update readme
2017-06-19 23:41:45 +08:00
f3a50610af
[Update] update docker-compose
2017-06-19 23:15:09 +08:00
4141ae517f
update docker-compose
2017-06-19 18:13:44 +08:00
29095a869c
[Demo] update demo mode code
2017-06-19 17:59:13 +08:00
cda22a6f0d
add demo mode middleware
2017-06-15 22:35:03 +08:00
8f4d8b1c02
Compile messages ( #495 )
2017-06-13 17:51:12 +08:00
b502b06e82
Support i18n for asset `platform` field ( #494 )
2017-06-13 16:38:33 +08:00
7d541ee916
Dockerfile 优化 ( #453 )
2017-06-06 11:25:14 +08:00
9b14244363
fix id_dsa check error ( #458 )
...
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9
2017-06-06 11:23:39 +08:00
b680a42425
change sign_t return from bytes to str. ( #480 )
2017-06-06 11:22:29 +08:00
cf07a6ebb7
Fix judging request.user valid on UserToken API ( #476 )
2017-06-02 17:15:59 +08:00
dd6c82b168
fix left's users logout ( #446 )
...
* fix left's users logout
* fix issues 445
2017-05-25 14:12:16 +08:00
18169251fa
[Bugfix] 修复管理用户上传私钥兼容问题 ( #451 )
2017-05-25 11:14:21 +08:00
ibuler