Repository navigation
fix(macos): make ods-macos.sh upsert_env_value literal-key and delimiter-safe - #7485
Closed
vaibhavsrv wants to merge 1 commit into
Closed
vaibhavsrv wants to merge 1 commit into
vaibhavsrv wants to merge 1 commit into
Conversation
Contributor
Author
|
Closing this as the edge cases (keys with dots, values with delimiters) are purely theoretical in the context of ODS's current macOS installer implementation, so the practical impact doesn't justify the churn. Thanks! |
This file contains hidden or 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
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.
Summary
The macOS environment helper
upsert_env_valuecould silently overwrite sibling keys if given a regex wildcard like a dot (e.g.FOO.BARoverwritesFOO_BAR). A value containing sed delimiters like pipes or ampersands could also corrupt the substitution and drop the value entirely. The helper now probes with a literal-prefix match and safely writes values verbatim without regular expressions or sed delimiters, mimicking the hardenedenv-generator.shimplementation. Fixes #7484.AI Assistance
Antigravity provided investigation, with autonomous corrections, independent tests, and live macOS simulation verification.
Release Lane
release/2.6.xmainStable hotfix reason:
Changed Surface
Risk And Validation
git diff --checkrelease/2.6.xCommands/results:
Operational Change Check
If this PR touches installer phases, bootstrap logic, compose stack generation,
service manifests, dashboard API control flows, Hermes, model routing, GPU or
runtime detection, lifecycle commands, host mutation, or network exposure, it
requires release-grade fleet validation before release unless the PR explains a
narrower equivalent.
Notes For Reviewers
This is scoped live environment validation. The broader Mac installer recovery and preview issues are tracked separately, and full fleet acceptance remains pending.