From 0c472df1b28e8378a0be92a587c02a445b28ab7f Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sun, 2 Jan 2022 13:23:31 -0800 Subject: Fix build bugs --- go.mod | 15 +++++++++++++++ go.sum | 37 +++++++++++++++++++++++++++++++++++++ main.go | 4 ++-- oidc_proxy | Bin 7509902 -> 0 bytes 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 go.mod create mode 100644 go.sum delete mode 100755 oidc_proxy diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..f55bc3b --- /dev/null +++ b/go.mod @@ -0,0 +1,15 @@ +module code.crute.me/mcrute/oidc_proxy + +go 1.15 + +require ( + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b + github.com/google/go-cmp v0.5.3 // indirect + github.com/gorilla/handlers v1.5.1 + github.com/lox/httpcache v1.2.0 + github.com/pkg/errors v0.9.1 + github.com/rainycape/vfs v0.0.0-20170722131704-164487ec47b4 // indirect + github.com/stretchr/testify v1.6.1 // indirect + golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..4472682 --- /dev/null +++ b/go.sum @@ -0,0 +1,37 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/lox/httpcache v1.2.0 h1:PM7y5nWMxkTD0Tq3dNRKZosshtWeCZkDWgAYnyo4grk= +github.com/lox/httpcache v1.2.0/go.mod h1:d/gfdtRb0sCxtH6y8N94BAjSOCBekdCnijLo/6V84Io= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rainycape/vfs v0.0.0-20170722131704-164487ec47b4 h1:WHsWAhBinp4dsQx9mAYSpV6RTURwIfFMp/yvxUL/46c= +github.com/rainycape/vfs v0.0.0-20170722131704-164487ec47b4/go.mod h1:ArOJDAI/9Dp6adwe3Fydx65JzxKEMaZXwMHebjLGxIM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o= +golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index d90442f..38129b9 100644 --- a/main.go +++ b/main.go @@ -239,8 +239,8 @@ func AuthProxyController(w http.ResponseWriter, r *http.Request) { r.Header["X-Forwarded-User"] = []string{claims.Subject} r.Header["X-OIDC-Token-Age"] = StringListFromInt(claims.Age()) - r.Header["X-OIDC-Token-Expires"] = StringListFromInt(int64(claims.Expiry)) - r.Header["X-OIDC-UserInfo-Endpoint"] = "" // TODO: Include this + r.Header["X-OIDC-Token-Expires"] = StringListFromInt(int64(*claims.Expiry)) + r.Header["X-OIDC-UserInfo-Endpoint"] = []string{""} // TODO: Include this ctx.reverseProxy.ServeHTTP(w, r) } diff --git a/oidc_proxy b/oidc_proxy deleted file mode 100755 index cc3c7be..0000000 Binary files a/oidc_proxy and /dev/null differ -- cgit v1.2.3