diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2079e863..bf87123b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,6 +7,8 @@ on: branches: [ main ] schedule: - cron: '32 3 * * 5' + workflow_dispatch: + jobs: analyze: @@ -23,20 +25,20 @@ jobs: language: [ 'go' ] steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v3 #- run: | # make bootstrap # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/go_test.yml b/.github/workflows/go_test.yml index 00a82964..c95fc15e 100644 --- a/.github/workflows/go_test.yml +++ b/.github/workflows/go_test.yml @@ -9,11 +9,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test run: | cd auth_server diff --git a/auth_server/Makefile b/auth_server/Makefile index 120d1a89..20915a52 100644 --- a/auth_server/Makefile +++ b/auth_server/Makefile @@ -1,5 +1,5 @@ MAKEFLAGS += --warn-undefined-variables -IMAGE ?= cesanta/docker_auth +IMAGE ?= sweatycomputing/docker_auth VERSION ?= $(shell go run ./gen_version.go | awk '{print $$1}') BUILD_ID ?= $(shell go run ./gen_version.go | awk '{print $$2}') diff --git a/auth_server/README.md b/auth_server/README.md index 00f30fe5..ce329a45 100644 --- a/auth_server/README.md +++ b/auth_server/README.md @@ -3,7 +3,7 @@ ``` mkdir -p /var/tmp/go/src/github.com/cesanta cd /var/tmp/go/src/github.com/cesanta -git clone https://github.com/cesanta/docker_auth.git +git clone https://github.com/sweatycomputing/docker_auth.git cd docker_auth/auth_server make docker-build ``` diff --git a/auth_server/authn/ext_auth.go b/auth_server/authn/ext_auth.go index 7c6757cc..0d85d68e 100644 --- a/auth_server/authn/ext_auth.go +++ b/auth_server/authn/ext_auth.go @@ -25,7 +25,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type ExtAuthConfig struct { diff --git a/auth_server/authn/github_auth.go b/auth_server/authn/github_auth.go index 83b8c972..80a6c9ad 100644 --- a/auth_server/authn/github_auth.go +++ b/auth_server/authn/github_auth.go @@ -30,7 +30,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type GitHubTeamCollection []GitHubTeam diff --git a/auth_server/authn/gitlab_auth.go b/auth_server/authn/gitlab_auth.go index d6668f27..08ac4629 100644 --- a/auth_server/authn/gitlab_auth.go +++ b/auth_server/authn/gitlab_auth.go @@ -30,7 +30,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type GitlabTeamCollection []GitlabTeam diff --git a/auth_server/authn/google_auth.go b/auth_server/authn/google_auth.go index 622a7b0a..495757b4 100644 --- a/auth_server/authn/google_auth.go +++ b/auth_server/authn/google_auth.go @@ -29,7 +29,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type GoogleAuthConfig struct { diff --git a/auth_server/authn/ldap_auth.go b/auth_server/authn/ldap_auth.go index cc837cd9..e139201d 100644 --- a/auth_server/authn/ldap_auth.go +++ b/auth_server/authn/ldap_auth.go @@ -26,7 +26,7 @@ import ( "github.com/cesanta/glog" "github.com/go-ldap/ldap" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type LabelMap struct { diff --git a/auth_server/authn/mongo_auth.go b/auth_server/authn/mongo_auth.go index db546be4..02fb9ee0 100644 --- a/auth_server/authn/mongo_auth.go +++ b/auth_server/authn/mongo_auth.go @@ -29,8 +29,8 @@ import ( "go.mongodb.org/mongo-driver/mongo/options" "golang.org/x/crypto/bcrypt" - "github.com/cesanta/docker_auth/auth_server/api" - "github.com/cesanta/docker_auth/auth_server/mgo_session" + "github.com/sweatycomputing/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/mgo_session" ) type MongoAuthConfig struct { diff --git a/auth_server/authn/oidc_auth.go b/auth_server/authn/oidc_auth.go index 743c168a..34d0c03d 100644 --- a/auth_server/authn/oidc_auth.go +++ b/auth_server/authn/oidc_auth.go @@ -33,7 +33,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) // All configuration options diff --git a/auth_server/authn/plugin_authn.go b/auth_server/authn/plugin_authn.go index cebf3230..af50772a 100644 --- a/auth_server/authn/plugin_authn.go +++ b/auth_server/authn/plugin_authn.go @@ -22,7 +22,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type PluginAuthnConfig struct { diff --git a/auth_server/authn/static_auth.go b/auth_server/authn/static_auth.go index 4edc4892..b04838c9 100644 --- a/auth_server/authn/static_auth.go +++ b/auth_server/authn/static_auth.go @@ -20,7 +20,7 @@ import ( "encoding/json" "golang.org/x/crypto/bcrypt" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type Requirements struct { diff --git a/auth_server/authn/tokendb_gcs.go b/auth_server/authn/tokendb_gcs.go index 53a0d278..551fb41b 100644 --- a/auth_server/authn/tokendb_gcs.go +++ b/auth_server/authn/tokendb_gcs.go @@ -28,7 +28,7 @@ import ( "golang.org/x/net/context" "google.golang.org/api/option" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type GCSStoreConfig struct { diff --git a/auth_server/authn/tokendb_level.go b/auth_server/authn/tokendb_level.go index 66d43444..50c25570 100644 --- a/auth_server/authn/tokendb_level.go +++ b/auth_server/authn/tokendb_level.go @@ -27,7 +27,7 @@ import ( "github.com/syndtr/goleveldb/leveldb" "golang.org/x/crypto/bcrypt" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) const ( diff --git a/auth_server/authn/tokendb_redis.go b/auth_server/authn/tokendb_redis.go index 39a4f10a..e49b2bf7 100644 --- a/auth_server/authn/tokendb_redis.go +++ b/auth_server/authn/tokendb_redis.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" "github.com/cesanta/glog" "github.com/dchest/uniuri" "github.com/go-redis/redis" diff --git a/auth_server/authn/xorm_authn.go b/auth_server/authn/xorm_authn.go index 34b2cb23..53edc9ef 100644 --- a/auth_server/authn/xorm_authn.go +++ b/auth_server/authn/xorm_authn.go @@ -19,7 +19,7 @@ package authn import ( "fmt" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" "golang.org/x/crypto/bcrypt" _ "github.com/go-sql-driver/mysql" diff --git a/auth_server/authz/acl.go b/auth_server/authz/acl.go index 2f2e824c..d93b8448 100644 --- a/auth_server/authz/acl.go +++ b/auth_server/authz/acl.go @@ -13,7 +13,7 @@ import ( "github.com/cesanta/glog" "github.com/schwarmco/go-cartesian-product" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type ACL []ACLEntry diff --git a/auth_server/authz/acl_mongo.go b/auth_server/authz/acl_mongo.go index 5439d482..6d76d48b 100644 --- a/auth_server/authz/acl_mongo.go +++ b/auth_server/authz/acl_mongo.go @@ -14,8 +14,8 @@ import ( "go.mongodb.org/mongo-driver/mongo/options" "gopkg.in/mgo.v2/bson" - "github.com/cesanta/docker_auth/auth_server/api" - "github.com/cesanta/docker_auth/auth_server/mgo_session" + "github.com/sweatycomputing/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/mgo_session" ) type MongoACL []MongoACLEntry diff --git a/auth_server/authz/acl_test.go b/auth_server/authz/acl_test.go index 1b1d6745..1bdc415a 100644 --- a/auth_server/authz/acl_test.go +++ b/auth_server/authz/acl_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) func sp(s string) *string { diff --git a/auth_server/authz/acl_xorm.go b/auth_server/authz/acl_xorm.go index 559b4bc7..d5018407 100644 --- a/auth_server/authz/acl_xorm.go +++ b/auth_server/authz/acl_xorm.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" "github.com/cesanta/glog" _ "github.com/go-sql-driver/mysql" diff --git a/auth_server/authz/casbin_authz.go b/auth_server/authz/casbin_authz.go index 94ff0d8f..0a5c0b62 100644 --- a/auth_server/authz/casbin_authz.go +++ b/auth_server/authz/casbin_authz.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/casbin/casbin/v2" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type CasbinAuthzConfig struct { diff --git a/auth_server/authz/casbin_authz_test.go b/auth_server/authz/casbin_authz_test.go index 106d8054..83fafed1 100644 --- a/auth_server/authz/casbin_authz_test.go +++ b/auth_server/authz/casbin_authz_test.go @@ -22,7 +22,7 @@ import ( "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/util" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) func requestToString(ai api.AuthRequestInfo) string { diff --git a/auth_server/authz/ext_authz.go b/auth_server/authz/ext_authz.go index 0e270b22..80af07d4 100644 --- a/auth_server/authz/ext_authz.go +++ b/auth_server/authz/ext_authz.go @@ -25,7 +25,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type ExtAuthzConfig struct { diff --git a/auth_server/authz/plugin_authz.go b/auth_server/authz/plugin_authz.go index 29909bca..9eb8eedf 100644 --- a/auth_server/authz/plugin_authz.go +++ b/auth_server/authz/plugin_authz.go @@ -22,7 +22,7 @@ import ( "github.com/cesanta/glog" - "github.com/cesanta/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/api" ) type PluginAuthzConfig struct { diff --git a/auth_server/go.mod b/auth_server/go.mod index b1f5f613..129858a0 100644 --- a/auth_server/go.mod +++ b/auth_server/go.mod @@ -1,4 +1,4 @@ -module github.com/cesanta/docker_auth/auth_server +module github.com/sweatycomputing/docker_auth/auth_server go 1.17 @@ -9,7 +9,7 @@ require ( github.com/coreos/go-oidc/v3 v3.9.0 github.com/dchest/uniuri v0.0.0-20220929095258-3027df40b6ce github.com/deckarep/golang-set v1.8.0 - github.com/docker/distribution v2.8.1+incompatible + github.com/docker/distribution v2.8.2+incompatible github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 github.com/go-ldap/ldap v3.0.3+incompatible github.com/go-redis/redis v6.15.9+incompatible @@ -19,7 +19,7 @@ require ( github.com/schwarmco/go-cartesian-product v0.0.0-20180515110546-d5ee747a6dc9 github.com/syndtr/goleveldb v1.0.0 go.mongodb.org/mongo-driver v1.10.2 - golang.org/x/crypto v0.17.0 + golang.org/x/crypto v0.19.0 golang.org/x/net v0.17.0 golang.org/x/oauth2 v0.13.0 google.golang.org/api v0.126.0 @@ -35,7 +35,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v0.13.0 // indirect github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect - github.com/go-jose/go-jose/v3 v3.0.1 // indirect + github.com/go-jose/go-jose/v3 v3.0.3 // indirect github.com/goccy/go-json v0.9.11 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect @@ -62,7 +62,7 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/sync v0.2.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect @@ -70,8 +70,8 @@ require ( google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/grpc v1.55.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/grpc v1.56.3 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect lukechampine.com/uint128 v1.2.0 // indirect diff --git a/auth_server/go.sum b/auth_server/go.sum index 97f1c502..d00abb5c 100644 --- a/auth_server/go.sum +++ b/auth_server/go.sum @@ -173,6 +173,7 @@ cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvj cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= @@ -674,6 +675,7 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -696,8 +698,8 @@ github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsP github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= -github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= @@ -719,10 +721,12 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= +github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -739,8 +743,9 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= +github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= +github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -1185,6 +1190,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= @@ -1268,8 +1275,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1546,8 +1553,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1560,7 +1567,7 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1940,10 +1947,12 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1962,8 +1971,9 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= diff --git a/auth_server/main.go b/auth_server/main.go index 9a229de0..5ab0dff5 100644 --- a/auth_server/main.go +++ b/auth_server/main.go @@ -33,7 +33,7 @@ import ( "golang.org/x/crypto/acme/autocert" fsnotify "gopkg.in/fsnotify.v1" - "github.com/cesanta/docker_auth/auth_server/server" + "github.com/sweatycomputing/docker_auth/auth_server/server" ) var ( diff --git a/auth_server/server/config.go b/auth_server/server/config.go index 62cc07da..3b9dad7f 100644 --- a/auth_server/server/config.go +++ b/auth_server/server/config.go @@ -29,8 +29,8 @@ import ( "github.com/docker/libtrust" yaml "gopkg.in/yaml.v2" - "github.com/cesanta/docker_auth/auth_server/authn" - "github.com/cesanta/docker_auth/auth_server/authz" + "github.com/sweatycomputing/docker_auth/auth_server/authn" + "github.com/sweatycomputing/docker_auth/auth_server/authz" ) type Config struct { @@ -95,22 +95,16 @@ type TokenConfig struct { // Taken from https://golang.org/pkg/crypto/tls/#pkg-constants var TLSCipherSuitesValues = map[string]uint16{ // TLS 1.0 - 1.2 cipher suites. - "TLS_RSA_WITH_RC4_128_SHA": tls.TLS_RSA_WITH_RC4_128_SHA, "TLS_RSA_WITH_3DES_EDE_CBC_SHA": tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA, "TLS_RSA_WITH_AES_128_CBC_SHA": tls.TLS_RSA_WITH_AES_128_CBC_SHA, "TLS_RSA_WITH_AES_256_CBC_SHA": tls.TLS_RSA_WITH_AES_256_CBC_SHA, - "TLS_RSA_WITH_AES_128_CBC_SHA256": tls.TLS_RSA_WITH_AES_128_CBC_SHA256, "TLS_RSA_WITH_AES_128_GCM_SHA256": tls.TLS_RSA_WITH_AES_128_GCM_SHA256, "TLS_RSA_WITH_AES_256_GCM_SHA384": tls.TLS_RSA_WITH_AES_256_GCM_SHA384, - "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, - "TLS_ECDHE_RSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, - "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, - "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256": tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, diff --git a/auth_server/server/server.go b/auth_server/server/server.go index 2592b533..b79aa8c0 100644 --- a/auth_server/server/server.go +++ b/auth_server/server/server.go @@ -32,9 +32,9 @@ import ( "github.com/cesanta/glog" "github.com/docker/distribution/registry/auth/token" - "github.com/cesanta/docker_auth/auth_server/api" - "github.com/cesanta/docker_auth/auth_server/authn" - "github.com/cesanta/docker_auth/auth_server/authz" + "github.com/sweatycomputing/docker_auth/auth_server/api" + "github.com/sweatycomputing/docker_auth/auth_server/authn" + "github.com/sweatycomputing/docker_auth/auth_server/authz" ) var (