docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-23 19:12:36 +03:00
Code Activity

internal/oauth: avoid opening browser after login cancellation

Browse Source 
Check the context after reading stdin to avoid launching the browser
if login was canceled while waiting for ENTER.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2026-10-19 16:29:00 +02:00
parent 6f8369014a
commit 3f2ad8bf05
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/oauth/manager/manager.go
View File

@@ -83,6 +83,9 @@ var ErrDeviceLoginStartFail = errors.New("failed to start device code flow login
// The retrieved tokens are stored in the credentials store (under a separate
// key), and the refresh token is concatenated with the client ID.
func (m *OAuthManager) LoginDevice(ctx context.Context, w io.Writer) (*types.AuthConfig, error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
state, err := m.api.GetDeviceCode(ctx, m.audience)
if err != nil {
logrus.Debugf("failed to start device code login: %v", err)
@@ -120,7 +123,9 @@ func (m *OAuthManager) LoginDevice(ctx context.Context, w io.Writer) (*types.Aut
go func() {
reader := bufio.NewReader(os.Stdin)
_, _ = reader.ReadString('\n')
if _, err := reader.ReadString('\n'); err != nil || ctx.Err() != nil {
return
}
_ = m.openBrowser(state.VerificationURI)
}()