This commit is contained in:
meejah 2020-11-25 19:50:11 -07:00
parent 4450a7a4b2
commit 884c26495f
3 changed files with 1 additions and 2 deletions

View File

@ -2,7 +2,6 @@ import os
import stat
import time
import weakref
import json
from allmydata import node
from base64 import urlsafe_b64encode
from functools import partial

View File

@ -419,7 +419,6 @@ def create_grid_manager_verifier(keys, certs, public_key, now_fn=None, bad_cert=
# if *any* certificate is still valid then we consider the server valid
for cert in valid_certs:
expires = datetime.utcfromtimestamp(cert['expires'])
cert_pubkey = ed25519.verifying_key_from_string(cert['public_key'].encode('ascii'))
if cert['public_key'] == public_key:
if expires > now:
# not-expired

View File

@ -14,6 +14,7 @@ if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from six import ensure_str, ensure_text
import json
import datetime
import os.path
import re