Allow qube (template) sending basic OS metadata #578
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
DemiMarie
suggested changes
Jan 28, 2024
qubes/ext/core_features.py
Outdated
Comment on lines
44
to
49
| safe_set = string.digits + ".-" | ||
| untrusted_version = untrusted_features["os-version"] | ||
| if all(c in safe_set for c in untrusted_version): | ||
| vm.features["os-version"] = untrusted_version |
There was a problem hiding this comment.
Should this be required to start with a digit?
qubes/ext/core_features.py
Outdated
| if "os-eol" in untrusted_features: | ||
| untrusted_eol = untrusted_features["os-eol"] | ||
| valid = False | ||
| if re.match(r"\d{4}-\d{2}-\d{2}", untrusted_eol): |
There was a problem hiding this comment.
Suggested change
| if re.match(r"\d{4}-\d{2}-\d{2}", untrusted_eol): | |
| if re.match(r"\A\d{4}-\d{2}-\d{2}\Z", untrusted_eol): |
don’t allow trailing junk
marmarek
force-pushed
the
distro-metadata
branch
from
f699bb4
to
ec6108d
Compare
DemiMarie
reviewed
Jan 28, 2024
qubes/ext/core_features.py
Outdated
| @@ -34,6 +36,32 @@ async def qubes_features_request(self, vm, event, untrusted_features): | |||
| 'Ignoring qubes.NotifyTools for template-based VM') | |||
| return | |||
|
|
|||
| if "os-distribution" in untrusted_features: | |||
| # entry point already validats values for safe characters | |||
There was a problem hiding this comment.
Suggested change
| # entry point already validats values for safe characters | |
| # entry point already validates values for safe characters |
marmarek
force-pushed
the
distro-metadata
branch
2 times, most recently
from
1cbdec2
to
fa415a8
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #578 +/- ##
==========================================
+ Coverage 68.39% 68.45% +0.06%
==========================================
Files 56 56
Lines 11159 11181 +22
==========================================
+ Hits 7632 7654 +22
Misses 3527 3527
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Save distribution, version and EOL date in features. Fixes QubesOS/qubes-issues#8725
marmarek
force-pushed
the
distro-metadata
branch
from
fa415a8
to
8fbb02b
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.
Save distribution, version and EOL date in features.
Fixes QubesOS/qubes-issues#8725