-
Notifications
You must be signed in to change notification settings - Fork 8
pytest-pouch: replace shell=True subprocess calls with argv lists #170
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.
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
Draft
mniestroj
wants to merge
1
commit into
main
Choose a base branch
from
pytest-pouch-use-subprocess-run-without-shell
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,75 +29,129 @@ def creds_dir(request: pytest.FixtureRequest): | |
| async def creds(creds_dir, device, project): | ||
| creds_dir.mkdir(mode=0o755, exist_ok=True, parents=True) | ||
|
|
||
| ca_key = creds_dir / "ca.key.pem" | ||
| ca_crt = creds_dir / "ca.crt.pem" | ||
| dev_key = creds_dir / f"{device.name}.key.pem" | ||
| dev_csr = creds_dir / f"{device.name}.csr.pem" | ||
| dev_crt = creds_dir / f"{device.name}.crt.pem" | ||
|
|
||
| logging.info("Generate CA private key and cert") | ||
|
|
||
| subprocess.run( | ||
| "openssl ecparam -name prime256v1 -genkey -noout -out ca.key.pem", | ||
| [ | ||
| "openssl", | ||
| "ecparam", | ||
| "-name", | ||
| "prime256v1", | ||
| "-genkey", | ||
| "-noout", | ||
| "-out", | ||
| str(ca_key), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
| subprocess.run( | ||
| """\ | ||
| openssl req -x509 -new -nodes \ | ||
| -key ca.key.pem \ | ||
| -sha256 -subj "/C=US/CN=Root CA" \ | ||
| -days 14 -out ca.crt.pem""", | ||
| [ | ||
| "openssl", | ||
| "req", | ||
| "-x509", | ||
| "-new", | ||
| "-nodes", | ||
| "-key", | ||
| str(ca_key), | ||
| "-sha256", | ||
| "-subj", | ||
| "/C=US/CN=Root CA", | ||
| "-days", | ||
| "14", | ||
| "-out", | ||
| str(ca_crt), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
|
|
||
| logging.info("Generate edge node private key, csr and cert") | ||
|
|
||
| subprocess.run( | ||
| f"openssl ecparam -name prime256v1 -genkey -noout -out {device.name}.key.pem", | ||
| [ | ||
| "openssl", | ||
| "ecparam", | ||
| "-name", | ||
| "prime256v1", | ||
| "-genkey", | ||
| "-noout", | ||
| "-out", | ||
| str(dev_key), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
| subprocess.run( | ||
| f"""\ | ||
| openssl req -new \ | ||
| -key {device.name}.key.pem \ | ||
| -subj "/C=US/O={project.id}/CN={device.name}" \ | ||
| -out {device.name}.csr.pem""", | ||
| [ | ||
| "openssl", | ||
| "req", | ||
| "-new", | ||
| "-key", | ||
| str(dev_key), | ||
| "-subj", | ||
| f"/C=US/O={project.id}/CN={device.name}", | ||
| "-out", | ||
| str(dev_csr), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
| subprocess.run( | ||
| f"""\ | ||
| openssl x509 -req \ | ||
| -in "{device.name}.csr.pem" \ | ||
| -CA "ca.crt.pem" \ | ||
| -CAkey "ca.key.pem" \ | ||
| -CAcreateserial \ | ||
| -out "{device.name}.crt.pem" \ | ||
| -days 500 -sha256""", | ||
| [ | ||
| "openssl", | ||
| "x509", | ||
| "-req", | ||
| "-in", | ||
| str(dev_csr), | ||
| "-CA", | ||
| str(ca_crt), | ||
| "-CAkey", | ||
| str(ca_key), | ||
| "-CAcreateserial", | ||
| "-out", | ||
|
Comment on lines
+109
to
+114
|
||
| str(dev_crt), | ||
| "-days", | ||
| "500", | ||
| "-sha256", | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
|
|
||
| logging.info("Convert key and cert to DER format") | ||
|
|
||
| subprocess.run( | ||
| f"openssl x509 -in {device.name}.crt.pem -outform DER -out crt.der", | ||
| [ | ||
| "openssl", | ||
| "x509", | ||
| "-in", | ||
| str(dev_crt), | ||
| "-outform", | ||
| "DER", | ||
| "-out", | ||
| str(creds_dir / "crt.der"), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
| subprocess.run( | ||
| f"openssl ec -in {device.name}.key.pem -outform DER -out key.der", | ||
| [ | ||
| "openssl", | ||
| "ec", | ||
| "-in", | ||
| str(dev_key), | ||
| "-outform", | ||
| "DER", | ||
| "-out", | ||
| str(creds_dir / "key.der"), | ||
| ], | ||
| check=True, | ||
| shell=True, | ||
| cwd=creds_dir, | ||
| ) | ||
|
|
||
| logging.info("Upload root public key to Golioth server") | ||
|
|
||
| with open(creds_dir / "ca.crt.pem", "rb") as f: | ||
| with open(ca_crt, "rb") as f: | ||
| cert_pem = f.read() | ||
|
|
||
| root_cert = await project.certificates.add(cert_pem, "root") | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
device.nameis used directly in credential filenames. If it contains path separators (e.g./,\\) or..,Pathjoining can write outsidecreds_diror create unexpected subdirectories, which is a security and correctness problem even withoutshell=True. Consider validating/normalizingdevice.nameinto a safe filename component (e.g., allowlist characters and reject/replace separators) before building these paths.