Skip to content
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.

Sign up for GitHub

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

Add timeout to OIDC callback server listener #97

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Add timeout to OIDC callback server listener #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"regexp"
"runtime"
"strings"
"time"

"github.com/hashicorp/vault/api"
)
Expand Down Expand Up @@ -120,12 +121,14 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
}
}()

// Wait for either the callback to finish or SIGINT to be received
// Wait for either the callback to finish, SIGINT to be received or up to 2 minutes
select {
case s := <-doneCh:
return s.secret, s.err
case <-sigintCh:
return nil, errors.New("Interrupted")
case <-time.After(2 * time.Minute):
return nil, errors.New("Timed out waiting for response from provider")
}
}

Expand Down