Skip to content

J
jumpserver
Commit e65cad50 authored by ibuler's avatar ibuler
Browse files
Options

Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev

parents affd9aad b0f2b346
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 73 deletions
jperm/perm_api.py
View file @ e65cad50
...@@ -259,23 +259,23 @@ def get_role_info(role_id, type="all"): ...@@ -259,23 +259,23 @@ def get_role_info(role_id, type="all"):
asset_groups_obj.append(asset_group) asset_groups_obj.append(asset_group)
if type == "all": if type == "all":
return {"rules": rule_push_obj, return {"rules": set(rule_push_obj),
"users": users_obj, "users": set(users_obj),
"user_groups": user_groups_obj, "user_groups": set(user_groups_obj),
"assets": assets_obj, "assets": set(assets_obj),
"asset_groups": asset_groups_obj, "asset_groups": set(asset_groups_obj),
} }
elif type == "rule": elif type == "rule":
return rule_push_obj return set(rule_push_obj)
elif type == "user": elif type == "user":
return users_obj return set(users_obj)
elif type == "user_group": elif type == "user_group":
return user_groups_obj return set(user_groups_obj)
elif type == "asset": elif type == "asset":
return assets_obj return set(assets_obj)
elif type == "asset_group": elif type == "asset_group":
return asset_groups_obj return set(asset_groups_obj)
else: else:
return u"不支持的查询" return u"不支持的查询"
......
jperm/views.py
View file @ e65cad50
...@@ -23,6 +23,7 @@ logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log') ...@@ -23,6 +23,7 @@ logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log')
def perm_rule_list(request): def perm_rule_list(request):
""" """
list rule page list rule page
授权规则列表
""" """
# 渲染数据 # 渲染数据
header_title, path1, path2 = "授权规则", "规则管理", "查看规则" header_title, path1, path2 = "授权规则", "规则管理", "查看规则"
...@@ -46,6 +47,7 @@ def perm_rule_list(request): ...@@ -46,6 +47,7 @@ def perm_rule_list(request):
def perm_rule_detail(request): def perm_rule_detail(request):
""" """
rule detail page rule detail page
授权详情
""" """
# 渲染数据 # 渲染数据
header_title, path1, path2 = "授权规则", "规则管理", "规则详情" header_title, path1, path2 = "授权规则", "规则管理", "规则详情"
...@@ -54,14 +56,18 @@ def perm_rule_detail(request): ...@@ -54,14 +56,18 @@ def perm_rule_detail(request):
rule_id = request.GET.get("id") rule_id = request.GET.get("id")
rule_obj = PermRule.objects.get(id=rule_id) rule_obj = PermRule.objects.get(id=rule_id)
user_obj = rule_obj.user.all() user_obj = rule_obj.user.all()
user_group_obj = rule_obj.user_group.all()
asset_obj = rule_obj.asset.all() asset_obj = rule_obj.asset.all()
asset_group_obj = rule_obj.asset_group.all()
roles_name = [role.name for role in rule_obj.role.all()] roles_name = [role.name for role in rule_obj.role.all()]
# 渲染数据 # 渲染数据
roles_name = ','.join(roles_name) roles_name = ','.join(roles_name)
rule = rule_obj rule = rule_obj
users = user_obj users = user_obj
user_groups = user_group_obj
assets = asset_obj assets = asset_obj
asset_groups = asset_group_obj
return my_render('jperm/perm_rule_detail.html', locals(), request) return my_render('jperm/perm_rule_detail.html', locals(), request)
...@@ -69,6 +75,7 @@ def perm_rule_detail(request): ...@@ -69,6 +75,7 @@ def perm_rule_detail(request):
def perm_rule_add(request): def perm_rule_add(request):
""" """
add rule page add rule page
添加授权
""" """
# 渲染数据 # 渲染数据
header_title, path1, path2 = "授权规则", "规则管理", "添加规则" header_title, path1, path2 = "授权规则", "规则管理", "添加规则"
...@@ -116,8 +123,8 @@ def perm_rule_add(request): ...@@ -116,8 +123,8 @@ def perm_rule_add(request):
need_push_asset = set() need_push_asset = set()
for role in roles_obj: for role in roles_obj:
asset_no_push = get_role_push_host(role=role)[0] # 获取某角色已经推送的资产 asset_no_push = get_role_push_host(role=role)[1] # 获取某角色已经推送的资产
need_push_asset.update(set(calc_assets) - set(asset_no_push)) need_push_asset.update(set(calc_assets) & set(asset_no_push))
if need_push_asset: if need_push_asset:
raise ServerError(u'没有推送角色 %s 的主机 %s' raise ServerError(u'没有推送角色 %s 的主机 %s'
% (role.name, ','.join([asset.hostname for asset in need_push_asset]))) % (role.name, ','.join([asset.hostname for asset in need_push_asset])))
...@@ -183,15 +190,13 @@ def perm_rule_edit(request): ...@@ -183,15 +190,13 @@ def perm_rule_edit(request):
# 获取需要授权的用户列表 # 获取需要授权的用户列表
users_obj = [User.objects.get(id=user_id) for user_id in users_select] users_obj = [User.objects.get(id=user_id) for user_id in users_select]
user_groups_obj = [UserGroup.objects.get(id=group_id) for group_id in user_groups_select] user_groups_obj = [UserGroup.objects.get(id=group_id) for group_id in user_groups_select]
# group_users_obj = [user for user in [group.user_set.all() for group in user_groups_obj]]
# calc_users = set(group_users_obj) | set(users_obj)
# 获取授予的角色列表 # 获取授予的角色列表
roles_obj = [PermRole.objects.get(id=role_id) for role_id in roles_select] roles_obj = [PermRole.objects.get(id=role_id) for role_id in roles_select]
need_push_asset = set() need_push_asset = set()
for role in roles_obj: for role in roles_obj:
asset_no_push = get_role_push_host(role=role)[0] # 获取某角色已经推送的资产 asset_no_push = get_role_push_host(role=role)[1] # 获取某角色已经推送的资产
need_push_asset.update(set(calc_assets) - set(asset_no_push)) need_push_asset.update(set(calc_assets) & set(asset_no_push))
if need_push_asset: if need_push_asset:
raise ServerError(u'没有推送角色 %s 的主机 %s' raise ServerError(u'没有推送角色 %s 的主机 %s'
% (role.name, ','.join([asset.hostname for asset in need_push_asset]))) % (role.name, ','.join([asset.hostname for asset in need_push_asset])))
......
jumpserver.conf
View file @ e65cad50
...@@ -13,7 +13,7 @@ password = mysql234 ...@@ -13,7 +13,7 @@ password = mysql234
database = jumpserver database = jumpserver
[websocket] [websocket]
web_socket_host = j:3000 web_socket_host = 127.0.0.1:3000
[mail] [mail]
mail_enable = 1 mail_enable = 1
......
templates/jperm/perm_role_detail.html
View file @ e65cad50
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
{% for rule in rules %} {% for rule in rules %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center"> {{ rule.date_added | date:"Y-m-d H:i:s"}} </td> <td class="text-center"> {{ rule.date_added | date:"Y-m-d H:i:s"}} </td>
<td class="text-center"> {{ rule.name }} </td> <td class="text-center"> <a href="/jperm/perm_rule_detail/?id={{ rule.id }}">{{ rule.name }}</a> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<span class="label label-primary"><b>{{ role.name }} - 授权用户/用户组</b></span> <span class="label label-primary"><b>授权用户/用户组</b></span>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
...@@ -74,33 +74,47 @@ ...@@ -74,33 +74,47 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div> <div class="text-center" style="float: left;">
<div class="text-left">
<table class="table table-striped" id="ugedit" > <table class="table table-striped" id="ugedit" >
<thead> <thead>
<tr> <tr>
<th class="text-center">用户</th> <th class="text-center">用户</th>
<th class="text-center">用户组</th>
</tr> </tr>
</thead> </thead>
<tbody>
<tbody>
{% for user in users %} {% for user in users %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center"> {{ user.name }} </td> <td class="text-center"> <a href="/juser/user_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
<td class="text-center"> {{ user | user_which_groups:"group" }} </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table>
</div>
<div class="text-center" style="float: right;">
<table class="table table-striped" id="ugedit" >
<thead>
<tr>
<th class="text-center">用户组</th>
</tr>
</thead>
<tbody>
{% for group in user_groups %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_list/?gid={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table> </table>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<span class="label label-primary"><b>{{ role.name }} - 授权主机/主机组</b></span> <span class="label label-primary"><b>授权主机/主机组</b></span>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
...@@ -120,29 +134,33 @@ ...@@ -120,29 +134,33 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div> <div class="text-center" style="float:left;">
<div class="text-left">
<table class="table table-striped" id="agedit" > <table class="table table-striped" id="agedit" >
<thead>
<tr> <tr>
<th class="text-center">主机</th> <th class="text-center">主机</th>
<th class="text-center">主机组</th>
</tr> </tr>
</thead>
<tbody>
{% for asset in assets %} {% for asset in assets %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center"> {{ asset.ip }} </td> <td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
<td class="text-center"> {{ asset | asset_which_groups:"group" }} </td> </tr>
{% endfor %}
</table>
</div>
<div class="text-center" style="float:right;">
<table class="table table-striped" id="agedit" >
<tr>
<th class="text-center">主机组</th>
</tr>
{% for group in asset_groups %}
<tr class="gradeX">
<td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </table>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
......
templates/jperm/perm_rule_detail.html
View file @ e65cad50
...@@ -83,29 +83,40 @@ ...@@ -83,29 +83,40 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div> <div class="text-center" style="float: left;">
<div class="text-left">
<table class="table table-striped" id="ugedit" > <table class="table table-striped" id="ugedit" >
<thead> <thead>
<tr> <tr>
<th class="text-center">用户</th> <th class="text-center">用户</th>
<th class="text-center">用户组</th>
</tr> </tr>
</thead> </thead>
<tbody>
<tbody>
{% for user in users %}
<tr class="gradeX"> <tr class="gradeX">
{% for user in users %} <td class="text-center"> <a href="/juser/user_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
<td class="text-center"> {{ user.name }} </td> </tr>
{% endfor %} {% endfor %}
{% for group in user_groups %} </tbody>
<td class="text-center"> {{ group.name }} </td> </table>
{% endfor %} </div>
<div class="text-center" style="float: right;">
<table class="table table-striped" id="ugedit" >
<thead>
<tr>
<th class="text-center">用户组</th>
</tr> </tr>
</thead>
</tbody> <tbody>
{% for group in user_groups %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_list/?gid={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table> </table>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -132,28 +143,30 @@ ...@@ -132,28 +143,30 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div> <div class="text-center" style="float:left;">
<div class="text-left">
<table class="table table-striped" id="agedit" > <table class="table table-striped" id="agedit" >
<thead>
<tr> <tr>
<th class="text-center">主机</th> <th class="text-center">主机</th>
</tr>
{% for asset in assets %}
<tr class="gradeX">
<td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
</tr>
{% endfor %}
</table>
</div>
<div class="text-center" style="float:right;">
<table class="table table-striped" id="agedit" >
<tr>
<th class="text-center">主机组</th> <th class="text-center">主机组</th>
</tr> </tr>
</thead> {% for group in asset_groups %}
<tbody>
<tr class="gradeX"> <tr class="gradeX">
{% for asset in assets %} <td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
<td class="text-center"> {{ asset.ip }} </td>
{% endfor %}
{% for group in asset_groups %}
<td class="text-center"> {{ group.name }} </td>
{% endfor %}
</tr> </tr>
</tbody> {% endfor %}
</table> </table>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
templates/jperm/perm_rule_list.html
View file @ e65cad50
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<tbody id="edittbody"> <tbody id="edittbody">
{% for rule in rules %} {% for rule in rules %}
<tr class="gradeX" id={{ rule.id }}> <tr class="gradeX" id={{ rule.id }}>
<td class="text-center"> {{ rule.name }} </td> <td class="text-center"> <a href="/jperm/perm_rule_detail/?id={{ rule.id }}" >{{ rule.name }}</a> </td>
<td class="text-center"> <td class="text-center">
{{ rule | rule_member_count:"user" }} {{ rule | rule_member_count:"user" }}
</td> </td>
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
{{ rule | rule_member_count:"role" }} {{ rule | rule_member_count:"role" }}
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="/jperm/perm_rule_detail/?id={{ rule.id }}" class="btn btn-xs btn-primary">详情</a>
<a href="/jperm/perm_rule_edit/?id={{ rule.id }}" class="btn btn-xs btn-info">编辑</a> <a href="/jperm/perm_rule_edit/?id={{ rule.id }}" class="btn btn-xs btn-info">编辑</a>
<button onclick="remove_rule({{ rule.id }})" class="btn btn-xs btn-danger">删除</button> <button onclick="remove_rule({{ rule.id }})" class="btn btn-xs btn-danger">删除</button>
</td> </td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment