-
Notifications
You must be signed in to change notification settings - Fork 485
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
Systemd workloadattestor closes DBus connection too early #4165
Merged
Conversation
This file contains 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
This PR fixes is a bug in the systemd workload attestor. In `getSystemdUnitInfo`, the DBus connection is closed via a `defer`. But that connection is required later to retrieve the `ID()` and `FragmentPath()` in the `Attest` function. This causes attestation failures with an error message `dbus: connection closed by user`. The fix extracts the required selector attributes early and avoids using the dangling connection to DBus. Signed-off-by: Raghu Kaippully <rkaippully@gmail.com>
rkaippully
requested review from
evan2645,
amartinezfayo,
azdagron,
MarcosDY and
rturner3
as code owners
May 22, 2023 13:21
Signed-off-by: Raghu Kaippully <rkaippully@gmail.com>
azdagron
reviewed
May 23, 2023
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.
Thank you, @rkaippully! Just a few small nitpicks and this is ready to merge.
Co-authored-by: Andrew Harding <azdagron@gmail.com> Signed-off-by: Raghu Kaippully <rkaippully@gmail.com>
rkaippully
force-pushed
the
raghu/fix-systemd-defer
branch
from
May 24, 2023 04:27
e8afaad
to
dfc95a2
Compare
Thanks for the quick review @azdagron! |
azdagron
approved these changes
May 24, 2023
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.
Thanks again!
Neniel
pushed a commit
to Neniel/spire
that referenced
this pull request
Aug 24, 2023
This PR fixes is a bug in the systemd workload attestor. In `getSystemdUnitInfo`, the DBus connection is closed via a `defer`. But that connection is required later to retrieve the `ID()` and `FragmentPath()` in the `Attest` function. This causes attestation failures with an error message `dbus: connection closed by user`. The fix extracts the required selector attributes early and avoids using the dangling connection to DBus. Signed-off-by: Raghu Kaippully <rkaippully@gmail.com> Signed-off-by: Neniel <11655196+Neniel@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request check list
Affected functionality
This PR fixes a bug in the systemd workload attestor. In
getSystemdUnitInfo
, the DBus connection is closed via adefer
. But that connection is required later to retrieve theID()
andFragmentPath()
in theAttest
function. This causes attestation failures with an error messagedbus: connection closed by user
.Description of change
The fix extracts the required selector attributes early and avoids using the dangling connection to DBus.