diff --git a/apps/assets/api.py b/apps/assets/api.py index 2647dbf78..9f3f28454 100644 --- a/apps/assets/api.py +++ b/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 diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index e7a817428..2d6822895 100644 --- a/apps/assets/models/user.py +++ b/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) diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 035052efc..80a975b59 100644 --- a/apps/jumpserver/settings.py +++ b/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/ diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 0aaa8163f..2772558d8 100644 --- a/apps/users/models/user.py +++ b/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({