-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
auth: Use a custom function to determine access token expiry #362
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package auth | ||
|
||
import ( | ||
"golang.org/x/oauth2" | ||
"time" | ||
|
||
"github.com/hashicorp/go-azure-sdk/sdk/claims" | ||
) | ||
|
||
const tokenExpiryDelta = 10 * time.Minute | ||
|
||
// tokenExpiresSoon returns true if the token expires within 10 minutes, or if more than 50% of its validity period has elapsed (if this can be determined), whichever is later | ||
func tokenDueForRenewal(token *oauth2.Token) bool { | ||
if token == nil { | ||
return true | ||
} | ||
|
||
// Some tokens may never expire | ||
if token.Expiry.IsZero() { | ||
return false | ||
} | ||
|
||
expiry := token.Expiry.Round(0) | ||
delta := tokenExpiryDelta | ||
now := time.Now() | ||
expiresWithinTenMinutes := expiry.Add(-delta).Before(now) | ||
|
||
// Try to parse the token claims to retrieve the issuedAt time | ||
if claims, err := claims.ParseClaims(token); err != nil { | ||
if claims.IssuedAt > 0 { | ||
issued := time.Unix(claims.IssuedAt, 0) | ||
validity := expiry.Sub(issued) | ||
|
||
// If the validity period is less than double the expiry delta, then instead | ||
// determine whether >50% of the validity period has elapsed | ||
if validity < delta*2 { | ||
halfValidityHasElapsed := issued.Add(validity / 2).Before(now) | ||
return halfValidityHasElapsed | ||
} | ||
} | ||
} | ||
|
||
return expiresWithinTenMinutes | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC the access token expiration time is in UTC, so do we want to explicitly convert these to UTC too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's in local time actually, we're computing the expiration time based on the
expires_in
field from the login response, which is a seconds value that we add to the local time.