Skip to content

fix(oauth): correct token cache expiry time comparison #68

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

Open
mayfield-z wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(oauth): correct token cache expiry time comparison #68

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
30 changes: 22 additions & 8 deletions oauth/get_token_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ import (
"github.com/free5gc/openapi/nrf/AccessToken"
)

// cachedToken stores OAuth token with absolute expiry timestamp
type cachedToken struct {
Response models.NrfAccessTokenAccessTokenRsp
ExpiryTime int64 // absolute Unix timestamp when token expires
}

var tokenMap sync.Map
var clientMap sync.Map

Expand Down Expand Up @@ -43,14 +49,15 @@ func sendAccTokenReq(
clientMap.Store(configuration, client)
}

var tok models.NrfAccessTokenAccessTokenRsp
// Check if we have a valid cached token
if val, ok := tokenMap.Load(scope); ok {
tok = val.(models.NrfAccessTokenAccessTokenRsp)
if int32(time.Now().Unix()) < tok.ExpiresIn {
cached := val.(cachedToken)
// Compare current time with absolute expiry timestamp
if time.Now().Unix() < cached.ExpiryTime {
token := &oauth2.Token{
AccessToken: tok.AccessToken,
TokenType: tok.TokenType,
Expiry: time.Unix(int64(tok.ExpiresIn), 0),
AccessToken: cached.Response.AccessToken,
TokenType: cached.Response.TokenType,
Expiry: time.Unix(cached.ExpiryTime, 0),
}
return oauth2.StaticTokenSource(token), nil, nil
}
Expand All @@ -67,11 +74,18 @@ func sendAccTokenReq(
context.Background(), req)

if err == nil {
tokenMap.Store(scope, res.NrfAccessTokenAccessTokenRsp)
// Calculate absolute expiry time: current time + expires_in seconds
expiryTime := time.Now().Unix() + int64(res.NrfAccessTokenAccessTokenRsp.ExpiresIn)
cached := cachedToken{
Response: res.NrfAccessTokenAccessTokenRsp,
ExpiryTime: expiryTime,
}
tokenMap.Store(scope, cached)

token := &oauth2.Token{
AccessToken: res.NrfAccessTokenAccessTokenRsp.AccessToken,
TokenType: res.NrfAccessTokenAccessTokenRsp.TokenType,
Expiry: time.Unix(int64(res.NrfAccessTokenAccessTokenRsp.ExpiresIn), 0),
Expiry: time.Unix(expiryTime, 0),
}
return oauth2.StaticTokenSource(token), nil, nil
} else {
Expand Down