Remove the KEY_METADATA key

SAMLBackend and SAMLFrontend KEY_* keys are reflecting top-level
configuration options. KEY_METADATA is a configuration of pysaml2
objects and not controlled by the SAMLBackend and SAMLFrontend directly.
This creates a nasty hardcoded dependency here. We should revamp the API
of pysaml2 and cater for this need.

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/satosa/backends/saml2.py

@@ -82,7 +82,6 @@ class SAMLBackend(BackendModule, SAMLBaseModule):
     KEY_SAML_DISCOVERY_SERVICE_URL = 'saml_discovery_service_url'
     KEY_SAML_DISCOVERY_SERVICE_POLICY = 'saml_discovery_service_policy'
     KEY_SP_CONFIG = 'sp_config'
-    KEY_METADATA = 'metadata'
     KEY_SEND_REQUESTER_ID = 'send_requester_id'
     KEY_MIRROR_FORCE_AUTHN = 'mirror_force_authn'
     KEY_MEMORIZE_IDP = 'memorize_idp'
@@ -491,7 +490,9 @@ def _reload_metadata(self, context):
         Reload SAML metadata
         """
         logger.debug("Reloading metadata")
-        res = self.sp.reload_metadata(copy.deepcopy(self.config[SAMLBackend.KEY_SP_CONFIG][SAMLBackend.KEY_METADATA]))
+        res = self.sp.reload_metadata(
+            copy.deepcopy(self.config[SAMLBackend.KEY_SP_CONFIG]['metadata'])
+        )
         message = "Metadata reload %s" % ("OK" if res else "failed")
         status = "200 OK" if res else "500 FAILED"
         return Response(message=message, status=status)

src/satosa/frontends/saml2.py

@@ -64,7 +64,6 @@ class SAMLFrontend(FrontendModule, SAMLBaseModule):
     KEY_CUSTOM_ATTR_RELEASE = 'custom_attribute_release'
     KEY_ENDPOINTS = 'endpoints'
     KEY_IDP_CONFIG = 'idp_config'
-    KEY_METADATA = 'metadata'
 
     def __init__(self, auth_req_callback_func, internal_attributes, config, base_url, name):
         self._validate_config(config)
@@ -496,7 +495,9 @@ def _reload_metadata(self, context):
         Reload SAML metadata
         """
         logger.debug("Reloading metadata")
-        res = self.idp.reload_metadata(copy.deepcopy(self.config[SAMLFrontend.KEY_IDP_CONFIG][SAMLFrontend.KEY_METADATA]))
+        res = self.idp.reload_metadata(
+            copy.deepcopy(self.config[SAMLFrontend.KEY_IDP_CONFIG]['metadata'])
+        )
         message = "Metadata reload %s" % ("OK" if res else "failed")
         status = "200 OK" if res else "500 FAILED"
         return Response(message=message, status=status)