Merge pull request #295 from sebulibah/micro_services.custom_routing-logger

Improve logging - satosa.micro_services.custom_routing

Author: c00kiemon5ter

src/satosa/micro_services/custom_routing.py

@@ -2,11 +2,11 @@
 from base64 import urlsafe_b64encode
 
 from satosa.context import Context
-
 from .base import RequestMicroService
 from ..exception import SATOSAConfigurationError
 from ..exception import SATOSAError
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -62,32 +62,37 @@ def _b64_url(self, data):
     def process(self, context, data):
         target_entity_id = context.get_decoration(Context.KEY_TARGET_ENTITYID)
         if None is target_entity_id:
-            msg_tpl = "{name} can only be used when a target entityid is set"
-            msg = msg_tpl.format(name=self.__class__.__name__)
+            msg = "{name} can only be used when a target entityid is set".format(
+                name=self.__class__.__name__
+            )
             logger.error(msg)
             raise SATOSAError(msg)
 
         target_specific_rules = self.rules.get(target_entity_id)
         # default to allowing everything if there are no specific rules
         if not target_specific_rules:
-            logging.debug("Requester '%s' allowed by default to target entity '%s' due to no entity specific rules",
-                          data.requester, target_entity_id)
+            logger.debug("Requester '{}' allowed by default to target entity '{}' due to no entity specific rules".format(
+                data.requester, target_entity_id
+            ))
             return super().process(context, data)
 
         # deny rules takes precedence
         deny_rules = target_specific_rules.get("deny", [])
         if data.requester in deny_rules:
-            logging.debug("Requester '%s' is not allowed by target entity '%s' due to deny rules '%s'", data.requester,
-                          target_entity_id, deny_rules)
+            logger.debug("Requester '{}' is not allowed by target entity '{}' due to deny rules '{}'".format(
+                data.requester, target_entity_id, deny_rules
+            ))
             raise SATOSAError("Requester is not allowed by target provider")
 
         allow_rules = target_specific_rules.get("allow", [])
         allow_all = "*" in allow_rules
         if data.requester in allow_rules or allow_all:
-            logging.debug("Requester '%s' allowed by target entity '%s' due to allow rules '%s",
-                          data.requester, target_entity_id, allow_rules)
+            logger.debug("Requester '{}' allowed by target entity '{}' due to allow rules '{}".format(
+                data.requester, target_entity_id, allow_rules
+            ))
             return super().process(context, data)
 
-        logger.debug("Requester '%s' is not allowed by target entity '%s' due to final deny all rule in '%s'",
-                      data.requester, target_entity_id, deny_rules)
+        logger.debug("Requester '{}' is not allowed by target entity '{}' due to final deny all rule in '{}'".format(
+            data.requester, target_entity_id, deny_rules
+        ))
         raise SATOSAError("Requester is not allowed by target provider")