Skip to content
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

Jump to bottom

Fixes for test certificate download and handling #50

Merged
merged 3 commits into from
May 7, 2023
Merged

Fixes for test certificate download and handling #50

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18888ab
Failure detection in openssl test cert conversion
1sfb May 6, 2023
3b12c35
Add possibility to provide p12 test cert through existing file
1sfb May 6, 2023
939a8a1
Merge branch 'develop' into master
hbldh May 7, 2023
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
33 changes: 27 additions & 6 deletions bankid/certutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,26 @@ def create_bankid_test_server_cert_and_key(destination_path):
"""Split the bundled test certificate into certificate and key parts and save them
as separate files, stored in PEM format.

If the environment variable TEST_CERT_FILE is set, use this file
instead of fetching the P12 certificate.

:param destination_path: The directory to save certificate and key files to.
:type destination_path: str
:returns: The path tuple ``(cert_path, key_path)``.
:rtype: tuple

"""
# Fetch testP12 certificate path
certificate, key = split_certificate(
str(get_test_cert_p12()), destination_path, password=_TEST_CERT_PASSWORD
)
if os.getenv("TEST_CERT_FILE"):
certificate, key = split_certificate(
os.getenv("TEST_CERT_FILE"), destination_path, password=_TEST_CERT_PASSWORD
)

else:
# Fetch testP12 certificate path
certificate, key = split_certificate(
str(get_test_cert_p12()), destination_path, password=_TEST_CERT_PASSWORD
)

# Return path tuples.
return certificate, key

Expand Down Expand Up @@ -117,7 +127,13 @@ def split_certificate(certificate_path, destination_folder, password=None):
p = subprocess.Popen(
list(filter(None, pipeline_1)), stdout=subprocess.PIPE, stderr=subprocess.PIPE
)
sout, serr = p.communicate()
out, err = p.communicate()

if p.returncode:
raise BankIDError(
f"Error converting certificate: {err.decode('utf-8')}"
)

pipeline_2 = [
openssl_executable,
"pkcs12",
Expand All @@ -133,7 +149,12 @@ def split_certificate(certificate_path, destination_folder, password=None):
p = subprocess.Popen(
list(filter(None, pipeline_2)), stdout=subprocess.PIPE, stderr=subprocess.PIPE
)
p.communicate()
out, err = p.communicate()

if p.returncode:
raise BankIDError(
f"Error converting certificate: {err.decode('utf-8')}"
)

# Return path tuples.
return out_cert_path, out_key_path
Expand Down