fix(mkdir) 修改mkdirs策略

修改原来导致的bug

connect.py

@@ -180,8 +180,8 @@ class Tty(object):
         log_file_path = os.path.join(today_connect_log_dir, '%s_%s_%s' % (self.username, self.asset_name, time_start))
 
         try:
-            mkdir(os.path.dirname(today_connect_log_dir), mode=0777)
-            mkdir(today_connect_log_dir, mode=0777)
+            mkdir(os.path.dirname(today_connect_log_dir), mode=777)
+            mkdir(today_connect_log_dir, mode=777)
         except OSError:
             logger.debug('创建目录 %s 失败，请修改%s目录权限' % (today_connect_log_dir, tty_log_dir))
             raise ServerError('创建目录 %s 失败，请修改%s目录权限' % (today_connect_log_dir, tty_log_dir))

jperm/utils.py

@@ -42,7 +42,7 @@ def gen_keys(key="", key_path_dir=""):
         key_path_dir = os.path.join(KEY_DIR, 'role_key', key_basename)
     private_key = os.path.join(key_path_dir, 'id_rsa')
     public_key = os.path.join(key_path_dir, 'id_rsa.pub')
-    mkdir(key_path_dir, mode=0755)
+    mkdir(key_path_dir, mode=755)
     if not key:
         key = RSAKey.generate(2048)
         key.write_private_key_file(private_key)

jumpserver/api.py

@@ -91,7 +91,7 @@ def get_role_key(user, role):
     """
     user_role_key_dir = os.path.join(KEY_DIR, 'user')
     user_role_key_path = os.path.join(user_role_key_dir, '%s_%s.pem' % (user.username, role.name))
-    mkdir(user_role_key_dir, mode=0777)
+    mkdir(user_role_key_dir, mode=777)
     if not os.path.isfile(user_role_key_path):
         with open(os.path.join(role.key_path, 'id_rsa')) as fk:
             with open(user_role_key_path, 'w') as fu:
@@ -458,12 +458,12 @@ def bash(cmd):
     return subprocess.call(cmd, shell=True)
 
 
-def mkdir(dir_name, username='', mode=0755):
+def mkdir(dir_name, username='', mode=755):
     """
     insure the dir exist and mode ok
     目录存在，如果不存在就建立，并且权限正确
     """
-    cmd = 'mkdir -p %s && chmod %s %s' % (dir_name, mode, dir_name)
+    cmd = '[ ! -d %s ] && mkdir -p %s && chmod %s %s' % (dir_name, dir_name, mode, dir_name)
     bash(cmd)
     if username:
         chown(dir_name, username)
@@ -485,7 +485,7 @@ def my_render(template, data, request):
 def get_tmp_dir():
     seed = uuid.uuid4().hex[:4]
     dir_name = os.path.join('/tmp', '%s-%s' % (datetime.datetime.now().strftime('%Y%m%d-%H%M%S'), seed))
-    mkdir(dir_name, mode=0777)
+    mkdir(dir_name, mode=777)
     return dir_name
 
 

juser/user_api.py

@@ -130,14 +130,14 @@ def gen_ssh_key(username, password='',
     """
     logger.debug('生成ssh key， 并设置authorized_keys')
     private_key_file = os.path.join(key_dir, username+'.pem')
-    mkdir(key_dir, mode=0777)
+    mkdir(key_dir, mode=777)
     if os.path.isfile(private_key_file):
         os.unlink(private_key_file)
     ret = bash('echo -e  "y\n"|ssh-keygen -t rsa -f %s -b %s -P "%s"' % (private_key_file, length, password))
 
     if authorized_keys:
         auth_key_dir = os.path.join(home, username, '.ssh')
-        mkdir(auth_key_dir, username=username, mode=0700)
+        mkdir(auth_key_dir, username=username, mode=700)
         authorized_key_file = os.path.join(auth_key_dir, 'authorized_keys')
         with open(private_key_file+'.pub') as pub_f:
             with open(authorized_key_file, 'w') as auth_f: