添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477)

* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)

apps/assets/api.py

@@ -120,7 +120,7 @@ class SystemUserUpdateApi(generics.RetrieveUpdateAPIView):
         system_users_new = set(asset.system_users.all())
         system_users = system_users_new - old_system_users
         system_users = [system_user._to_secret_json() for system_user in system_users]
-        push_users.delay([asset], system_users)
+        push_users.delay([asset._to_secret_json()], system_users)
         return response
 
 

apps/assets/models/user.py

@@ -81,7 +81,7 @@ class AdminUser(models.Model):
             return None
         project_dir = settings.PROJECT_DIR
         tmp_dir = os.path.join(project_dir, 'tmp')
-        key_name = md5(self._private_key).hexdigest()
+        key_name = md5(self._private_key.encode()).hexdigest()
         key_path = os.path.join(tmp_dir, key_name)
         if not os.path.exists(key_path):
             self.private_key.write_private_key_file(key_path)

apps/jumpserver/settings.py

@@ -25,9 +25,9 @@ sys.path.append(PROJECT_DIR)
 try:
     from config import config as env_config, env
 
-    CONFIG = env_config.get(env, 'default')()
+    CONFIG = env_config.get(env or 'default')()
 except ImportError:
-    CONFIG = type('_', (), {'__getattr__': None})()
+    CONFIG = type('_', (), {'__getattr__': lambda arg1, arg2: None})()
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/

apps/users/models/user.py

@@ -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({