fix(url slash): 统一URL后缀slash

longguikeji · Jul 20, 2020 · e1bb526 · e1bb526
1 parent d7368e4
commit e1bb526
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/djangosaml2idp/idpsettings.py b/djangosaml2idp/idpsettings.py
@@ -16,16 +16,16 @@
     'xmlsec_binary':
     get_xmlsec_binary(['/opt/local/bin', '/usr/bin/xmlsec1']),
     'entityid':
-    '%s/saml/metadata' % settings.BASE_URL,
+    '%s/saml/metadata/' % settings.BASE_URL,
     'description':
     'longguikeji IdP setup',
     'service': {
         'idp': {
             'name': 'Django localhost IdP',
             'endpoints': {
                 'single_sign_on_service': [
-                    ('%s/saml/sso/post' % settings.BASE_URL, BINDING_HTTP_POST),
-                    ('%s/saml/sso/redirect' % settings.BASE_URL, BINDING_HTTP_REDIRECT),
+                    ('%s/saml/sso/post/' % settings.BASE_URL, BINDING_HTTP_POST),
+                    ('%s/saml/sso/redirect/' % settings.BASE_URL, BINDING_HTTP_REDIRECT),
                 ],
             },
             'name_id_format': [NAMEID_FORMAT_EMAILADDRESS, NAMEID_FORMAT_UNSPECIFIED],

diff --git a/djangosaml2idp/idpview.py b/djangosaml2idp/idpview.py
@@ -165,16 +165,16 @@ def dispatch(self, request, *args, **kwargs):
             SAML_IDP_CONFIG = {  # pylint: disable=invalid-name
                 'debug': settings.DEBUG,
                 'xmlsec_binary': get_xmlsec_binary(['/opt/local/bin', '/usr/bin/xmlsec1']),
-                'entityid': '%s/saml/metadata' % settings.BASE_URL,
+                'entityid': '%s/saml/metadata/' % settings.BASE_URL,
                 'description': 'longguikeji IdP setup',
 
                 'service': {
                     'idp': {
                         'name': 'Django localhost IdP',
                         'endpoints': {
                             'single_sign_on_service': [
-                                ('%s/saml/sso/post' % settings.BASE_URL, BINDING_HTTP_POST),
-                                ('%s/saml/sso/redirect' % settings.BASE_URL, BINDING_HTTP_REDIRECT),
+                                ('%s/saml/sso/post/' % settings.BASE_URL, BINDING_HTTP_POST),
+                                ('%s/saml/sso/redirect/' % settings.BASE_URL, BINDING_HTTP_REDIRECT),
                             ],
                         },
                         'name_id_format': [NAMEID_FORMAT_EMAILADDRESS, NAMEID_FORMAT_UNSPECIFIED],

diff --git a/oneid_meta/models/app.py b/oneid_meta/models/app.py
@@ -35,7 +35,9 @@ class APP(BaseModel):
     def __str__(self):
         return f'APP: {self.uid}({self.name})'
 
-    def save(self, *args, **kwargs):    # pylint: disable=arguments-differ
+    # pylint: disable=arguments-differ
+    # pylint: disable=signature-differs
+    def save(self, *args, **kwargs):
         if APP.valid_objects.filter(uid=self.uid).exclude(pk=self.pk).exists():
             msg = "UNIQUE constraint failed: " \
                 "oneid_meta.APP UniqueConstraint(fields=['uid'], condition=Q(is_del='False')"
@@ -322,11 +324,11 @@ def more_detail(self):
             {
                 'name': 'IdP方元数据接口',
                 'key': 'entity_id',
-                'value': settings.BASE_URL + '/saml/metadata',
+                'value': settings.BASE_URL + '/saml/metadata/',
             },
             {
                 'name': 'IdP单点登录SSO接口',
                 'key': 'sso',
-                'value': settings.BASE_URL + '/saml/sso/redirect' + ';' + settings.BASE_URL + '/saml/sso/post'
+                'value': settings.BASE_URL + '/saml/sso/redirect/' + ';' + settings.BASE_URL + '/saml/sso/post/'
             },
         ]