Evaluate default and per sp signature settings separately

Author: johanlundberg

src/satosa/frontends/saml2.py

@@ -291,13 +291,19 @@ def _handle_authn_response(self, context, internal_response, idp):
         sign_assertion = False
         try:
             sign_assertion = self.config['idp_config']['service']['idp']['policy']['default']['sign_assertion']
+        except (KeyError, AttributeError, ValueError):
+            pass
+        try:
             sign_assertion = self.config['idp_config']['service']['idp']['policy'][resp_args['sp_entity_id']]['sign_assertion']
         except (KeyError, AttributeError, ValueError):
             pass
 
         sign_response = True
         try:
             sign_response = self.config['idp_config']['service']['idp']['policy']['default']['sign_response']
+        except (KeyError, AttributeError, ValueError):
+            pass
+        try:
             sign_response = self.config['idp_config']['service']['idp']['policy'][resp_args['sp_entity_id']]['sign_response']
         except (KeyError, AttributeError, ValueError):
             pass