Discard the local login server on non-desktop environment #1502
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
bamarni
requested review from
br-lewis,
drewvanstone,
janisz and
makkes
as code owners
janisz
suggested changes
Oct 11, 2019
| @@ -21,3 +21,11 @@ func NewOsOpener(logger *logrus.Logger) *OsOpener { | |||
| logger: logger, | |||
| } | |||
| } | |||
|
|
|||
| // OpenerFunc is a func adapter for the Opener interface. | |||
| type OpenerFunc func(string) error | |||
There was a problem hiding this comment.
This is used only in test https://github.com/dcos/dcos-cli/pull/1502/files#diff-48a7e37bb2ef223e6225547541997ea1R58 so it can be placed in _test.go file
There was a problem hiding this comment.
Even though it is only used in a test right now, it is meant to be exposed to other projects using this package (to provide a custom open mechanism, or for their own tests).
| @@ -167,29 +167,39 @@ func (f *Flow) triggerMethod(provider *Provider) (acsToken string, err error) { | |||
| if provider.ID == DCOSOIDCAuth0 { | |||
| loginServer, err = loginserver.New(startFlowURL) | |||
| if err != nil { | |||
| return "", err | |||
| f.logger.Error(err) | |||
There was a problem hiding this comment.
Previously we returned at this point. Why this change?
There was a problem hiding this comment.
This lets use fallback to reading from stdin in that case.
For the `dcos-oidc-auth0` login provider, when the user operates the CLI from a container or a remote machine, the local webserver will not run on the same machine as the browser. Later on the browser will try to send the token to eg. `localhost:43383`, which won't be reachable. When this situation arises, we had designed the UI to fallback to printing the login token for copy-pasting, but once the CLI has successfully initiated the local web server, it doesn't accept input from STDIN at all, so the user has no chance to copy-paste the token. This commit updates the CLI to fallback to reading from STDIN when the browser can't be opened. Note: as an alternative, it would have been possible to concurrently wait for data on both the local web server and STDIN, but the current fix is simpler and covers the container / remote use-cases as expected. https://jira.mesosphere.com/browse/DCOS_OSS-5591
bamarni
force-pushed
the
DCOS_OSS-5591
branch
from
11f5e46
to
fe9242e
Compare
janisz
approved these changes
Oct 14, 2019
|
@mesosphere-ci run integration tests |
drewvanstone
approved these changes
Oct 15, 2019
bamarni
added a commit
to bamarni/dcos-cli
that referenced
this pull request
Oct 23, 2019
This fixes a regression introduced in dcos#1502. https://jira.mesosphere.com/browse/DCOS-60349
bamarni
added a commit
to bamarni/dcos-cli
that referenced
this pull request
Oct 23, 2019
This fixes a regression introduced in dcos#1502. This issue only happens on non-desktop environments. https://jira.mesosphere.com/browse/DCOS-60349
bamarni
added a commit
to bamarni/dcos-cli
that referenced
this pull request
Oct 24, 2019
This fixes a regression introduced in dcos#1502, which can cause a panic on non-desktop environments with browser-based login flows other than auth0. https://jira.mesosphere.com/browse/DCOS-60349
bamarni
added a commit
to bamarni/dcos-cli
that referenced
this pull request
Oct 24, 2019
This fixes a regression introduced in dcos#1502, which can cause a panic on non-desktop environments with browser-based login flows other than auth0. https://jira.mesosphere.com/browse/DCOS-60349
bamarni
added a commit
to bamarni/dcos-cli
that referenced
this pull request
Oct 24, 2019
This fixes a regression introduced in dcos#1502, which can cause a panic on non-desktop environments with browser-based login flows other than auth0. https://jira.mesosphere.com/browse/DCOS-60349
bamarni
added a commit
that referenced
this pull request
Oct 24, 2019
This fixes a regression introduced in #1502, which can cause a panic on non-desktop environments with browser-based login flows other than auth0. https://jira.mesosphere.com/browse/DCOS-60349
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.
For the
dcos-oidc-auth0login provider, when the user operates the CLIfrom a container or a remote machine, the local webserver will not run
on the same machine as the browser. Later on the browser will try to
send the token to eg.
localhost:43383, which won't be reachable.When this situation arises, we had designed the UI to fallback to
printing the login token for copy-pasting, but once the CLI has
successfully initiated the local web server, it doesn't accept input
from STDIN at all, so the user has no chance to copy-paste the token.
This commit updates the CLI to fallback to reading from STDIN when the
browser can't be opened.
Note: as an alternative, it would have been possible to concurrently
wait for data on both the local web server and STDIN, but the current
fix is simpler and covers the container / remote use-cases as expected.
https://jira.mesosphere.com/browse/DCOS_OSS-5591