Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
b3317304
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b3317304
编写于
7月 28, 2020
作者:
X
xinwen
提交者:
baltery
7月 28, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(users): 替换旧有角色常量
上级
de3865fa
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
49 addition
and
13 deletion
+49
-13
apps/ops/utils.py
apps/ops/utils.py
+1
-1
apps/orgs/migrations/0007_auto_20200728_1805.py
apps/orgs/migrations/0007_auto_20200728_1805.py
+18
-0
apps/terminal/utils.py
apps/terminal/utils.py
+1
-1
apps/tickets/api/request_asset_perm.py
apps/tickets/api/request_asset_perm.py
+1
-1
apps/tickets/serializers/request_asset_perm.py
apps/tickets/serializers/request_asset_perm.py
+1
-1
apps/users/filters.py
apps/users/filters.py
+1
-1
apps/users/forms/user.py
apps/users/forms/user.py
+5
-5
apps/users/migrations/0028_auto_20200728_1805.py
apps/users/migrations/0028_auto_20200728_1805.py
+18
-0
apps/users/serializers_v2/user.py
apps/users/serializers_v2/user.py
+1
-1
apps/users/tasks.py
apps/users/tasks.py
+2
-2
未找到文件。
apps/ops/utils.py
浏览文件 @
b3317304
...
...
@@ -69,7 +69,7 @@ def send_server_performance_mail(path, usage, usages):
from
users.models
import
User
subject
=
_
(
"Disk used more than 80%: {} => {}"
).
format
(
path
,
usage
.
percent
)
message
=
subject
admins
=
User
.
objects
.
filter
(
role
=
User
.
ROLE
_
ADMIN
)
admins
=
User
.
objects
.
filter
(
role
=
User
.
ROLE
.
ADMIN
)
recipient_list
=
[
u
.
email
for
u
in
admins
if
u
.
email
]
logger
.
info
(
subject
)
send_mail_async
(
subject
,
message
,
recipient_list
,
html_message
=
message
)
...
...
apps/orgs/migrations/0007_auto_20200728_1805.py
0 → 100644
浏览文件 @
b3317304
# Generated by Django 2.2.10 on 2020-07-28 10:05
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'orgs'
,
'0006_auto_20200721_1937'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'organizationmember'
,
name
=
'role'
,
field
=
models
.
CharField
(
choices
=
[(
'Admin'
,
'Organization administrator'
),
(
'User'
,
'User'
),
(
'Auditor'
,
'Organization auditor'
)],
default
=
'User'
,
max_length
=
16
,
verbose_name
=
'Role'
),
),
]
apps/terminal/utils.py
浏览文件 @
b3317304
...
...
@@ -20,7 +20,7 @@ def get_session_asset_list():
def
get_session_user_list
():
return
User
.
objects
.
exclude
(
role
=
User
.
ROLE
_
APP
).
values_list
(
'username'
,
flat
=
True
)
return
User
.
objects
.
exclude
(
role
=
User
.
ROLE
.
APP
).
values_list
(
'username'
,
flat
=
True
)
def
get_session_system_user_list
():
...
...
apps/tickets/api/request_asset_perm.py
浏览文件 @
b3317304
...
...
@@ -48,7 +48,7 @@ class RequestAssetPermTicketViewSet(JMSModelViewSet):
org_mapper
=
{}
UserTuple
=
namedtuple
(
'UserTuple'
,
(
'id'
,
'name'
,
'username'
))
user
=
request
.
user
superusers
=
User
.
objects
.
filter
(
role
=
User
.
ROLE
_
ADMIN
)
superusers
=
User
.
objects
.
filter
(
role
=
User
.
ROLE
.
ADMIN
)
admins_with_org
=
User
.
objects
.
filter
(
related_admin_orgs__users
=
user
).
annotate
(
org_id
=
F
(
'related_admin_orgs__id'
),
org_name
=
F
(
'related_admin_orgs__name'
)
...
...
apps/tickets/serializers/request_asset_perm.py
浏览文件 @
b3317304
...
...
@@ -58,7 +58,7 @@ class RequestAssetPermTicketSerializer(serializers.ModelSerializer):
def
validate_assignees
(
self
,
assignees
):
user
=
self
.
context
[
'request'
].
user
count
=
User
.
objects
.
filter
(
Q
(
related_admin_orgs__users
=
user
)
|
Q
(
role
=
User
.
ROLE
_
ADMIN
)).
filter
(
count
=
User
.
objects
.
filter
(
Q
(
related_admin_orgs__users
=
user
)
|
Q
(
role
=
User
.
ROLE
.
ADMIN
)).
filter
(
id__in
=
[
assignee
.
id
for
assignee
in
assignees
]).
distinct
().
count
()
if
count
!=
len
(
assignees
):
...
...
apps/users/filters.py
浏览文件 @
b3317304
...
...
@@ -12,7 +12,7 @@ class OrgRoleUserFilterBackend(filters.BaseFilterBackend):
return
queryset
if
org_role
==
'admins'
:
return
queryset
&
(
current_org
.
admins
|
User
.
objects
.
filter
(
role
=
User
.
ROLE
_
ADMIN
))
return
queryset
&
(
current_org
.
admins
|
User
.
objects
.
filter
(
role
=
User
.
ROLE
.
ADMIN
))
elif
org_role
==
'auditors'
:
return
queryset
&
current_org
.
auditors
elif
org_role
==
'users'
:
...
...
apps/users/forms/user.py
浏览文件 @
b3317304
...
...
@@ -60,9 +60,9 @@ class UserCreateUpdateFormMixin(OrgModelForm):
roles
=
[]
# Super admin user
if
self
.
request
.
user
.
is_superuser
:
roles
.
append
((
User
.
ROLE
_ADMIN
,
dict
(
User
.
ROLE_CHOICES
).
get
(
User
.
ROLE_ADMIN
)
))
roles
.
append
((
User
.
ROLE
_USER
,
dict
(
User
.
ROLE_CHOICES
).
get
(
User
.
ROLE_USER
)
))
roles
.
append
((
User
.
ROLE
_AUDITOR
,
dict
(
User
.
ROLE_CHOICES
).
get
(
User
.
ROLE_AUDITOR
)
))
roles
.
append
((
User
.
ROLE
.
ADMIN
,
User
.
ROLE
.
ADMIN
.
label
))
roles
.
append
((
User
.
ROLE
.
USER
,
User
.
ROLE
.
USER
.
label
))
roles
.
append
((
User
.
ROLE
.
AUDITOR
,
User
.
ROLE
.
AUDITOR
.
label
))
# Org admin user
else
:
...
...
@@ -70,10 +70,10 @@ class UserCreateUpdateFormMixin(OrgModelForm):
# Update
if
user
:
role
=
kwargs
.
get
(
'instance'
).
role
roles
.
append
((
role
,
dict
(
User
.
ROLE_CHOICES
).
get
(
role
)
))
roles
.
append
((
role
,
User
.
ROLE
[
role
]
))
# Create
else
:
roles
.
append
((
User
.
ROLE
_USER
,
dict
(
User
.
ROLE_CHOICES
).
get
(
User
.
ROLE_USER
)
))
roles
.
append
((
User
.
ROLE
.
USER
,
User
.
ROLE
.
USER
.
label
))
field
=
self
.
fields
[
'role'
]
field
.
choices
=
set
(
roles
)
...
...
apps/users/migrations/0028_auto_20200728_1805.py
0 → 100644
浏览文件 @
b3317304
# Generated by Django 2.2.10 on 2020-07-28 10:05
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'users'
,
'0027_auto_20200616_1503'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'user'
,
name
=
'role'
,
field
=
models
.
CharField
(
blank
=
True
,
choices
=
[(
'Admin'
,
'Super administrator'
),
(
'User'
,
'User'
),
(
'Auditor'
,
'Super auditor'
),
(
'App'
,
'Application'
)],
default
=
'User'
,
max_length
=
10
,
verbose_name
=
'Role'
),
),
]
apps/users/serializers_v2/user.py
浏览文件 @
b3317304
...
...
@@ -39,7 +39,7 @@ class ServiceAccountSerializer(serializers.ModelSerializer):
def
save
(
self
,
**
kwargs
):
self
.
validated_data
[
'email'
]
=
self
.
get_email
()
self
.
validated_data
[
'username'
]
=
self
.
get_username
()
self
.
validated_data
[
'role'
]
=
User
.
ROLE
_
APP
self
.
validated_data
[
'role'
]
=
User
.
ROLE
.
APP
return
super
().
save
(
**
kwargs
)
def
create
(
self
,
validated_data
):
...
...
apps/users/tasks.py
浏览文件 @
b3317304
...
...
@@ -22,7 +22,7 @@ logger = get_logger(__file__)
@
shared_task
def
check_password_expired
():
users
=
User
.
objects
.
filter
(
source
=
User
.
SOURCE_LOCAL
).
exclude
(
role
=
User
.
ROLE
_
APP
)
users
=
User
.
objects
.
filter
(
source
=
User
.
SOURCE_LOCAL
).
exclude
(
role
=
User
.
ROLE
.
APP
)
for
user
in
users
:
if
not
user
.
is_valid
:
continue
...
...
@@ -49,7 +49,7 @@ def check_password_expired_periodic():
@
shared_task
def
check_user_expired
():
users
=
User
.
objects
.
exclude
(
role
=
User
.
ROLE
_
APP
)
users
=
User
.
objects
.
exclude
(
role
=
User
.
ROLE
.
APP
)
for
user
in
users
:
if
not
user
.
is_valid
:
continue
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录