github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8645 from jumpserver/dev 

v2.24.0
pull/8658/head v2.24.0
Jiangjie.Bai 2022-07-21 15:40:57 +08:00 committed by GitHub
parent d34c4fb7ec 9d17f27fb3
commit f52a0ce960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/utils/crypto.py
View File

@ -259,7 +259,7 @@ def decrypt_password(value):
aes = get_aes_crypto(aes_key, 'ECB') aes = get_aes_crypto(aes_key, 'ECB')
try: try:
password = aes.decrypt(password_cipher) password = aes.decrypt(password_cipher)
except UnicodeDecodeError as e: except Exception as e:
logging.error("Decrypt password error: {}, {}".format(password_cipher, e)) logging.error("Decrypt password error: {}, {}".format(password_cipher, e))
return value return value
return password return password

7
apps/orgs/models.py
View File

@ -16,9 +16,14 @@ class OrgRoleMixin:
def add_member(self, user, role=None): def add_member(self, user, role=None):
from rbac.builtin import BuiltinRole from rbac.builtin import BuiltinRole
from .utils import tmp_to_org from .utils import tmp_to_org
role_id = BuiltinRole.org_user.id
if role: if role:
role_id = role.id role_id = role.id
elif user.is_service_account:
role_id = BuiltinRole.system_component.id
else:
role_id = BuiltinRole.org_user.id
with tmp_to_org(self): with tmp_to_org(self):
defaults = { defaults = {
'user': user, 'role_id': role_id, 'user': user, 'role_id': role_id,

3
apps/settings/serializers/auth/sso.py
View File

@ -1,4 +1,3 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
@ -14,5 +13,5 @@ class SSOSettingSerializer(serializers.Serializer):
) )
AUTH_SSO_AUTHKEY_TTL = serializers.IntegerField( AUTH_SSO_AUTHKEY_TTL = serializers.IntegerField(
required=False, label=_('SSO auth key TTL'), help_text=_("Unit: second"), required=False, label=_('SSO auth key TTL'), help_text=_("Unit: second"),
min_value=1, max_value=60*30 min_value=60, max_value=60 * 30
) )