Skip to content
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

Improve host.json sanitization #9459

Merged
merged 4 commits into from
Aug 15, 2023
Merged

Improve host.json sanitization #9459

merged 4 commits into from
Aug 15, 2023

Conversation

jviau
Copy link
Contributor

@jviau jviau commented Aug 11, 2023

Issue describing the changes in this PR

resolves internal issue

Pull request checklist

  • My changes do not require documentation changes
    • Otherwise: Documentation issue linked to PR
  • My changes should not be added to the release notes for the next release
    • Otherwise: I've added my notes to release_notes.md
  • My changes do not need to be backported to a previous version
    • Otherwise: Backport tracked by issue/PR #issue_or_pr
  • My changes do not require diagnostic events changes
    • Otherwise: I have added/updated all related diagnostic events and their documentation (Documentation issue linked to PR)
  • I have added all required tests (Unit tests, E2E tests)

Additional information

This PR improves redaction of host.json contents. Typically, the sections we allow-list in the log should not contain creds (no json file should have them really), but some could be mistakenly checked in there.

@jviau jviau requested a review from a team as a code owner August 11, 2023 17:27
@jviau jviau merged commit a6dd7d6 into dev Aug 15, 2023
10 checks passed
@jviau jviau deleted the jviau/sanitize-host-json branch August 15, 2023 16:30
@fabiocav
Copy link
Member

/backport to v3.x

@github-actions
Copy link
Contributor

@github-actions
Copy link
Contributor

@fabiocav backporting to v3.x failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Improve host.json sanitization
Applying: Sanitize based on property name as well
Applying: update release_notes.md
Using index info to reconstruct a base tree...
M	release_notes.md
Falling back to patching base and 3-way merge...
Auto-merging release_notes.md
CONFLICT (content): Merge conflict in release_notes.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 update release_notes.md
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@jviau
Copy link
Contributor Author

jviau commented Oct 18, 2023

v3.x port: #9624

fabiocav pushed a commit that referenced this pull request Oct 19, 2023
* Improve host.json sanitization (#9459)

* Contains -> IndexOf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants