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

Jump to bottom

refactor: Generate claims in the same way #595

Merged
merged 1 commit into from
May 19, 2021
Merged

refactor: Generate claims in the same way #595

Show file tree
Hide file tree
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
60 changes: 49 additions & 11 deletions token/jwt/claims_id_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,47 +49,85 @@ type IDTokenClaims struct {
// ToMap will transform the headers to a map structure
func (c *IDTokenClaims) ToMap() map[string]interface{} {
var ret = Copy(c.Extra)
ret["sub"] = c.Subject
ret["iss"] = c.Issuer
ret["jti"] = c.JTI

if c.Subject != "" {
ret["sub"] = c.Subject
} else {
delete(ret, "sub")
}

if c.Issuer != "" {
ret["iss"] = c.Issuer
} else {
delete(ret, "iss")
}

if c.JTI != "" {
ret["jti"] = c.JTI
} else {
ret["jti"] = uuid.New()
}

if len(c.Audience) > 0 {
ret["aud"] = c.Audience
} else {
ret["aud"] = []string{}
}

if !c.IssuedAt.IsZero() {
ret["iat"] = float64(c.IssuedAt.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "iat")
}

if !c.ExpiresAt.IsZero() {
ret["exp"] = float64(c.ExpiresAt.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "exp")
}

if !c.RequestedAt.IsZero() {
ret["rat"] = float64(c.RequestedAt.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "rat")
}

if len(c.Nonce) > 0 {
ret["nonce"] = c.Nonce
} else {
delete(ret, "nonce")
}

if len(c.AccessTokenHash) > 0 {
ret["at_hash"] = c.AccessTokenHash
}

if len(c.JTI) == 0 {
ret["jti"] = uuid.New()
} else {
delete(ret, "at_hash")
}

if len(c.CodeHash) > 0 {
ret["c_hash"] = c.CodeHash
} else {
delete(ret, "c_hash")
}

if !c.AuthTime.IsZero() {
ret["auth_time"] = c.AuthTime.Unix()
ret["auth_time"] = float64(c.AuthTime.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "auth_time")
}

if len(c.AuthenticationContextClassReference) > 0 {
ret["acr"] = c.AuthenticationContextClassReference
} else {
delete(ret, "acr")
}

if len(c.AuthenticationMethodsReference) > 0 {
ret["amr"] = c.AuthenticationMethodsReference
} else {
delete(ret, "amr")
}

ret["iat"] = float64(c.IssuedAt.Unix())
ret["exp"] = float64(c.ExpiresAt.Unix())
ret["rat"] = float64(c.RequestedAt.Unix())
return ret

}
Expand Down
4 changes: 2 additions & 2 deletions token/jwt/claims_id_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func TestIDTokenClaimsToMap(t *testing.T) {
"baz": idTokenClaims.Extra["baz"],
"at_hash": idTokenClaims.AccessTokenHash,
"c_hash": idTokenClaims.CodeHash,
"auth_time": idTokenClaims.AuthTime.Unix(),
"auth_time": float64(idTokenClaims.AuthTime.Unix()),
"acr": idTokenClaims.AuthenticationContextClassReference,
"amr": idTokenClaims.AuthenticationMethodsReference,
}, idTokenClaims.ToMap())
Expand All @@ -88,7 +88,7 @@ func TestIDTokenClaimsToMap(t *testing.T) {
"baz": idTokenClaims.Extra["baz"],
"at_hash": idTokenClaims.AccessTokenHash,
"c_hash": idTokenClaims.CodeHash,
"auth_time": idTokenClaims.AuthTime.Unix(),
"auth_time": float64(idTokenClaims.AuthTime.Unix()),
"acr": idTokenClaims.AuthenticationContextClassReference,
"amr": idTokenClaims.AuthenticationMethodsReference,
"nonce": idTokenClaims.Nonce,
Expand Down
38 changes: 32 additions & 6 deletions token/jwt/claims_jwt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,47 @@ func (c *JWTClaims) WithScopeField(scopeField JWTScopeFieldEnum) JWTClaimsContai
func (c *JWTClaims) ToMap() map[string]interface{} {
var ret = Copy(c.Extra)

ret["jti"] = c.JTI
if c.JTI == "" {
if c.Subject != "" {
ret["sub"] = c.Subject
} else {
delete(ret, "sub")
}

if c.Issuer != "" {
ret["iss"] = c.Issuer
} else {
delete(ret, "iss")
}

if c.JTI != "" {
ret["jti"] = c.JTI
} else {
ret["jti"] = uuid.New()
}

ret["sub"] = c.Subject
ret["iss"] = c.Issuer
ret["aud"] = c.Audience
if len(c.Audience) > 0 {
ret["aud"] = c.Audience
} else {
ret["aud"] = []string{}
}

if !c.IssuedAt.IsZero() {
ret["iat"] = float64(c.IssuedAt.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "iat")
}

if !c.NotBefore.IsZero() {
ret["nbf"] = float64(c.NotBefore.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "nbf")
}

ret["exp"] = float64(c.ExpiresAt.Unix()) // jwt-go does not support int64 as datatype
if !c.ExpiresAt.IsZero() {
ret["exp"] = float64(c.ExpiresAt.Unix()) // jwt-go does not support int64 as datatype
} else {
delete(ret, "exp")
}

if c.Scope != nil {
// ScopeField default (when value is JWTScopeFieldUnset) is the list for backwards compatibility with old versions of fosite.
Expand All @@ -129,6 +152,9 @@ func (c *JWTClaims) ToMap() map[string]interface{} {
if c.ScopeField == JWTScopeFieldString || c.ScopeField == JWTScopeFieldBoth {
ret["scope"] = strings.Join(c.Scope, " ")
}
} else {
delete(ret, "scp")
delete(ret, "scope")
}

return ret
Expand Down
2 changes: 1 addition & 1 deletion token/jwt/claims_jwt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestAssert(t *testing.T) {
ToMapClaims().Valid())
assert.NotNil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(time.Hour)}).
ToMapClaims().Valid())
assert.NotNil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(-time.Hour)}).
assert.Nil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(-time.Hour)}).
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://github.com/ory/fosite/pull/522/files#r513190253

ToMapClaims().Valid())
assert.Nil(t, (&JWTClaims{ExpiresAt: time.Now().UTC().Add(time.Hour),
NotBefore: time.Now().UTC().Add(-time.Hour)}).ToMapClaims().Valid())
Expand Down