From 370cdc275a39be9a29f4a2c477adbf1f0001ed19 Mon Sep 17 00:00:00 2001
From: Eli <elixfiary@gmail.com>
Date: Mon, 10 Jul 2017 11:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=EF=BC=8C=E7=84=B6=E5=90=8E=E6=8E=A8=E9=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E6=97=B6=E5=87=BA=E7=8E=B0=EF=BC=88?=
 =?UTF-8?q?Asset=E5=AE=9E=E4=BE=8B=E6=97=A0=E6=B3=95=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96=EF=BC=89=20(#477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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          | 2 +-
 apps/assets/models/user.py  | 2 +-
 apps/jumpserver/settings.py | 4 ++--
 apps/users/models/user.py   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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