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

fix id_dsa check error (#458) 

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )
pull/485/merge
njqaaa 2017-06-06 11:23:39 +08:00 committed by 老广
parent b680a42425
commit 9b14244363
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/common/utils.py
View File

@ -180,15 +180,14 @@ def timesince(dt, since='', default="just now"):
def ssh_key_string_to_obj(text):
key_f = StringIO(text)
key = None
try:
key = paramiko.RSAKey.from_private_key(key_f)
key = paramiko.RSAKey.from_private_key( StringIO(text) )
except paramiko.SSHException:
pass
try:
key = paramiko.DSSKey.from_private_key(key_f)
key = paramiko.DSSKey.from_private_key( StringIO(text) )
except paramiko.SSHException:
pass
return key
@ -375,4 +374,4 @@ def sum_capacity(cap_list):
return capacity_convert(total, expect='auto')
signer = Signer()
signer = Signer()

2
apps/users/models/user.py
View File

@ -189,7 +189,7 @@ class User(AbstractUser):
return 'https://www.gravatar.com/avatar/c6812ab450230979465d7bf288eadce2a?s=120&d=identicon'
def generate_reset_token(self):
return signer.sign_t({'reset': self.id, 'email': self.email}, expires_in=3600)
return signer.sign_t({'reset': self.id, 'email': self.email}, expires_in=3600).decode('utf-8')
def to_json(self):
return OrderedDict({