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

bug fix

pull/26/head
ibuler 2015-11-18 15:23:56 +08:00
parent 2a6051ae35
commit 79ecbc83ae
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jperm/utils.py
View File

@ -45,14 +45,8 @@ def gen_keys():
:return: 返回目录名(uuid) :return: 返回目录名(uuid)
""" """
key_basename = "key-" + uuid4().hex key_basename = "key-" + uuid4().hex
<<<<<<< HEAD
key_path_dir = os.path.join(KEY_DIR, key_basename)
mkdir(key_path_dir, 0755)
=======
key_path_dir = os.path.join(KEY_DIR, 'role_key', key_basename) key_path_dir = os.path.join(KEY_DIR, 'role_key', key_basename)
makedirs(key_path_dir, 0775) mkdir(key_path_dir, 0755)
>>>>>>> dev
key = RSAKey.generate(2048) key = RSAKey.generate(2048)
private_key = os.path.join(key_path_dir, 'id_rsa') private_key = os.path.join(key_path_dir, 'id_rsa')
public_key = os.path.join(key_path_dir, 'id_rsa.pub') public_key = os.path.join(key_path_dir, 'id_rsa.pub')
@ -66,10 +60,7 @@ def gen_keys():
content_file.write(data) content_file.write(data)
return key_path_dir return key_path_dir
<<<<<<< HEAD
=======
>>>>>>> dev
if __name__ == "__main__": if __name__ == "__main__":
print gen_keys() print gen_keys()