Experiment

Author: tw4l

pywb/warcserver/access_checker.py

@@ -174,29 +174,23 @@ def check_embargo(self, url, ts):
             return access if actual > dt else None
 
     def check_date_access(
-        self, ts, access, default_access, rule
+        self, ts, access, rule
     ):
         """Return access based on date fields in access rule
 
-        If a date-based rule exists and condition is not met, return default rule
         If no date-based rule exists, return access
         """
-        if not rule:
-            return access
-
         dt = timestamp_to_datetime(ts, tz_aware=True)
 
         before_ts = rule.get('before')
         if before_ts:
             before = timestamp_to_datetime(before_ts, tz_aware=True)
-            return access if dt < before else default_access
+            return access if dt < before else None
 
         after_ts = rule.get('after')
         if after_ts:
             after = timestamp_to_datetime(after_ts, tz_aware=True)
-            return access if dt > after else default_access
-
-        return access
+            return access if dt > after else None
 
     def create_access_aggregator(self, source_files):
         """Creates a new AccessRulesAggregator using the supplied list
@@ -350,9 +344,12 @@ def wrap_iter(self, cdx_iter, acl_user):
 
                 access = rule.get('access', 'exclude')
 
-            access = self.check_date_access(
-                timestamp, access, default_access, rule
-            )
+            if rule:
+                date_access = self.check_date_access(
+                    timestamp, access, rule
+                )
+                if date_access:
+                    access = date_access
 
             if access != 'allow_ignore_embargo' and access != 'exclude':
                 embargo_access = self.check_embargo(url, timestamp)