Skip to content

Change OAuth complete timeout to 2 minutes #606

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

Merged
mickmister merged 2 commits into from
Dec 2, 2022
Merged

Change OAuth complete timeout to 2 minutes #606

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a5a9cc
change oauth completetimeout to 5 minutes
mickmister Nov 15, 2022
f7f5937
change timeout to 2 minutes
mickmister Nov 16, 2022
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
10 changes: 7 additions & 3 deletions server/plugin/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ const (
// TokenTTL is the OAuth token expiry duration in seconds
TokenTTL = 10 * 60

requestTimeout = 30 * time.Second
requestTimeout = 30 * time.Second
oauthCompleteTimeout = 2 * time.Minute
)

type OAuthState struct {
Expand Down Expand Up @@ -385,7 +386,10 @@ func (p *Plugin) completeConnectUserToGitHub(c *Context, w http.ResponseWriter,

conf := p.getOAuthConfig(state.PrivateAllowed)

tok, err := conf.Exchange(c.Ctx, code)
ctx, cancel := context.WithTimeout(context.Background(), oauthCompleteTimeout)
defer cancel()

tok, err := conf.Exchange(ctx, code)
if err != nil {
c.Log.WithError(err).Warnf("Failed to exchange oauth code into token")

Expand All @@ -395,7 +399,7 @@ func (p *Plugin) completeConnectUserToGitHub(c *Context, w http.ResponseWriter,
}

githubClient := p.githubConnectToken(*tok)
gitUser, _, err := githubClient.Users.Get(c.Ctx, "")
gitUser, _, err := githubClient.Users.Get(ctx, "")
if err != nil {
c.Log.WithError(err).Warnf("Failed to get authenticated GitHub user")

Expand Down