feat(scrubbing): Scrub span.data.http.query with default scrubbers#1889
Merged
iker-barriocanal merged 7 commits intomasterfrom Mar 1, 2023
Merged
feat(scrubbing): Scrub span.data.http.query with default scrubbers#1889iker-barriocanal merged 7 commits intomasterfrom
span.data.http.query with default scrubbers#1889iker-barriocanal merged 7 commits intomasterfrom
Conversation
cleptric
approved these changes
Feb 28, 2023
Member
cleptric
left a comment
There was a problem hiding this comment.
LGTM, we may add an additional test case that checks a more complex query, like api_token=123&process_id=123 -> api_token=[Filtered]&process_id=123
jjbayer
requested changes
Feb 28, 2023
relay-general/src/protocol/types.rs
Outdated
| #[cfg_attr(feature = "jsonschema", derive(JsonSchema))] | ||
| pub struct HttpElement { | ||
| #[metastructure(pii = "true")] | ||
| pub query: Annotated<String>, |
Member
There was a problem hiding this comment.
span.data is documented as free-form, so when a user sends {"http": {"query": {"not": "a string"}}}, we should still accept it.
@iker-barriocanal could you check if the scrubbing still works when you change String to Value here?
Contributor
Author
There was a problem hiding this comment.
Great catch! This is fixed in 03af9eb, and continues to work as expected.
jjbayer
approved these changes
Feb 28, 2023
jan-auer
added a commit
that referenced
this pull request
Mar 2, 2023
* master: doc(py): Add changelog entries (#1900) fix(build): Run check when PR is ready for review (#1899) chore(project_local): Allow to follow symlinks for projects configs (#1891) ref(project): Skip serializing default fields (#1887) chore(build): Run changelog check for draft PRs (#1897) chore(sentry): Add environment config option (#1890) feat(scrubbing): Scrub `span.data.http.query` with default scrubbers (#1889)
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.
Ref: #1855
span.data.http.querymay contain sensitive data, which is currently not scrubbed. This PR makes relay to scrub that field with default data scrubbers.