Repository navigation
Conversation
Up to standards ✅🟢 Issues
|
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
PROXY_CSP_CONFIG_FILE_LOCATIONandPROXY_CSP_CONFIG_FILE_OVERRIDE_LOCATIONaccept a list, and each element can be a path or a glob. That way every web app can ship its owncsp.yamland the proxy merges them, e.g./etc/opencloud/csp.yaml,/web/apps/*/csp.yaml.filesis the list of that variable with globs expanded. The list order is the merge order. Only the matches of a single glob have no given order, they are merged sorted by name.LOCATIONOVERRIDE_LOCATIONThe fields change from
stringto[]string. A single path keeps working from env and from a yaml scalar. The merge semantics are unchanged.loadCSPConfignow uses its own gookit instance instead of the global one, because a second call in the same process panicked. The new tests need that.This enables opencloud-eu/web-extensions#621