Skip to content

fix certificate start date to work regardless of the timezone #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobperron merged 1 commit into from
Aug 7, 2019
Merged

fix certificate start date to work regardless of the timezone #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sros2/sros2/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,17 +440,17 @@ def _build_key_and_cert(subject_name, *, ca=False, ca_key=None, issuer_name=''):
else:
extension = x509.BasicConstraints(ca=False, path_length=None)

now = datetime.datetime.now()
utcnow = datetime.datetime.utcnow()
builder = x509.CertificateBuilder(
).issuer_name(
issuer_name
).serial_number(
x509.random_serial_number()
).not_valid_before(
now
utcnow
).not_valid_after(
# TODO: This should not be hard-coded
now + datetime.timedelta(days=3650)
utcnow + datetime.timedelta(days=3650)
).public_key(
private_key.public_key()
).subject_name(
Expand Down
6 changes: 3 additions & 3 deletions sros2/test/sros2/commands/security/verbs/test_create_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ def test_cert_pem(node_keys_dir):
assert isinstance(cert.signature_hash_algorithm, hashes.SHA256)

# Verify the cert is valid for the expected timespan
now = datetime.datetime.now()
assert _datetimes_are_close(cert.not_valid_before, now)
assert _datetimes_are_close(cert.not_valid_after, now + datetime.timedelta(days=3650))
utcnow = datetime.datetime.utcnow()
assert _datetimes_are_close(cert.not_valid_before, utcnow)
assert _datetimes_are_close(cert.not_valid_after, utcnow + datetime.timedelta(days=3650))

# Verify that the cert ensures this key cannot be used to sign others as a CA
assert len(cert.extensions) == 1
Expand Down