3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-19 11:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

pomerium-cli: fix kubernetes token caching (#1169)

Browse source 
* pomerium-cli: fix kubernetes token caching

* switch to jose v2
This commit is contained in:
Caleb Doxsey 2020-07-31 09:50:06 -06:00 • committed by GitHub
parent fabf773e8b
commit b1d72c829b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/pomerium-cli/kubernetes.go
View file

@ -14,9 +14,9 @@ import (
"github.com/skratchdot/open-golang/open" "github.com/skratchdot/open-golang/open"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/square/go-jose/jwt"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
jose "gopkg.in/square/go-jose.v2"
) )
func init() { func init() {
@ -155,22 +155,22 @@ func runHandleJWT(ctx context.Context, serverURL *url.URL, incomingJWT chan stri
} }
func parseToken(rawjwt string) (*ExecCredential, error) { func parseToken(rawjwt string) (*ExecCredential, error) {
tok, err := jwt.ParseSigned(rawjwt) tok, err := jose.ParseSigned(rawjwt)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var claims struct { var claims struct {
Exp int64 `json:"exp"` Expiry int64 `json:"exp"`
} }
err = tok.UnsafeClaimsWithoutVerification(&claims) err = json.Unmarshal(tok.UnsafePayloadWithoutVerification(), &claims)
if err != nil { if err != nil {
return nil, err return nil, err
} }
expiresAt := time.Unix(claims.Exp, 0) expiresAt := time.Unix(claims.Expiry, 0)
if expiresAt.IsZero() { if expiresAt.IsZero() {
expiresAt = time.Now().Add(time.Minute) expiresAt = time.Now().Add(time.Hour)
} }
return &ExecCredential{ return &ExecCredential{
@ -179,7 +179,7 @@ func parseToken(rawjwt string) (*ExecCredential, error) {
Kind: "ExecCredential", Kind: "ExecCredential",
}, },
Status: &ExecCredentialStatus{ Status: &ExecCredentialStatus{
ExpirationTimestamp: time.Now().Add(time.Second * 10), ExpirationTimestamp: expiresAt,
Token: "Pomerium-" + rawjwt, Token: "Pomerium-" + rawjwt,
}, },
}, nil }, nil

1
go.mod
View file

@ -53,7 +53,6 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.7.0 github.com/spf13/viper v1.7.0
github.com/square/go-jose v2.5.1+incompatible
github.com/stretchr/testify v1.6.1 github.com/stretchr/testify v1.6.1
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
github.com/uber/jaeger-client-go v2.20.1+incompatible // indirect github.com/uber/jaeger-client-go v2.20.1+incompatible // indirect

2
go.sum
View file

@ -534,8 +534,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
github.com/square/go-jose v2.5.1+incompatible h1:FC+BwI9FzJZWpKaE0yUhFNbp/CyFHndARzuGVME/LGk=
github.com/square/go-jose v2.5.1+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=