From ef7476d3e17ed56b1e1152038163d188becc2b4f Mon Sep 17 00:00:00 2001 From: Umputun Date: Sat, 24 Aug 2019 14:17:35 -0500 Subject: [PATCH] change auth lib to 0.8.2, fixed user's aud promotion --- backend/_example/memory_store/go.sum | 1 + backend/go.mod | 2 +- backend/go.sum | 4 ++-- backend/vendor/github.com/go-pkgz/auth/token/jwt.go | 9 ++++++--- backend/vendor/modules.txt | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/_example/memory_store/go.sum b/backend/_example/memory_store/go.sum index 4ce03db1..28489590 100644 --- a/backend/_example/memory_store/go.sum +++ b/backend/_example/memory_store/go.sum @@ -49,6 +49,7 @@ github.com/go-pkgz/auth v0.4.1/go.mod h1:CWtB8dHmOv+TfF3MUzKwk/YwTLepC2TaDL05A+p github.com/go-pkgz/auth v0.7.2/go.mod h1:ibOpZYISiaOvAHe2bsKj2s3v4AkMam2WxxIFn+zhulo= github.com/go-pkgz/auth v0.8.0/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8= github.com/go-pkgz/auth v0.8.1/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8= +github.com/go-pkgz/auth v0.8.2/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8= github.com/go-pkgz/auth/_example v0.0.0-20190722170031-705d3f732438/go.mod h1:rvZtFFkmm3p+E0CHmfUqTGKweCVg2ddsRUrEEPB1iaE= github.com/go-pkgz/auth/_example v0.0.0-20190823054154-cc9c87832e19/go.mod h1:M9HLEzuiKQQ+rwGA9bAzmUDguCJi2HyGwKkxb5ouGJU= github.com/go-pkgz/jrpc v0.1.0 h1:hNg/IyfEqJcSWOKkuHw0ZwcuGc9TDp7QZREsD2ycmiM= diff --git a/backend/go.mod b/backend/go.mod index a2bee37e..6bf32186 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -17,7 +17,7 @@ require ( github.com/go-chi/chi v4.0.2+incompatible github.com/go-chi/cors v1.0.0 github.com/go-chi/render v1.0.1 - github.com/go-pkgz/auth v0.8.1 + github.com/go-pkgz/auth v0.8.2 github.com/go-pkgz/jrpc v0.1.0 github.com/go-pkgz/lcw v0.3.1 github.com/go-pkgz/lgr v0.6.3 diff --git a/backend/go.sum b/backend/go.sum index 5dc308df..079cf54c 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -53,8 +53,8 @@ github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VCh github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-pkgz/auth v0.4.1/go.mod h1:CWtB8dHmOv+TfF3MUzKwk/YwTLepC2TaDL05A+pFVBM= -github.com/go-pkgz/auth v0.8.1 h1:HBJau0LDOZ9NI5+fnrJu5azETuXLJx9ipx5uosYdK8I= -github.com/go-pkgz/auth v0.8.1/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8= +github.com/go-pkgz/auth v0.8.2 h1:cMpLwoIeVAP1QwwRRDRlgQcsDvBS+yT/gL0m8p4gmcI= +github.com/go-pkgz/auth v0.8.2/go.mod h1:MBNrhig13KG0iXz/0d+30lnFUgzTxncUlaQ8suH/2p8= github.com/go-pkgz/auth/_example v0.0.0-20190722170031-705d3f732438/go.mod h1:rvZtFFkmm3p+E0CHmfUqTGKweCVg2ddsRUrEEPB1iaE= github.com/go-pkgz/jrpc v0.1.0 h1:hNg/IyfEqJcSWOKkuHw0ZwcuGc9TDp7QZREsD2ycmiM= github.com/go-pkgz/jrpc v0.1.0/go.mod h1:JxZsvoBklA50DNhELVJnJ567Rt+KrMH9rR3u515wvE8= diff --git a/backend/vendor/github.com/go-pkgz/auth/token/jwt.go b/backend/vendor/github.com/go-pkgz/auth/token/jwt.go index ab17d929..291fce72 100644 --- a/backend/vendor/github.com/go-pkgz/auth/token/jwt.go +++ b/backend/vendor/github.com/go-pkgz/auth/token/jwt.go @@ -245,6 +245,11 @@ func (j *Service) Get(r *http.Request) (Claims, string, error) { return Claims{}, "", errors.Wrap(err, "failed to get token") } + // promote claim's aud to User.Audience + if claims.User != nil { + claims.User.Audience = claims.Audience + } + if !fromCookie && j.IsExpired(claims) { return Claims{}, "", errors.New("token expired") } @@ -259,9 +264,7 @@ func (j *Service) Get(r *http.Request) (Claims, string, error) { return Claims{}, "", errors.New("xsrf mismatch") } } - if claims.User != nil { - claims.User.Audience = claims.Audience - } + return claims, tokenString, nil } diff --git a/backend/vendor/modules.txt b/backend/vendor/modules.txt index 3eb350cf..3e84967b 100644 --- a/backend/vendor/modules.txt +++ b/backend/vendor/modules.txt @@ -33,7 +33,7 @@ github.com/go-chi/chi/middleware github.com/go-chi/cors # github.com/go-chi/render v1.0.1 github.com/go-chi/render -# github.com/go-pkgz/auth v0.8.1 +# github.com/go-pkgz/auth v0.8.2 github.com/go-pkgz/auth github.com/go-pkgz/auth/avatar github.com/go-pkgz/auth/provider