-
Notifications
You must be signed in to change notification settings - Fork 46
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
Check for private key file with SDW config validator. Add validator unit tests. #1205
Conversation
c23b9fd
to
dc7f3aa
Compare
454a729
to
2f74007
Compare
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.
Approved. Happy to see some guard-rails for potentially Johnny-can't-encrypt type problems :)
It's currently only missing CI, which failed for another reason.
It's an unrelated issue, but @rocodes what do you think about printing just the error message as opposed to the python traceback? |
@deeplow I'm generally in favour of that :) Are you referring to the CI failure here: |
Sorry, but I'm not sure I follow. I'm talking about that issue, but it does show the salt output. The error is:
|
2f74007
to
90e849d
Compare
(Just rebased to try to get a successful CI run.) |
Yes; it looks like CI has been failing on main for a while, I'm looking into it, but it's not code that is introduced in this PR. I will investigate and hopefully put up a fix today, then we can see some more 🟢 here. : ) Regarding your request about not showing tracebacks, I am in favour, and since that's also a bit outside the scope of this specific PR I have filed #1207 - hth :) |
344195b
to
18b1efa
Compare
18b1efa
to
f23af06
Compare
(CI issue should be resolved; now also includes a fix for #1215 and an updated test plan item) |
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.
New changes look good. Approved for your merge, @rocodes.
Thank you! |
Status
Ready for review
Description of Changes
Fixes #1202
Fixes #1215
Testing
sdw-admin --validate
with a valid key file succeeds;sdw-admin --validate
with a missing or malformed key or a pubkey file fails.sdw-admin --validate
should inform users when a Submission Key has a passphrase set #1215make clone && make test
in dom0 succeeds (or CI passing).Deployment
Any special considerations for deployment? Consider both:
Checklist
If you have made changes to the provisioning logic
make test
) pass indom0
If you have added or removed files
MANIFEST.in
andrpm-build/SPECS/securedrop-workstation-dom0-config.spec
If documentation is required