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

[17.06] middleware: Redact secret data on "secret create" #99

Merged
merged 1 commit into from Jul 12, 2017

Conversation

Projects
None yet
4 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 6, 2017

Backport fix:

With cherry-pick moby/moby@3fbc352:

$ git cherry-pick -s -x -Xsubtree=components/engine 3fbc352

No conflicts.

middleware: Redact secret data on "secret create"
With debug logging turned on, we currently log the base64-encoded secret
payload.

Change the middleware code to redact this. Since the field is called
"Data", it requires some context-sensitivity. The URI path is examined
to see which route is being invoked.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 3fbc352)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

@cyli

This comment has been minimized.

Show comment
Hide comment
@cyli

cyli Jul 12, 2017

Contributor

This looks correct to me, and matches what's currently in moby/moby.

Contributor

cyli commented Jul 12, 2017

This looks correct to me, and matches what's currently in moby/moby.

@andrewhsu andrewhsu merged commit 7a50b06 into docker:17.06 Jul 12, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 164 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 155 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:redact branch Jul 12, 2017

thaJeztah pushed a commit to thaJeztah/docker-ce that referenced this pull request Apr 3, 2018

Merge pull request docker#99 from seemethere/arm64_bionic
Add Ubuntu 18.04 arm64 builds
Upstream-commit: bad901ee77ac8aebb7cf7207bd4eb153e7a0f05d
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment