mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User session fixes (#3397)

Browse Source
This commit is contained in:
Ramon de Klein
2024-07-05 03:22:36 +02:00
committed by GitHub
parent 6075387654
commit 13d83a6d1c
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/user_session.go
View File

@@ -55,12 +55,7 @@ func registerSessionHandlers(api *operations.ConsoleAPI) {
} }
func getClaimsFromToken(sessionToken string) (map[string]interface{}, error) { func getClaimsFromToken(sessionToken string) (map[string]interface{}, error) {
jp := new(jwtgo.Parser) jp := jwtgo.NewParser()
// nolint:staticcheck // ignore SA1019
jp.ValidMethods = []string{
"RS256", "RS384", "RS512", "ES256", "ES384", "ES512",
"RS3256", "RS3384", "RS3512", "ES3256", "ES3384", "ES3512",
}
var claims jwtgo.MapClaims var claims jwtgo.MapClaims
_, _, err := jp.ParseUnverified(sessionToken, &claims) _, _, err := jp.ParseUnverified(sessionToken, &claims)
if err != nil { if err != nil {
@@ -115,7 +110,7 @@ func getSessionResponse(ctx context.Context, session *models.Principal) (*models
// All calls from console are signature v4. // All calls from console are signature v4.
condition.S3SignatureVersion.Name(): {"AWS4-HMAC-SHA256"}, condition.S3SignatureVersion.Name(): {"AWS4-HMAC-SHA256"},
// All calls from console are signature v4. // All calls from console use header-based authentication
condition.S3AuthType.Name(): {"REST-HEADER"}, condition.S3AuthType.Name(): {"REST-HEADER"},
// This is usually empty, may be set some times (rare). // This is usually empty, may be set some times (rare).
condition.S3LocationConstraint.Name(): {GetMinIORegion()}, condition.S3LocationConstraint.Name(): {GetMinIORegion()},
@@ -237,15 +232,6 @@ func getSessionResponse(ctx context.Context, session *models.Principal) (*models
resourcePermissions[key] = resourceActions resourcePermissions[key] = resourceActions
} }
serializedPolicy, err := json.Marshal(policy)
if err != nil {
return nil, ErrorWithContext(ctx, err, ErrInvalidSession)
}
var sessionPolicy *models.IamPolicy
err = json.Unmarshal(serializedPolicy, &sessionPolicy)
if err != nil {
return nil, ErrorWithContext(ctx, err)
}
// environment constants // environment constants
var envConstants models.EnvironmentConstants var envConstants models.EnvironmentConstants