Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
9be13cf0
Commit
9be13cf0
authored
Apr 20, 2016
by
yumaojun03
Committed by
ibuler
Apr 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix (jperm): 修复密码添加和更新 role时 密码过长引起的bug (#202)
1. 修改password字段的长度,对称加密过后的字符串会变长,所有设置得比较大(512) 2. 修改后端检查密码长度,并触发异常。
parent
c9ff2350
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
models.py
jperm/models.py
+1
-1
views.py
jperm/views.py
+4
-0
No files found.
jperm/models.py
View file @
9be13cf0
...
@@ -26,7 +26,7 @@ class PermSudo(models.Model):
...
@@ -26,7 +26,7 @@ class PermSudo(models.Model):
class
PermRole
(
models
.
Model
):
class
PermRole
(
models
.
Model
):
name
=
models
.
CharField
(
max_length
=
100
,
unique
=
True
)
name
=
models
.
CharField
(
max_length
=
100
,
unique
=
True
)
comment
=
models
.
CharField
(
max_length
=
100
,
null
=
True
,
blank
=
True
,
default
=
''
)
comment
=
models
.
CharField
(
max_length
=
100
,
null
=
True
,
blank
=
True
,
default
=
''
)
password
=
models
.
CharField
(
max_length
=
128
)
password
=
models
.
CharField
(
max_length
=
512
)
key_path
=
models
.
CharField
(
max_length
=
100
)
key_path
=
models
.
CharField
(
max_length
=
100
)
date_added
=
models
.
DateTimeField
(
auto_now
=
True
)
date_added
=
models
.
DateTimeField
(
auto_now
=
True
)
sudo
=
models
.
ManyToManyField
(
PermSudo
,
related_name
=
'perm_role'
)
sudo
=
models
.
ManyToManyField
(
PermSudo
,
related_name
=
'perm_role'
)
...
...
jperm/views.py
View file @
9be13cf0
...
@@ -290,6 +290,8 @@ def perm_role_add(request):
...
@@ -290,6 +290,8 @@ def perm_role_add(request):
if
name
==
"root"
:
if
name
==
"root"
:
raise
ServerError
(
u'禁止使用root用户作为系统用户,这样非常危险!'
)
raise
ServerError
(
u'禁止使用root用户作为系统用户,这样非常危险!'
)
default
=
get_object
(
Setting
,
name
=
'default'
)
default
=
get_object
(
Setting
,
name
=
'default'
)
if
len
(
password
)
>
64
:
raise
ServerError
(
u'密码长度不能超过64位!'
)
if
password
:
if
password
:
encrypt_pass
=
CRYPTOR
.
encrypt
(
password
)
encrypt_pass
=
CRYPTOR
.
encrypt
(
password
)
...
@@ -446,6 +448,8 @@ def perm_role_edit(request):
...
@@ -446,6 +448,8 @@ def perm_role_edit(request):
role_sudo_names
=
request
.
POST
.
getlist
(
"sudo_name"
)
role_sudo_names
=
request
.
POST
.
getlist
(
"sudo_name"
)
role_sudos
=
[
PermSudo
.
objects
.
get
(
id
=
sudo_id
)
for
sudo_id
in
role_sudo_names
]
role_sudos
=
[
PermSudo
.
objects
.
get
(
id
=
sudo_id
)
for
sudo_id
in
role_sudo_names
]
key_content
=
request
.
POST
.
get
(
"role_key"
,
""
)
key_content
=
request
.
POST
.
get
(
"role_key"
,
""
)
if
len
(
role_password
)
>
64
:
raise
ServerError
(
u'密码长度不能超过64位!'
)
try
:
try
:
if
not
role
:
if
not
role
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment