diff --git a/mdproxy.py b/mdproxy.py index 4d78f0af729c2a40c5e03f8255734fe5fabe82e4..a8f1e93e55167fc8e2223cc895e6219dfd864d5d 100755 --- a/mdproxy.py +++ b/mdproxy.py @@ -46,10 +46,12 @@ def serve_all(realm): request = requests.get(f"{config[realm]['signer']}/{realm}" f"/entities") data = request.text - last_modified = request.headers.get('Last-Modified', - formatdate(timeval=None, - localtime=False, - usegmt=True)) + last_modified = request.headers.get( + 'Last-Modified', + formatdate(timeval=None, + localtime=False, + usegmt=True) + ) try: root = ET.fromstring(data) diff --git a/mdserver.py b/mdserver.py index b40704d74b49402c23899817950eb9d04194d30c..f76b9d845a1c9e377c18a0e4cff4c2bb2574bd5a 100755 --- a/mdserver.py +++ b/mdserver.py @@ -30,8 +30,10 @@ def serve_all(realm): datetime.now(tz.tzutc())).total_seconds()) response.headers['Cache-Control'] = f"max-age={max_age}" - response.headers['Last-Modified'] = formatdate(timeval=mktime(data.last_modified.timetuple()), - localtime=False, usegmt=True) + response.headers['Last-Modified'] = formatdate( + timeval=mktime(data.last_modified.timetuple()), + localtime=False, + usegmt=True) return response @@ -57,8 +59,10 @@ def serve_one(realm, entity_id): last_modified = datetime.now(tz.tzutc()) response.headers['Cache-Control'] = f"max-age={max_age}" - response.headers['Last-Modified'] = formatdate(timeval=mktime(last_modified.timetuple()), - localtime=False, usegmt=True) + response.headers['Last-Modified'] = formatdate( + timeval=mktime(last_modified.timetuple()), + localtime=False, + usegmt=True) return response diff --git a/utils.py b/utils.py index 9fce5a5bfeb9cba620de671b2ee21297aaaedf8e..b523990f4bf863386234c71ec48941e458972199 100755 --- a/utils.py +++ b/utils.py @@ -192,10 +192,10 @@ class Realm: data = Entity() ns = NSMAP root = ET.Element(f"{{{MD_NAMESPACE}}}EntitiesDescriptor", - nsmap=ns) + nsmap=ns) # We are going to minimize expires, so set to some inf value valid_until = (datetime.now(tz.tzutc()) + - timedelta(days=365)) + timedelta(days=365)) cache_duration = parse_duration("P1D") for sha1, entity in self.idps.items(): valid_until = min(valid_until, entity.valid_until)