X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=acl.py;h=a936339a0dcb715db02327125c9f5b54e9b100d3;hb=31c81f6539969a5eba864d3305f9fb7bf716a367;hp=91550901e07df0a614027f90a6d15fa803fde877;hpb=a838c154135b2420d9047a101caf24a2c9f593c2;p=python_utils.git

diff --git a/acl.py b/acl.py
index 9155090..a936339 100644
--- a/acl.py
+++ b/acl.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-from abc import ABC, abstractmethod
 import enum
 import fnmatch
 import logging
 import re
-from typing import Any, Callable, List, Optional, Set, Sequence
+from abc import ABC, abstractmethod
+from typing import Any, Callable, List, Optional, Sequence, Set
+
+from overrides import overrides
 
 # This module is commonly used by others in here and should avoid
 # taking any unnecessary dependencies back on them.
@@ -17,6 +19,7 @@ class Order(enum.Enum):
     """A helper to express the order of evaluation for allows/denies
     in an Access Control List.
     """
+
     UNDEFINED = 0
     ALLOW_DENY = 1
     DENY_ALLOW = 2
@@ -25,18 +28,15 @@ class Order(enum.Enum):
 class SimpleACL(ABC):
     """A simple Access Control List interface."""
 
-    def __init__(
-        self,
-        *,
-        order_to_check_allow_deny: Order,
-        default_answer: bool
-    ):
+    def __init__(self, *, order_to_check_allow_deny: Order, default_answer: bool):
         if order_to_check_allow_deny not in (
-                Order.ALLOW_DENY, Order.DENY_ALLOW
+            Order.ALLOW_DENY,
+            Order.DENY_ALLOW,
         ):
             raise Exception(
-                'order_to_check_allow_deny must be Order.ALLOW_DENY or ' +
-                'Order.DENY_ALLOW')
+                'order_to_check_allow_deny must be Order.ALLOW_DENY or '
+                + 'Order.DENY_ALLOW'
+            )
         self.order_to_check_allow_deny = order_to_check_allow_deny
         self.default_answer = default_answer
 
@@ -62,8 +62,8 @@ class SimpleACL(ABC):
                 return True
 
         logger.debug(
-            f'{x} was not explicitly allowed or denied; ' +
-            f'using default answer ({self.default_answer})'
+            f'{x} was not explicitly allowed or denied; '
+            + f'using default answer ({self.default_answer})'
         )
         return self.default_answer
 
@@ -80,24 +80,29 @@ class SimpleACL(ABC):
 
 class SetBasedACL(SimpleACL):
     """An ACL that allows or denies based on membership in a set."""
-    def __init__(self,
-                 *,
-                 allow_set: Optional[Set[Any]] = None,
-                 deny_set: Optional[Set[Any]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        allow_set: Optional[Set[Any]] = None,
+        deny_set: Optional[Set[Any]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         super().__init__(
             order_to_check_allow_deny=order_to_check_allow_deny,
-            default_answer=default_answer
+            default_answer=default_answer,
         )
         self.allow_set = allow_set
         self.deny_set = deny_set
 
+    @overrides
     def check_allowed(self, x: Any) -> bool:
         if self.allow_set is None:
             return False
         return x in self.allow_set
 
+    @overrides
     def check_denied(self, x: Any) -> bool:
         if self.deny_set is None:
             return False
@@ -106,50 +111,68 @@ class SetBasedACL(SimpleACL):
 
 class AllowListACL(SetBasedACL):
     """Convenience subclass for a list that only allows known items.
-    i.e. a 'whitelist'
+    i.e. a 'allowlist'
     """
-    def __init__(self,
-                 *,
-                 allow_set: Optional[Set[Any]]) -> None:
+
+    def __init__(self, *, allow_set: Optional[Set[Any]]) -> None:
         super().__init__(
-            allow_set = allow_set,
-            order_to_check_allow_deny = Order.ALLOW_DENY,
-            default_answer = False)
+            allow_set=allow_set,
+            order_to_check_allow_deny=Order.ALLOW_DENY,
+            default_answer=False,
+        )
 
 
 class DenyListACL(SetBasedACL):
     """Convenience subclass for a list that only disallows known items.
-    i.e. a 'blacklist'
+    i.e. a 'blocklist'
+    """
+
+    def __init__(self, *, deny_set: Optional[Set[Any]]) -> None:
+        super().__init__(
+            deny_set=deny_set,
+            order_to_check_allow_deny=Order.ALLOW_DENY,
+            default_answer=True,
+        )
+
+
+class BlockListACL(SetBasedACL):
+    """Convenience subclass for a list that only disallows known items.
+    i.e. a 'blocklist'
     """
-    def __init__(self,
-                 *,
-                 deny_set: Optional[Set[Any]]) -> None:
+
+    def __init__(self, *, deny_set: Optional[Set[Any]]) -> None:
         super().__init__(
-            deny_set = deny_set,
-            order_to_check_allow_deny = Order.ALLOW_DENY,
-            default_answer = True)
+            deny_set=deny_set,
+            order_to_check_allow_deny=Order.ALLOW_DENY,
+            default_answer=True,
+        )
 
 
 class PredicateListBasedACL(SimpleACL):
     """An ACL that allows or denies by applying predicates."""
-    def __init__(self,
-                 *,
-                 allow_predicate_list: Sequence[Callable[[Any], bool]] = None,
-                 deny_predicate_list: Sequence[Callable[[Any], bool]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        allow_predicate_list: Sequence[Callable[[Any], bool]] = None,
+        deny_predicate_list: Sequence[Callable[[Any], bool]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         super().__init__(
             order_to_check_allow_deny=order_to_check_allow_deny,
-            default_answer=default_answer
+            default_answer=default_answer,
         )
         self.allow_predicate_list = allow_predicate_list
         self.deny_predicate_list = deny_predicate_list
 
+    @overrides
     def check_allowed(self, x: Any) -> bool:
         if self.allow_predicate_list is None:
             return False
         return any(predicate(x) for predicate in self.allow_predicate_list)
 
+    @overrides
     def check_denied(self, x: Any) -> bool:
         if self.deny_predicate_list is None:
             return False
@@ -158,12 +181,15 @@ class PredicateListBasedACL(SimpleACL):
 
 class StringWildcardBasedACL(PredicateListBasedACL):
     """An ACL that allows or denies based on string glob (*, ?) patterns."""
-    def __init__(self,
-                 *,
-                 allowed_patterns: Optional[List[str]] = None,
-                 denied_patterns: Optional[List[str]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        allowed_patterns: Optional[List[str]] = None,
+        denied_patterns: Optional[List[str]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         allow_predicates = []
         if allowed_patterns is not None:
             for pattern in allowed_patterns:
@@ -188,12 +214,15 @@ class StringWildcardBasedACL(PredicateListBasedACL):
 
 class StringREBasedACL(PredicateListBasedACL):
     """An ACL that allows or denies by applying regexps."""
-    def __init__(self,
-                 *,
-                 allowed_regexs: Optional[List[re.Pattern]] = None,
-                 denied_regexs: Optional[List[re.Pattern]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        allowed_regexs: Optional[List[re.Pattern]] = None,
+        denied_regexs: Optional[List[re.Pattern]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         allow_predicates = None
         if allowed_regexs is not None:
             allow_predicates = []
@@ -218,22 +247,27 @@ class StringREBasedACL(PredicateListBasedACL):
 
 class AnyCompoundACL(SimpleACL):
     """An ACL that allows if any of its subacls allow."""
-    def __init__(self,
-                 *,
-                 subacls: Optional[List[SimpleACL]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        subacls: Optional[List[SimpleACL]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         super().__init__(
-            order_to_check_allow_deny = order_to_check_allow_deny,
-            default_answer = default_answer
+            order_to_check_allow_deny=order_to_check_allow_deny,
+            default_answer=default_answer,
         )
         self.subacls = subacls
 
+    @overrides
     def check_allowed(self, x: Any) -> bool:
         if self.subacls is None:
             return False
         return any(acl(x) for acl in self.subacls)
 
+    @overrides
     def check_denied(self, x: Any) -> bool:
         if self.subacls is None:
             return False
@@ -242,22 +276,27 @@ class AnyCompoundACL(SimpleACL):
 
 class AllCompoundACL(SimpleACL):
     """An ACL that allows if all of its subacls allow."""
-    def __init__(self,
-                 *,
-                 subacls: Optional[List[SimpleACL]] = None,
-                 order_to_check_allow_deny: Order,
-                 default_answer: bool) -> None:
+
+    def __init__(
+        self,
+        *,
+        subacls: Optional[List[SimpleACL]] = None,
+        order_to_check_allow_deny: Order,
+        default_answer: bool,
+    ) -> None:
         super().__init__(
-            order_to_check_allow_deny = order_to_check_allow_deny,
-            default_answer = default_answer
+            order_to_check_allow_deny=order_to_check_allow_deny,
+            default_answer=default_answer,
         )
         self.subacls = subacls
 
+    @overrides
     def check_allowed(self, x: Any) -> bool:
         if self.subacls is None:
             return False
         return all(acl(x) for acl in self.subacls)
 
+    @overrides
     def check_denied(self, x: Any) -> bool:
         if self.subacls is None:
             return False