From 04e7073acae1dacc3aa1127115427ae2461ab60b Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Wed, 18 Nov 2015 19:03:13 +0800
Subject: [PATCH 2/3] 1. fixed ansible api auto load local host file
(/etc/ansible/hosts) bug with null list
---
jperm/ansible_api.py | 4 ++--
jperm/playbooks/ansible_need.txt | 0
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 jperm/playbooks/ansible_need.txt
diff --git a/jperm/ansible_api.py b/jperm/ansible_api.py
index 1f3774e61..3a8b50c61 100644
--- a/jperm/ansible_api.py
+++ b/jperm/ansible_api.py
@@ -15,9 +15,9 @@ from utils import get_rand_pass
import os.path
+
API_DIR = os.path.dirname(os.path.abspath(__file__))
ANSIBLE_DIR = os.path.join(API_DIR, 'playbooks')
-NULL_FILE = os.path.join(ANSIBLE_DIR, 'ansible_need.txt')
@@ -62,7 +62,7 @@ class MyInventory(object):
[{"hostname": "10.10.10.10", "port": "22", "username": "test", "password": "mypass"}, ...]
"""
self.resource = resource
- self.inventory = Inventory(host_list=NULL_FILE)
+ self.inventory = Inventory(host_list=[])
self.gen_inventory()
def add_group(self, hosts, groupname, groupvars=None):
diff --git a/jperm/playbooks/ansible_need.txt b/jperm/playbooks/ansible_need.txt
deleted file mode 100644
index e69de29bb..000000000
From 6582ee162472e208f63fe32db8c109c3b91934a2 Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Wed, 18 Nov 2015 22:32:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=20=20=E6=9B=B4=E6=96=B0=20=E5=92=8C=20?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=EF=BC=88role=20=E5=92=8C=20rule=20)?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=20=E4=BB=A5=20msg=20=E7=9A=84=E6=96=B9?=
=?UTF-8?q?=E5=BC=8F=20=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jperm/utils.py | 2 +-
jperm/views.py | 57 +++++++++++++++++++++++++----
templates/jperm/perm_role_edit.html | 2 +-
templates/jperm/perm_role_list.html | 8 ++++
templates/jperm/perm_rule_list.html | 10 +++++
5 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/jperm/utils.py b/jperm/utils.py
index e0f1fd6df..63054b30b 100644
--- a/jperm/utils.py
+++ b/jperm/utils.py
@@ -7,7 +7,7 @@ from paramiko.rsakey import RSAKey
from os import chmod, makedirs
from uuid import uuid4
-#from jumpserver.settings import KEY_DIR
+from jumpserver.settings import KEY_DIR
def get_rand_pass():
diff --git a/jperm/views.py b/jperm/views.py
index 13ca11a14..f961a8e07 100644
--- a/jperm/views.py
+++ b/jperm/views.py
@@ -62,7 +62,7 @@ def perm_rule_detail(request):
assets = asset_obj
return my_render('jperm/perm_rule_detail.html', locals(), request)
-
+
def perm_rule_add(request):
"""
@@ -117,7 +117,18 @@ def perm_rule_add(request):
rule.role = roles_obj
rule.save()
- return HttpResponse(u"添加授权规则：%s" % rule.name)
+ msg = u"添加授权规则：%s" % rule.name
+ # 渲染数据
+ header_title, path1, path2 = "授权规则", "规则管理", "查看规则"
+ rules_list = PermRule.objects.all()
+
+ # TODO: 搜索和分页
+ keyword = request.GET.get('search', '')
+ if keyword:
+ rules_list = rules_list.filter(Q(name=keyword))
+ rules_list, p, rules, page_range, current_page, show_first, show_end = pages(rules_list, request)
+
+ return my_render('jperm/perm_rule_list.html', locals(), request)
@require_role('admin')
@@ -132,7 +143,6 @@ def perm_rule_edit(request):
rule_id = request.GET.get("id")
rule = PermRule.objects.get(id=rule_id)
-
if request.method == 'GET' and rule_id:
# 渲染数据, 获取所选的rule对象
rule_comment = rule.comment
@@ -183,12 +193,20 @@ def perm_rule_edit(request):
rule.role = roles_obj
rule.name = rule_name
rule.comment = rule.comment
-
- print rule, rule.name
rule.save()
- return HttpResponse(u"更新授权规则：%s" % rule.name)
+ msg = u"更新授权规则：%s" % rule.name
+ # 渲染数据
+ header_title, path1, path2 = "授权规则", "规则管理", "查看规则"
+ rules_list = PermRule.objects.all()
+ # TODO: 搜索和分页
+ keyword = request.GET.get('search', '')
+ if keyword:
+ rules_list = rules_list.filter(Q(name=keyword))
+ rules_list, p, rules, page_range, current_page, show_first, show_end = pages(rules_list, request)
+
+ return my_render('jperm/perm_rule_list.html', locals(), request)
@require_role('admin')
@@ -254,7 +272,18 @@ def perm_role_add(request):
key_path = gen_keys()
role = PermRole(name=name, comment=comment, password=encrypt_pass, key_path=key_path)
role.save()
- return HttpResponse(u"添加角色: %s" % name)
+
+ msg = u"添加角色: %s" % name
+ # 渲染 刷新数据
+ header_title, path1, path2 = "系统角色", "角色管理", "查看角色"
+ roles_list = PermRole.objects.all()
+ # TODO: 搜索和分页
+ keyword = request.GET.get('search', '')
+ if keyword:
+ roles_list = roles_list.filter(Q(name=keyword))
+
+ roles_list, p, roles, page_range, current_page, show_first, show_end = pages(roles_list, request)
+ return my_render('jperm/perm_role_list.html', locals(), request)
else:
return HttpResponse(u"不支持该操作")
@@ -320,6 +349,7 @@ def perm_role_edit(request):
# 渲染数据
role_id = request.GET.get("id")
role = PermRole.objects.get(id=role_id)
+ role_pass = CRYPTOR.decrypt(role.password)
if request.method == "GET":
return my_render('jperm/perm_role_edit.html', locals(), request)
@@ -336,7 +366,18 @@ def perm_role_edit(request):
role.comment = role_comment
role.save()
- return HttpResponse(u"更新系统角色： %s" % role.name)
+ msg = u"更新系统角色： %s" % role.name
+
+ # 渲染 刷新数据
+ header_title, path1, path2 = "系统角色", "角色管理", "查看角色"
+ roles_list = PermRole.objects.all()
+ # TODO: 搜索和分页
+ keyword = request.GET.get('search', '')
+ if keyword:
+ roles_list = roles_list.filter(Q(name=keyword))
+
+ roles_list, p, roles, page_range, current_page, show_first, show_end = pages(roles_list, request)
+ return my_render('jperm/perm_role_list.html', locals(), request)
diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html
index 81d56d4b4..3b5637560 100644
--- a/templates/jperm/perm_role_edit.html
+++ b/templates/jperm/perm_role_edit.html
@@ -43,7 +43,7 @@
diff --git a/templates/jperm/perm_role_list.html b/templates/jperm/perm_role_list.html
index 760a1b731..045012ccd 100644
--- a/templates/jperm/perm_role_list.html
+++ b/templates/jperm/perm_role_list.html
@@ -7,6 +7,14 @@
+
+ {% if error %}
+
{{ error }}
+ {% endif %}
+ {% if msg %}
+
{{ msg }}
+ {% endif %}
+