Add support to pass security token through token_secret in DC/OS #943
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
ggriffiths
force-pushed
the
dcos_docker_vol_secrets
branch
2 times, most recently
from
a213398 to
a4f3e13
Compare
ggriffiths
force-pushed
the
dcos_docker_vol_secrets
branch
from
a4f3e13 to
fd9f7cd
Compare
adityadani
reviewed
Mar 15, 2019
api/server/docker.go
Outdated
| } | ||
|
|
||
| // get token secret | ||
| secret, context, ok := d.GetTokenSecretFromString(request.Name) |
There was a problem hiding this comment.
Check if request.Opts has a api.TokenSecret ?
api/server/docker.go
Outdated
| // get token secret | ||
| secret, context, ok := d.GetTokenSecretFromString(request.Name) | ||
| if ok && d.secretsStore != nil { | ||
| token, err := d.secretsStore.GetToken(secret, context) |
There was a problem hiding this comment.
I think we should return an error when secret store is not initialized, but a token_secret was provided. In this way the user would get the correct error.
In the current format, user would get "not authorized" error instead of "secret store not initialized"
api/server/docker.go
Outdated
| if ok && d.secretsStore != nil { | ||
| token, err := d.secretsStore.GetToken(secret, context) | ||
| if err != nil { | ||
| return ctx, "" |
api/server/docker.go
Outdated
| "authorization": "bearer " + token, | ||
| }) | ||
| return metadata.NewOutgoingContext(ctx, md), token | ||
| // get token secret |
There was a problem hiding this comment.
nit: moving the GetTokenFromString and GetTokenSecretFromString to addTokenMetadata function, will reduce code duplication
There was a problem hiding this comment.
Ended up adding a parseTokenInput that's shared by attachTokenMount and attachToken to reduce code duplication
ggriffiths
force-pushed
the
dcos_docker_vol_secrets
branch
3 times, most recently
from
8a8c9b8 to
20392bc
Compare
|
Addressed PR comments @adityadani |
Signed-off-by: Grant Griffiths <[email protected]>
ggriffiths
force-pushed
the
dcos_docker_vol_secrets
branch
from
ecea611 to
f349860
Compare
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.
Signed-off-by: Grant Griffiths [email protected]
What this PR does / why we need it:
Which issue(s) this PR fixes (optional)
Closes #928
Special notes for your reviewer: