From 930c57398aef28b3038515efda1d871fa5c4fd53 Mon Sep 17 00:00:00 2001 From: jiaxiangkong <704564722@qq.com> Date: Thu, 10 Mar 2016 17:40:54 +0800 Subject: [PATCH 1/7] Update README.md --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 947b4b5e9..bb1a629fa 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,15 @@ Web批量执行命令 ### 文档 -* [访问wiki](https://github.com/ibuler/jumpserver/wiki) -* [快速安装](https://github.com/ibuler/jumpserver/wiki/Quickinstall) -* [名词解释](https://github.com/ibuler/jumpserver/wiki/Termexplain) -* [快速开始](https://github.com/ibuler/jumpserver/wiki/Quickstart) -* [FAQ](https://github.com/ibuler/jumpserver/wiki/FAQs) +* [访问wiki](https://github.com/jumpserver/jumpserver/wiki) +* [概览](https://github.com/jumpserver/jumpserver/wiki/%E6%A6%82%E8%A7%88) +* [名词解释](https://github.com/jumpserver/jumpserver/wiki/%E5%90%8D%E8%AF%8D%E8%A7%A3%E9%87%8A) +* [常见问题](https://github.com/jumpserver/jumpserver/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) +* 安装基于：[[RedHat|基于 RedHat 的系统]](https://github.com/jumpserver/jumpserver/wiki/%E5%AE%A2%E6%88%B7%E7%AB%AF-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[[Debian|基于 Debian 的系统]]，[[BSD|基于 BSD 的系统]] +* 客户端：[[RedHat|客户端 RedHat 的系统]]，[[Debian|客户端 Debian 的系统]]，[[BSD|客户端 BSD 的系统]] +* [快速开始](https://github.com/jumpserver/jumpserver/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B) +* [[安装图解]] +* [[应用图解]] ### 特点 From f796e8f67387d882a320636c2cb0a41784fe8bc8 Mon Sep 17 00:00:00 2001 From: jiaxiangkong <704564722@qq.com> Date: Thu, 10 Mar 2016 17:42:45 +0800 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb1a629fa..08f14d820 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Web批量执行命令 * [概览](https://github.com/jumpserver/jumpserver/wiki/%E6%A6%82%E8%A7%88) * [名词解释](https://github.com/jumpserver/jumpserver/wiki/%E5%90%8D%E8%AF%8D%E8%A7%A3%E9%87%8A) * [常见问题](https://github.com/jumpserver/jumpserver/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) -* 安装基于：[[RedHat|基于 RedHat 的系统]](https://github.com/jumpserver/jumpserver/wiki/%E5%AE%A2%E6%88%B7%E7%AB%AF-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[[Debian|基于 Debian 的系统]]，[[BSD|基于 BSD 的系统]] +* 安装基于：[RedHat 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[Debian 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-Debian-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[[BSD|基于 BSD 的系统]] * 客户端：[[RedHat|客户端 RedHat 的系统]]，[[Debian|客户端 Debian 的系统]]，[[BSD|客户端 BSD 的系统]] * [快速开始](https://github.com/jumpserver/jumpserver/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B) * [[安装图解]] From b02a45ee6cbda881048aba71d514314e21ff4f10 Mon Sep 17 00:00:00 2001 From: jiaxiangkong <704564722@qq.com> Date: Thu, 10 Mar 2016 17:43:37 +0800 Subject: [PATCH 3/7] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 08f14d820..17691c18b 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,8 @@ Web批量执行命令 * [概览](https://github.com/jumpserver/jumpserver/wiki/%E6%A6%82%E8%A7%88) * [名词解释](https://github.com/jumpserver/jumpserver/wiki/%E5%90%8D%E8%AF%8D%E8%A7%A3%E9%87%8A) * [常见问题](https://github.com/jumpserver/jumpserver/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) -* 安装基于：[RedHat 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[Debian 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-Debian-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[[BSD|基于 BSD 的系统]] -* 客户端：[[RedHat|客户端 RedHat 的系统]]，[[Debian|客户端 Debian 的系统]]，[[BSD|客户端 BSD 的系统]] +* 安装基于：[RedHat 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[Debian 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-Debian-%E7%9A%84%E7%B3%BB%E7%BB%9F) * [快速开始](https://github.com/jumpserver/jumpserver/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B) -* [[安装图解]] -* [[应用图解]] ### 特点 From 4dbc6803fb4bac3564befe4982ef65fb4611dcb8 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 21 Mar 2016 11:00:31 +0800 Subject: [PATCH 4/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 17691c18b..c78e9c075 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ## 写在前面 - 目前本版本处于beta阶段，请不要用于生产环境，除非你知道你在做什么 - 本版本暂时没加入LDAP接口，稳定版会将LDAP和无Agent方式抽象成API，2.x版本支持LDAP，请移步release中下载 + - 版本号变更 2.0 -> 0.2版本 3.0 -> 0.3版本 #欢迎使用Jumpserver **Jumpserver** 是一款由python编写开源的跳板机(堡垒机)系统，实现了跳板机应有的功能。基于ssh协议来管理，客户端无需安装agent。 From a1e947ae1e01d038d4f4c413d095f0d7683991f5 Mon Sep 17 00:00:00 2001 From: wangyong <864072399@qq.com> Date: Tue, 22 Mar 2016 17:32:43 +0800 Subject: [PATCH 5/7] fix asset upload bug --- jasset/asset_api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jasset/asset_api.py b/jasset/asset_api.py index 7cc49fa66..ac3a908a6 100644 --- a/jasset/asset_api.py +++ b/jasset/asset_api.py @@ -288,6 +288,8 @@ def excel_to_db(excel_file): ip, port, hostname, use_default_auth, username, password, group = row if get_object(Asset, hostname=hostname): continue + if isinstance(password, int) or isinstance(password, float): + password = unicode(int(password)) use_default_auth = 1 if use_default_auth == u'默认' else 0 password_encode = CRYPTOR.encrypt(password) if password else '' if hostname: @@ -311,7 +313,6 @@ def excel_to_db(excel_file): def get_ansible_asset_info(asset_ip, setup_info): - print setup_info, '***' disk_need = {} disk_all = setup_info.get("ansible_devices") if disk_all: From 2c74c8a8dfc15f4577876a6e34eae203b55be517 Mon Sep 17 00:00:00 2001 From: jiaxiangkong <704564722@qq.com> Date: Wed, 23 Mar 2016 14:42:26 +0800 Subject: [PATCH 6/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c78e9c075..fc35043e1 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ Web批量执行命令 * [常见问题](https://github.com/jumpserver/jumpserver/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98) * 安装基于：[RedHat 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-RedHat-%E7%9A%84%E7%B3%BB%E7%BB%9F)，[Debian 的系统](https://github.com/jumpserver/jumpserver/wiki/%E5%9F%BA%E4%BA%8E-Debian-%E7%9A%84%E7%B3%BB%E7%BB%9F) * [快速开始](https://github.com/jumpserver/jumpserver/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B) +* [安装图解](https://github.com/jumpserver/jumpserver/wiki/%E5%AE%89%E8%A3%85%E5%9B%BE%E8%A7%A3) +* [应用图解](https://github.com/jumpserver/jumpserver/wiki/%E5%BA%94%E7%94%A8%E5%9B%BE%E8%A7%A3) ### 特点 From d7442b4879ba2f9c9ea30cf5c5cd6858fa4c1c56 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 Mar 2016 17:36:12 +0800 Subject: [PATCH 7/7] Update views.py --- jlog/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jlog/views.py b/jlog/views.py index e2565250e..4c5965762 100644 --- a/jlog/views.py +++ b/jlog/views.py @@ -27,7 +27,7 @@ def log_list(request, offset): posts = Log.objects.filter(is_finished=False).order_by('-start_time') if keyword: posts = posts.filter(Q(user__icontains=keyword) | Q(host__icontains=keyword) | - Q(login_type_icontains=keyword)) + Q(login_type__icontains=keyword)) elif offset == 'exec': posts = ExecLog.objects.all().order_by('-id')