RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(deps): update module github.com/golang-jwt/jwt/v4 to v4.1.0 (#2418)

pull/2422/head
James Elliott 2021-09-26 22:06:11 +10:00 committed by GitHub
parent d7763a20ec
commit 6a75fc6f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -14,7 +14,7 @@ require (
github.com/fasthttp/session/v2 v2.4.3 github.com/fasthttp/session/v2 v2.4.3
github.com/go-ldap/ldap/v3 v3.4.1 github.com/go-ldap/ldap/v3 v3.4.1
github.com/go-sql-driver/mysql v1.6.0 github.com/go-sql-driver/mysql v1.6.0
github.com/golang-jwt/jwt/v4 v4.0.0 github.com/golang-jwt/jwt/v4 v4.1.0
github.com/golang/mock v1.6.0 github.com/golang/mock v1.6.0
github.com/google/uuid v1.3.0 github.com/google/uuid v1.3.0
github.com/jackc/pgx/v4 v4.13.0 github.com/jackc/pgx/v4 v4.13.0

4
go.sum
View File

@ -575,8 +575,8 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o= github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=
github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=

8
internal/handlers/handler_register_u2f_step1_test.go
View File

@ -36,9 +36,11 @@ func (s *HandlerRegisterU2FStep1Suite) TearDownTest() {
func createToken(secret string, username string, action string, expiresAt time.Time) string { func createToken(secret string, username string, action string, expiresAt time.Time) string {
claims := &middlewares.IdentityVerificationClaim{ claims := &middlewares.IdentityVerificationClaim{
StandardClaims: jwt.StandardClaims{ RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: expiresAt.Unix(), ExpiresAt: &jwt.NumericDate{
Issuer: "Authelia", Time: expiresAt,
},
Issuer: "Authelia",
}, },
Action: action, Action: action,
Username: username, Username: username,

12
internal/middlewares/identity_verification.go
View File

@ -30,12 +30,14 @@ func IdentityVerificationStart(args IdentityVerificationStartArgs) RequestHandle
// Create the claim with the action to sign it. // Create the claim with the action to sign it.
claims := &IdentityVerificationClaim{ claims := &IdentityVerificationClaim{
jwt.StandardClaims{ RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: time.Now().Add(5 * time.Minute).Unix(), ExpiresAt: &jwt.NumericDate{
Issuer: jwtIssuer, Time: time.Now().Add(5 * time.Minute),
},
Issuer: jwtIssuer,
}, },
args.ActionClaim, Action: args.ActionClaim,
identity.Username, Username: identity.Username,
} }
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
ss, err := token.SignedString([]byte(ctx.Configuration.JWTSecret)) ss, err := token.SignedString([]byte(ctx.Configuration.JWTSecret))

12
internal/middlewares/identity_verification_test.go
View File

@ -166,12 +166,14 @@ func (s *IdentityVerificationFinishProcess) TearDownTest() {
func createToken(secret string, username string, action string, expiresAt time.Time) string { func createToken(secret string, username string, action string, expiresAt time.Time) string {
claims := &middlewares.IdentityVerificationClaim{ claims := &middlewares.IdentityVerificationClaim{
jwt.StandardClaims{ RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: expiresAt.Unix(), ExpiresAt: &jwt.NumericDate{
Issuer: "Authelia", Time: expiresAt,
},
Issuer: "Authelia",
}, },
action, Action: action,
username, Username: username,
} }
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
ss, _ := token.SignedString([]byte(secret)) ss, _ := token.SignedString([]byte(secret))

2
internal/middlewares/types.go
View File

@ -88,7 +88,7 @@ type IdentityVerificationFinishArgs struct {
// IdentityVerificationClaim custom claim for specifying the action claim. // IdentityVerificationClaim custom claim for specifying the action claim.
// The action can be to register a TOTP device, a U2F device or reset one's password. // The action can be to register a TOTP device, a U2F device or reset one's password.
type IdentityVerificationClaim struct { type IdentityVerificationClaim struct {
jwt.StandardClaims jwt.RegisteredClaims
// The action this token has been crafted for. // The action this token has been crafted for.
Action string `json:"action"` Action string `json:"action"`