Make some staticmethods classmethods instead

Author: akx

src/onelogin/saml2/idp_metadata_parser.py

@@ -25,8 +25,8 @@ class OneLogin_Saml2_IdPMetadataParser(object):
     A class that contain methods related to obtaining and parsing metadata from IdP
     """
 
-    @staticmethod
-    def get_metadata(url, validate_cert=True):
+    @classmethod
+    def get_metadata(cls, url, validate_cert=True):
         """
         Gets the metadata XML from the provided URL
         :param url: Url where the XML of the Identity Provider Metadata is published.
@@ -63,8 +63,8 @@ def get_metadata(url, validate_cert=True):
 
         return xml
 
-    @staticmethod
-    def parse_remote(url, validate_cert=True, entity_id=None, **kwargs):
+    @classmethod
+    def parse_remote(cls, url, validate_cert=True, entity_id=None, **kwargs):
         """
         Gets the metadata XML from the provided URL and parse it, returning a dict with extracted data
         :param url: Url where the XML of the Identity Provider Metadata is published.
@@ -80,11 +80,12 @@ def parse_remote(url, validate_cert=True, entity_id=None, **kwargs):
         :returns: settings dict with extracted data
         :rtype: dict
         """
-        idp_metadata = OneLogin_Saml2_IdPMetadataParser.get_metadata(url, validate_cert)
-        return OneLogin_Saml2_IdPMetadataParser.parse(idp_metadata, entity_id=entity_id, **kwargs)
+        idp_metadata = cls.get_metadata(url, validate_cert)
+        return cls.parse(idp_metadata, entity_id=entity_id, **kwargs)
 
-    @staticmethod
+    @classmethod
     def parse(
+            cls,
             idp_metadata,
             required_sso_binding=OneLogin_Saml2_Constants.BINDING_HTTP_REDIRECT,
             required_slo_binding=OneLogin_Saml2_Constants.BINDING_HTTP_REDIRECT,

src/onelogin/saml2/logout_request.py

@@ -203,8 +203,8 @@ def get_nameid_data(request, key=None):
 
         return name_id_data
 
-    @staticmethod
-    def get_nameid(request, key=None):
+    @classmethod
+    def get_nameid(cls, request, key=None):
         """
         Gets the NameID of the Logout Request Message
         :param request: Logout Request Message
@@ -214,11 +214,11 @@ def get_nameid(request, key=None):
         :return: Name ID Value
         :rtype: string
         """
-        name_id = OneLogin_Saml2_Logout_Request.get_nameid_data(request, key)
+        name_id = cls.get_nameid_data(request, key)
         return name_id['Value']
 
-    @staticmethod
-    def get_nameid_format(request, key=None):
+    @classmethod
+    def get_nameid_format(cls, request, key=None):
         """
         Gets the NameID Format of the Logout Request Message
         :param request: Logout Request Message
@@ -229,7 +229,7 @@ def get_nameid_format(request, key=None):
         :rtype: string
         """
         name_id_format = None
-        name_id_data = OneLogin_Saml2_Logout_Request.get_nameid_data(request, key)
+        name_id_data = cls.get_nameid_data(request, key)
         if name_id_data and 'Format' in name_id_data.keys():
             name_id_format = name_id_data['Format']
         return name_id_format
@@ -326,7 +326,7 @@ def is_valid(self, request_data, raise_exceptions=False):
                             )
 
                 # Check issuer
-                issuer = OneLogin_Saml2_Logout_Request.get_issuer(root)
+                issuer = self.get_issuer(root)
                 if issuer is not None and issuer != idp_entity_id:
                     raise OneLogin_Saml2_ValidationError(
                         'Invalid issuer in the Logout Request (expected %(idpEntityId)s, got %(issuer)s)' %

src/onelogin/saml2/metadata.py

@@ -34,8 +34,8 @@ class OneLogin_Saml2_Metadata(object):
     TIME_VALID = 172800   # 2 days
     TIME_CACHED = 604800  # 1 week
 
-    @staticmethod
-    def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=None, contacts=None, organization=None):
+    @classmethod
+    def builder(cls, sp, authnsign=False, wsign=False, valid_until=None, cache_duration=None, contacts=None, organization=None):
         """
         Builds the metadata of the SP
 
@@ -61,7 +61,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
         :type organization: dict
         """
         if valid_until is None:
-            valid_until = int(time()) + OneLogin_Saml2_Metadata.TIME_VALID
+            valid_until = int(time()) + cls.TIME_VALID
         if not isinstance(valid_until, basestring):
             if isinstance(valid_until, datetime):
                 valid_until_time = valid_until.timetuple()
@@ -72,7 +72,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
             valid_until_str = valid_until
 
         if cache_duration is None:
-            cache_duration = OneLogin_Saml2_Metadata.TIME_CACHED
+            cache_duration = cls.TIME_CACHED
         if not isinstance(cache_duration, compat.str_type):
             cache_duration_str = 'PT%sS' % cache_duration  # Period of Time x Seconds
         else:
@@ -228,8 +228,8 @@ def __add_x509_key_descriptors(root, cert, signing):
         x509_certificate.text = OneLogin_Saml2_Utils.format_cert(cert, False)
         key_descriptor.set('use', ('encryption', 'signing')[signing])
 
-    @staticmethod
-    def add_x509_key_descriptors(metadata, cert=None, add_encryption=True):
+    @classmethod
+    def add_x509_key_descriptors(cls, metadata, cert=None, add_encryption=True):
         """
         Adds the x509 descriptors (sign/encryption) to the metadata
         The same cert will be used for sign/encrypt
@@ -260,6 +260,6 @@ def add_x509_key_descriptors(metadata, cert=None, add_encryption=True):
             raise Exception('Malformed metadata.')
 
         if add_encryption:
-            OneLogin_Saml2_Metadata.__add_x509_key_descriptors(sp_sso_descriptor, cert, False)
-        OneLogin_Saml2_Metadata.__add_x509_key_descriptors(sp_sso_descriptor, cert, True)
+            cls.__add_x509_key_descriptors(sp_sso_descriptor, cert, False)
+        cls.__add_x509_key_descriptors(sp_sso_descriptor, cert, True)
         return OneLogin_Saml2_XML.to_string(root)