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

FIX: Use STS env variable to increase the IDP token expiration #3132

Merged
merged 5 commits into from
Dec 8, 2023
Merged

FIX: Use STS env variable to increase the IDP token expiration #3132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
167680b
FIX: Use STS env variable to increase the IDP token expiration
adriangitvitz Nov 20, 2023
7cae808
Merge branch 'minio:master' into master
adriangitvitz Dec 1, 2023
325db04
Merge branch 'master' into master
cesnietor Dec 7, 2023
b3ccd2a
Merge branch 'master' into master
cesnietor Dec 7, 2023
a674847
Merge branch 'master' into master
dvaldivia Dec 8, 2023
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
14 changes: 0 additions & 14 deletions pkg/auth/idp/oauth2/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ package oauth2

import (
"crypto/sha1"
"strconv"
"strings"
"time"

"github.com/minio/console/pkg/auth/token"
"github.com/minio/pkg/v2/env"
Expand Down Expand Up @@ -106,15 +104,3 @@ func getSaltForIDPHmac() string {
func getIDPScopes() string {
return env.Get(ConsoleIDPScopes, "openid,profile,email")
}

// getIDPTokenExpiration return default token expiration for access token
func getIDPTokenExpiration() time.Duration {
expiration := 12 * 3600
if expStr := env.Get(ConsoleIDPTokenExpiration, ""); expStr != "" {
if exp, err := strconv.Atoi(expStr); err == nil {
expiration = exp
}
}

return time.Duration(expiration) * time.Second
}
24 changes: 14 additions & 10 deletions pkg/auth/idp/oauth2/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"strings"
"time"

"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/minio/minio-go/v7/pkg/set"

"github.com/minio/console/pkg/auth/token"
"github.com/minio/console/pkg/auth/utils"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/pkg/v2/env"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/oauth2"
xoauth2 "golang.org/x/oauth2"
Expand Down Expand Up @@ -331,14 +331,18 @@ func (client *Provider) VerifyIdentity(ctx context.Context, code, state, roleARN
}
client.RefreshToken = oauth2Token.RefreshToken

expiration := token.GetConsoleSTSDuration()
if exp := getIDPTokenExpiration(); exp > 0 {
cesnietor marked this conversation as resolved.
Show resolved Hide resolved
expiration = exp
}
envStsDuration := env.Get(token.ConsoleSTSDuration, "")
stsDuration, err := time.ParseDuration(envStsDuration)

expiration := 12 * time.Hour

// Use the expiration configured in the token itself if it is closer than the configured value
if exp := oauth2Token.Expiry.Sub(time.Now().UTC()); exp < expiration {
expiration = exp
if err == nil && stsDuration > 0 {
expiration = stsDuration
} else {
// Use the expiration configured in the token itself if it is closer than the configured value
if exp := oauth2Token.Expiry.Sub(time.Now().UTC()); exp < expiration {
expiration = exp
}
}

// Minimum duration in S3 spec is 15 minutes, do not bother returning
Expand Down
Loading