Scrub secrets from process arguments #13225
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
jeanbisutti
reviewed
Feb 5, 2025
| @@ -35,6 +34,9 @@ public final class ProcessResource { | |||
| // Important: This is statically used in buildResource, so must be declared/initialized first. | |||
| private static final Pattern JAR_FILE_PATTERN = | |||
| Pattern.compile("^\\S+\\.(jar|war)", Pattern.CASE_INSENSITIVE); | |||
| // scrub values for system properties containing "secret" or "password" in the name | |||
| private static final Pattern SCRUB_PATTERN = | |||
| Pattern.compile("(-D.*(password|secret).*=).*", Pattern.CASE_INSENSITIVE); | |||
There was a problem hiding this comment.
Would it be worth to also scrub properties containing pwd or credential?
There was a problem hiding this comment.
I'll leave that to @trask to decide.
There was a problem hiding this comment.
IMO, it's another option to provide an environment variable for users so that they can set some keys themselves.
There was a problem hiding this comment.
I think ok to go with just password and secret initially and see if we get further reports
jaydeluca
approved these changes
Feb 6, 2025
| test { | ||
| dependsOn(jar) | ||
| doFirst { | ||
| // use test the final jar instead of directories with built classes to test the mrjar functionality |
There was a problem hiding this comment.
Suggested change
| // use test the final jar instead of directories with built classes to test the mrjar functionality | |
| // used to test the final jar instead of directories with built classes to test the mrjar functionality |
There was a problem hiding this comment.
I changed it to use the final jar instead of directories with built classes to test the mrjar functionality wdyt?
laurit
commented
Feb 6, 2025
steverao
reviewed
Feb 6, 2025
...src/test/java/io/opentelemetry/instrumentation/resources/internal/DeclarativeConfigTest.java
Show resolved
Hide resolved
steverao
approved these changes
Feb 6, 2025
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.
Related to #10151