ENT-9931: Guard against /sys/hypervisor/uuid not being readable (3.18) #2718
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
Contributor
craigcomstock
commented
Sep 1, 2023
craigcomstock
commented
- Guard against /sys/hypervisor/uuid not being readable
- can squash this one, use isreadable() if available
|
@cf-bottom jenkins please |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/9713/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-9713/ |
nickanderson
approved these changes
Sep 1, 2023
| @@ -603,6 +603,15 @@ bundle common cfe_autorun_inventory_aws | |||
| scope => "namespace", | |||
| if => isvariable("cfe_autorun_inventory_dmidecode.dmi[bios-vendor]"); | |||
|
|
|||
| @if minimum_version(3.22.0) | |||
There was a problem hiding this comment.
Do we have a feature registered for the function? Would be nice to be able to so if feature isreadable.
| @if minimum_version(3.22.0) | ||
| "sys_hypervisor_uuid_readable" -> { "ENT-9931" } | ||
| expression => isreadable("/sys/hypervisor/uuid", 1); | ||
| @else |
There was a problem hiding this comment.
Yep, I considered adding a comment like "this could be dangerous, with cat waiting forever, but not likely and certainly not by experimentation, either the file is there or not, and readable, or mysteriously: not."
|
So far so good! https://ci.cfengine.com/job/fr-tests/6393/consoleFull Absolutely ZERO mention of regline errors as before 👍 |
On a centos-6 PV instance in Amazon EC2 I see /sys/hypervisor/uuid exists -r--r--r-- 1 root root 4096 Sep 1 14:30 /sys/hypervisor/uuid but is not readable even though permissions seem to be ok. cat: /sys/hypervisor/uuid: No such file or directory While SELinux is enforced it doesn't seem to be involved since this is a special sysfs filesystem and there are no entries for the failure in the audit log. Ticket: ENT-9931 Changelog: title (cherry picked from commit 612323d)
craigcomstock
force-pushed
the
ENT-9931/3.18
branch
from
77319da
to
e9807a6
Compare
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.