From c5013dcbd6d663846c247ce59e9b0c96b84b6abc Mon Sep 17 00:00:00 2001
From: jiangweidong <80373698+fit2cloud-jiangweidong@users.noreply.github.com>
Date: Mon, 13 Dec 2021 10:54:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20saml2=E5=8D=8F=E8=AE=AE=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E6=94=AF=E6=8C=81=E5=9C=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8A=E9=85=8D=E7=BD=AEsaml2=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E9=85=8D=E7=BD=AE=20(#7362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/authentication/backends/saml2/views.py | 13 +++++--------
 apps/jumpserver/conf.py                     |  2 +-
 apps/jumpserver/settings/auth.py            |  2 +-
 apps/settings/serializers/auth/saml2.py     |  3 +++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/authentication/backends/saml2/views.py b/apps/authentication/backends/saml2/views.py
index 26c88b5e2..bd3e4de13 100644
--- a/apps/authentication/backends/saml2/views.py
+++ b/apps/authentication/backends/saml2/views.py
@@ -92,14 +92,11 @@ class PrepareRequestMixin:
 
     @staticmethod
     def get_advanced_settings():
-        other_settings = {}
-        other_settings_path = settings.SAML2_OTHER_SETTINGS_PATH
-        if os.path.exists(other_settings_path):
-            with open(other_settings_path, 'r') as json_data:
-                try:
-                    other_settings = json.loads(json_data.read())
-                except Exception as error:
-                    logger.error('Get other settings error: %s', error)
+        try:
+            other_settings = dict(settings.SAML2_SP_ADVANCED_SETTINGS)
+        except Exception as error:
+            logger.error('Get other settings error: %s', error)
+            other_settings = {}
 
         default = {
             "organization": {
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 9bffc38fa..da4c5646f 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -234,7 +234,7 @@ class Config(dict):
         'SAML2_LOGOUT_COMPLETELY': True,
         'AUTH_SAML2_ALWAYS_UPDATE_USER': True,
         'SAML2_RENAME_ATTRIBUTES': {'uid': 'username', 'email': 'email'},
-        'SAML2_OTHER_SETTINGS_PATH': '',
+        'SAML2_SP_ADVANCED_SETTINGS': {"organization": {"en": {"name": "JumpServer", "displayname": "JumpServer", "url": "https://jumpserver.org/"}}},
         'SAML2_IDP_METADATA_URL': '',
         'SAML2_IDP_METADATA_XML': '',
         'SAML2_SP_KEY_CONTENT': '',
diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py
index 42ba9958a..883f63d07 100644
--- a/apps/jumpserver/settings/auth.py
+++ b/apps/jumpserver/settings/auth.py
@@ -129,7 +129,7 @@ AUTH_SAML2_AUTHENTICATION_FAILURE_REDIRECT_URI = CONFIG.AUTH_SAML2_AUTHENTICATIO
 AUTH_SAML2_ALWAYS_UPDATE_USER = CONFIG.AUTH_SAML2_ALWAYS_UPDATE_USER
 SAML2_LOGOUT_COMPLETELY = CONFIG.SAML2_LOGOUT_COMPLETELY
 SAML2_RENAME_ATTRIBUTES = CONFIG.SAML2_RENAME_ATTRIBUTES
-SAML2_OTHER_SETTINGS_PATH = CONFIG.SAML2_OTHER_SETTINGS_PATH
+SAML2_SP_ADVANCED_SETTINGS = CONFIG.SAML2_SP_ADVANCED_SETTINGS
 SAML2_LOGIN_URL_NAME = "authentication:saml2:saml2-login"
 SAML2_LOGOUT_URL_NAME = "authentication:saml2:saml2-logout"
 
diff --git a/apps/settings/serializers/auth/saml2.py b/apps/settings/serializers/auth/saml2.py
index 724bcf17a..ca102bf0e 100644
--- a/apps/settings/serializers/auth/saml2.py
+++ b/apps/settings/serializers/auth/saml2.py
@@ -17,6 +17,9 @@ class SAML2SettingSerializer(serializers.Serializer):
     SAML2_IDP_METADATA_XML = serializers.CharField(
         allow_blank=True, required=False, label=_('IDP Metadata XML')
     )
+    SAML2_SP_ADVANCED_SETTINGS = serializers.JSONField(
+        required=False, label=_('SP ADVANCED SETTINGS')
+    )
     SAML2_SP_KEY_CONTENT = serializers.CharField(
         allow_blank=True, required=False,
         write_only=True, label=_('SP Private Key')