Merge pull request google#121 from pidydx/AccessControl

Added reason to access logging
krodyx · Feb 23, 2015 · e81bf2b · e81bf2b
2 parents 4ce8700 + 64357eb
commit e81bf2b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/aff4_objects/user_managers.py b/lib/aff4_objects/user_managers.py
@@ -107,10 +107,11 @@ def CheckAccess(self, subject, token):
         require(subject, token, *require_args, **require_kwargs)
 
       logging.debug("Datastore access granted to %s on %s by pattern: %s "
-                    "(require=%s, require_args=%s, require_kwargs=%s, "
-                    "helper_name=%s)",
+                    "with reason: %s (require=%s, require_args=%s, "
+                    "require_kwargs=%s, helper_name=%s)",
                     utils.SmartStr(token.username), subject_str, regex_text,
-                    require, require_args, require_kwargs, self.helper_name)
+                    utils.SmartStr(token.reason), require, require_args,
+                    require_kwargs, self.helper_name)
       return True
 
     logging.warn("Datastore access denied to %s (no matched rules)",