Redact static tokens and custom http headers #4182
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
|
This pull request does not have a backport label. Could you fix it @michel-laterman? 🙏
|
|
|
mergify
bot
added
the
backport-8.x
michel-laterman
added
enhancement
belimawr
reviewed
Dec 6, 2024
michel-laterman
force-pushed
the
redact-static-tokens
branch
from
e9439f4 to
ecdeb34
Compare
michel-laterman
commented
Dec 6, 2024
|
anther test failure from #4170 |
cmacknz
reviewed
Dec 6, 2024
internal/pkg/config/config.go
Outdated
| for k, v := range redacted.Elasticsearch.ProxyHeaders { | ||
| proxyHeaders[k] = v | ||
| lk := strings.ToLower(k) | ||
| if strings.Contains(lk, "auth") || strings.Contains(lk, "token") || strings.Contains(lk, "key") || strings.Contains(lk, "bearer") { // best-effort scan to redact sensitive headers |
There was a problem hiding this comment.
This should probably be a function just to prevent people from forgetting to update both places.
We could also one day split out a lot of our best effort redaction logic into a reusable package.
cmacknz
approved these changes
Dec 6, 2024
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 7, 2024
Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go
mergify bot
pushed a commit
that referenced
this pull request
Dec 7, 2024
Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go
mergify bot
pushed a commit
that referenced
this pull request
Dec 7, 2024
Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go
This was referenced Dec 7, 2024
michel-laterman
added a commit
that referenced
this pull request
Dec 10, 2024
…4189) * Redact static tokens and custom http headers (#4182) Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go * Fix merge conflict --------- Co-authored-by: Michel Laterman <[email protected]> Co-authored-by: michel-laterman <[email protected]>
michel-laterman
added a commit
that referenced
this pull request
Dec 10, 2024
…4190) * Redact static tokens and custom http headers (#4182) Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go * Fix merge conflict --------- Co-authored-by: Michel Laterman <[email protected]> Co-authored-by: michel-laterman <[email protected]>
michel-laterman
added a commit
that referenced
this pull request
Dec 10, 2024
…4191) * Redact static tokens and custom http headers (#4182) Redact sensitive values in headers and static token within the Config.Redact() (cherry picked from commit d0993e8) # Conflicts: # internal/pkg/config/config.go * Fix merge conflict --------- Co-authored-by: Michel Laterman <[email protected]> Co-authored-by: michel-laterman <[email protected]>
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.
What is the problem this PR solves?
Static tokens and (potentially) custom http headers can expose secrets in diagnostic bundles.
How does this PR solve the problem?
Redact sensitive values within the
Config.Redact()call,Design Checklist
I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.