Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

security: switch to new jwt go pkg

goenning158fa7c982e0
diff --git a/app/pkg/jwt/jwt.go b/app/pkg/jwt/jwt.go
index 99da01ab6..182def011 100644
--- a/app/pkg/jwt/jwt.go
+++ b/app/pkg/jwt/jwt.go
@@ -3,10 +3,9 @@ package jwt
import (
"fmt"
- "github.com/dgrijalva/jwt-go"
- jwtgo "github.com/dgrijalva/jwt-go"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
+ jwtgo "github.com/golang-jwt/jwt/v4"
)
var jwtSecret = env.Config.JWTSecret
@@ -71,7 +70,7 @@ func DecodeOAuthClaims(token string) (*OAuthClaims, error) {
func decode(token string, claims jwtgo.Claims) error {
jwtToken, err := jwtgo.ParseWithClaims(token, claims, func(t *jwtgo.Token) (interface{}, error) {
- if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+ if _, ok := t.Method.(*jwtgo.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("Unexpected signing method: %v", t.Header["alg"])
}
diff --git a/app/pkg/jwt/jwt_test.go b/app/pkg/jwt/jwt_test.go
index 431bb0aa6..bbe2528fb 100644
--- a/app/pkg/jwt/jwt_test.go
+++ b/app/pkg/jwt/jwt_test.go
@@ -4,9 +4,9 @@ import (
"testing"
"time"
- jwtgo "github.com/dgrijalva/jwt-go"
. "github.com/getfider/fider/app/pkg/assert"
"github.com/getfider/fider/app/pkg/jwt"
+ jwtgo "github.com/golang-jwt/jwt/v4"
)
func TestJWT_Encode(t *testing.T) {
diff --git a/app/services/oauth/oauth.go b/app/services/oauth/oauth.go
index b0b042ef6..808559423 100644
--- a/app/services/oauth/oauth.go
+++ b/app/services/oauth/oauth.go
@@ -6,7 +6,6 @@ import (
"net/url"
"strings"
- "github.com/dgrijalva/jwt-go"
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/models/dto"
@@ -19,6 +18,7 @@ import (
"github.com/getfider/fider/app/pkg/jsonq"
"github.com/getfider/fider/app/pkg/validate"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/golang-jwt/jwt/v4"
"golang.org/x/oauth2"
"golang.org/x/oauth2/facebook"
"golang.org/x/oauth2/github"
diff --git a/go.mod b/go.mod
index 18bbe4a64..dcbc0672d 100644
--- a/go.mod
+++ b/go.mod
@@ -7,9 +7,9 @@ go 1.16
require (
github.com/aws/aws-sdk-go v1.40.9
github.com/cosmtrek/air v1.27.3
- github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/goenning/imagic v0.0.1
github.com/goenning/letteravatar v0.0.0-20180605200324-553181ed4055
+ github.com/golang-jwt/jwt/v4 v4.0.0
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golangci/golangci-lint v1.41.1
github.com/gosimple/slug v1.10.0
diff --git a/go.sum b/go.sum
index 90ab7f435..26fb9daed 100644
--- a/go.sum
+++ b/go.sum
@@ -132,7 +132,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218=
github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
@@ -209,6 +208,8 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
+github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=