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.

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

Small fixes relating to Keylime components working together #165

Merged
merged 4 commits into from
Mar 10, 2021

Conversation

lkatalin
Copy link
Contributor

@lkatalin lkatalin commented Mar 5, 2021

These all relate to running the keylime_agent, keylime-verifier, and keylime-registrar with docker-compose, but some of the fixes are also generally applicable. Backstory: I am trying to make sure the components can work together before writing the 3-party key protocol. These are changes I made while fixing some bugs or trying to understand them.

I am still debugging some errors, so there are probably a few more commits to be added. EDIT: But these could go in an immediate future PR as well.

Currently:
ERROR keylime_agent::revocation > Path for the 0mq socket: /tmp/secure/unzipped/RevocationNotifier-cert.crt doesn't exist

@lkatalin lkatalin changed the title Smallfixes Small fixes relating to Keylime components working together Mar 5, 2021
@lkatalin lkatalin marked this pull request as ready for review March 6, 2021 01:07
Copy link
Contributor

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good so far. Let us know if you wish to add those extra commits referenced or if you'd prefer to put them through in a different PR!

@lkatalin
Copy link
Contributor Author

lkatalin commented Mar 8, 2021

@ashcrow I think I'd actually like to merge it and add more in a bit. It would help with keeping track of branches while I test some things.

@lkatalin lkatalin requested a review from ashcrow March 8, 2021 15:51
Error::SecureMount(
format!(
"unable to change secure path dir owner to root: received exit code {}",
e.code().unwrap().unwrap() //#[allow_ci]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally we want to avoid unwrap but there may be cases where it's fine. It may be worth noting in a comment why it's in use in these cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Completely agree. I don't think it can be avoided here, as they are Option types (but if you know a way, let me know). I added comments as suggested.

@lkatalin lkatalin force-pushed the smallfixes branch 2 times, most recently from 42982bf to 75b516f Compare March 9, 2021 02:29
@lkatalin
Copy link
Contributor Author

lkatalin commented Mar 9, 2021

@ashcrow Sorry to push a new version after you approved! I took your point about the unwrap() comments, and made a few small changes in the dependencies and secure mount commits. Also I had forgotten that I was still looking for input on the meaning of the comment on the MOUNT_SECURE flag here. The original comment didn't seem to match the flag, so I made an update, but I want to know I am not misunderstanding something before it is merged.

@lkatalin lkatalin force-pushed the smallfixes branch 3 times, most recently from aa32e03 to 5931d28 Compare March 10, 2021 18:39
Signed-off-by: Lily Sturmann <[email protected]>
@lkatalin
Copy link
Contributor Author

Merging this, as it had gotten two approvals, passed CI, and the update I pushed was just a comment.

@lkatalin lkatalin merged commit 68be32e into keylime:master Mar 10, 2021
@lkatalin lkatalin deleted the smallfixes branch July 16, 2021 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants