Skip to content

Commit da3f54d

Browse files
committed
chore: upgrade to golang-jwt 3.2.1 to fix CVE-2020-26160
CVE-2020-26160[0] is an access restriction bypass under certain circumstances when validating audience checks. The original dgrijalva/jwt-go project is no longer maintained[1] and will not be issuing a fix for this CVE[2]. Instead, they have transferred ownership to golang-jwt/jwt[2][3][4]. The following was performed: 1. update chronograf and jsonweb to import golang-jwt/jwt 2. go mod edit -require github.com/golang-jwt/[email protected]+incompatible 3. go mod edit -droprequire github.com/dgrijalva/jwt-go 4. go mod tidy 5. make 6. make test References: [0] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-26160 [1] dgrijalva/jwt-go#462 [2] dgrijalva/jwt-go#463 [3] https://github.com/dgrijalva/jwt-go/blob/master/README.md [4] https://github.com/golang-jwt/jwt
1 parent 035e11e commit da3f54d

File tree

7 files changed

+8
-5
lines changed

7 files changed

+8
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ This release adds an embedded SQLite database for storing metadata required by t
5050
1. [21849](https://github.com/influxdata/influxdb/pull/21849): Specify which fields are missing when rejecting an incomplete onboarding request.
5151
1. [21839](https://github.com/influxdata/influxdb/pull/21839): Fix display and parsing of `influxd upgrade` CLI prompts in PowerShell.
5252
1. [21850](https://github.com/influxdata/influxdb/pull/21850): Systemd unit should block on startup until http endpoint is ready
53+
1. [21925](https://github.com/influxdata/influxdb/pull/21925): Upgrade to golang-jwt 3.2.1.
5354

5455
## v2.0.7 [2021-06-04]
5556

chronograf/influx/authorization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66
"time"
77

8-
jwt "github.com/dgrijalva/jwt-go"
8+
jwt "github.com/golang-jwt/jwt"
99
"github.com/influxdata/influxdb/v2/chronograf"
1010
)
1111

chronograf/influx/influx_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
gojwt "github.com/dgrijalva/jwt-go"
13+
gojwt "github.com/golang-jwt/jwt"
1414
"github.com/influxdata/influxdb/v2/chronograf"
1515
"github.com/influxdata/influxdb/v2/chronograf/influx"
1616
"github.com/influxdata/influxdb/v2/chronograf/mocks"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/buger/jsonparser v0.0.0-20191004114745-ee4c978eae7e
1616
github.com/cespare/xxhash v1.1.0
1717
github.com/davecgh/go-spew v1.1.1
18-
github.com/dgrijalva/jwt-go v3.2.0+incompatible
1918
github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8
2019
github.com/docker/docker v1.13.1 // indirect
2120
github.com/dustin/go-humanize v1.0.0
@@ -26,6 +25,7 @@ require (
2625
github.com/go-chi/chi v4.1.0+incompatible
2726
github.com/go-stack/stack v1.8.0
2827
github.com/gogo/protobuf v1.3.2
28+
github.com/golang-jwt/jwt v3.2.1+incompatible
2929
github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021
3030
github.com/golang/mock v1.5.0
3131
github.com/golang/protobuf v1.3.3

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
212212
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
213213
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
214214
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
215+
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
216+
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
215217
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
216218
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
217219
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=

jsonweb/token.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/influxdata/influxdb/v2/kit/platform"
77

8-
"github.com/dgrijalva/jwt-go"
8+
"github.com/golang-jwt/jwt"
99
"github.com/influxdata/influxdb/v2"
1010
)
1111

jsonweb/token_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/influxdata/influxdb/v2/kit/platform"
88

9-
"github.com/dgrijalva/jwt-go"
9+
"github.com/golang-jwt/jwt"
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/influxdata/influxdb/v2"
1212
)

0 commit comments

Comments
 (0)