From 249f131851b329e3bb76fb9d8ff97814ffaa5885 Mon Sep 17 00:00:00 2001 From: guacamole Date: Fri, 13 May 2022 16:42:01 +0530 Subject: [PATCH 01/19] Feat: first commit towards WebAuthN implementation Signed-off-by: guacamole --- auth/auth.go | 20 +- auth/web_authn.go | 303 ++++++++++++++++++ config/config.go | 7 + ...0008_create_web_authn_creds_table.down.sql | 1 + ...000008_create_web_authn_creds_table.up.sql | 8 + ...0008_create_web_authn_session_table.up.sql | 7 + ...09_create_web_authn_session_table.down.sql | 1 + go.mod | 10 + go.sum | 197 +++++++++++- router/helpers.go | 4 + store/postgres/auth.go | 1 - store/postgres/postgres.go | 9 + store/postgres/queries/web_authn.go | 11 + store/postgres/web_authn.go | 87 +++++ types/users.go | 42 ++- 15 files changed, 685 insertions(+), 23 deletions(-) create mode 100644 auth/web_authn.go create mode 100644 db/migrations/000008_create_web_authn_creds_table.down.sql create mode 100644 db/migrations/000008_create_web_authn_creds_table.up.sql create mode 100644 db/migrations/000008_create_web_authn_session_table.up.sql create mode 100644 db/migrations/000009_create_web_authn_session_table.down.sql delete mode 100644 store/postgres/auth.go create mode 100644 store/postgres/queries/web_authn.go create mode 100644 store/postgres/web_authn.go diff --git a/auth/auth.go b/auth/auth.go index 349beab4..596871f3 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,8 +1,11 @@ package auth import ( + "log" "time" + "github.com/duo-labs/webauthn/webauthn" + "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/services/email" "github.com/containerish/OpenRegistry/store/postgres" @@ -33,6 +36,10 @@ type Authentication interface { ResetForgottenPassword(ctx echo.Context) error ForgotPassword(ctx echo.Context) error Invites(ctx echo.Context) error + BeginRegistration(ctx echo.Context) error + FinishRegistration(ctx echo.Context) error + BeginLogin(ctx echo.Context) error + FinishLogin(ctx echo.Context) error } // New is the constructor function returns an Authentication implementation @@ -50,7 +57,16 @@ func New( } ghClient := gh.NewClient(nil) - emailClient := email.New(&c.Email, c.WebAppEndpoint) + emailClient := email.New(c.Email, c.WebAppEndpoint) + webAuthN, err := webauthn.New(&webauthn.Config{ + RPDisplayName: c.WebAuthnConfig.RPDisplayName, + RPID: c.WebAuthnConfig.RPID, + RPOrigin: c.WebAuthnConfig.RPOrigin, + RPIcon: c.WebAuthnConfig.RPIcon, + }) + if err != nil { + log.Fatalf("webauthn config is missing") + } a := &auth{ c: c, @@ -59,6 +75,7 @@ func New( github: githubOAuth, ghClient: ghClient, oauthStateStore: make(map[string]time.Time), + webAuthN: webAuthN, emailClient: emailClient, } @@ -75,6 +92,7 @@ type ( ghClient *gh.Client oauthStateStore map[string]time.Time c *config.OpenRegistryConfig + webAuthN *webauthn.WebAuthn emailClient email.MailService } ) diff --git a/auth/web_authn.go b/auth/web_authn.go new file mode 100644 index 00000000..ba6a3895 --- /dev/null +++ b/auth/web_authn.go @@ -0,0 +1,303 @@ +package auth + +import ( + "encoding/json" + "errors" + "github.com/duo-labs/webauthn/protocol" + "net/http" + "time" + + "github.com/containerish/OpenRegistry/types" + "github.com/jackc/pgx/v4" + "github.com/labstack/echo/v4" +) + +func (a *auth) BeginRegistration(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + var user types.User + + if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid JSON object", + }) + a.logger.Log(ctx, err) + return echoErr + } + + _ = ctx.Request().Body.Close() + + err := user.Validate() + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid data provided for user login", + "code": "INVALID_CREDENTIALS", + }) + a.logger.Log(ctx, err) + return echoErr + } + + key := user.Email + if user.Username != "" { + key = user.Username + } + + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true) + if err != nil { + if errors.Unwrap(err) == pgx.ErrNoRows { + //user does not exist, create new user + if err := a.pgStore.AddUser(ctx.Request().Context(), &user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add user", + }) + a.logger.Log(ctx, err) + return echoErr + } + // user successfully created + options, sessionData, err := a.webAuthN.BeginRegistration(&user, nil) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error begin registration", + }) + a.logger.Log(ctx, err) + return echoErr + } + // store session data in DB + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add web authn session data for new user", + }) + a.logger.Log(ctx, err) + return echoErr + } + //return response + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + "options": &options, + }) + a.logger.Log(ctx, echoErr) + return echoErr + + } + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to get user", + }) + a.logger.Log(ctx, err) + return echoErr + } + + options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb, nil) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error begin registration", + }) + a.logger.Log(ctx, err) + return echoErr + } + + // store session data in DB + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add web authn session data for existing user", + }) + a.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "options": &options, + }) + a.logger.Log(ctx, echoErr) + return echoErr +} + +func (a *auth) FinishRegistration(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + var user types.User + + if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid JSON object", + }) + a.logger.Log(ctx, err) + return echoErr + } + + defer ctx.Request().Body.Close() + + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, user not found", + }) + a.logger.Log(ctx, err) + return echoErr + } + + sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, session data not found", + }) + a.logger.Log(ctx, err) + return echoErr + } + + parsedResponse, err := protocol.ParseCredentialCreationResponseBody(ctx.Request().Body) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error parsing credential creation response body", + }) + a.logger.Log(ctx, err) + return echoErr + } + credentials, err := a.webAuthN.CreateCredential(userFromDB, *sessionData, parsedResponse) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error creating webauthn credentials", + }) + a.logger.Log(ctx, err) + return echoErr + } + + if err := a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), credentials); err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "database error storing webauthn credentials", + }) + a.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + }) + a.logger.Log(ctx, echoErr) + return echoErr +} + +func (a *auth) BeginLogin(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + + var user types.User + if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid JSON object", + }) + a.logger.Log(ctx, err) + return echoErr + } + + _ = ctx.Request().Body.Close() + + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "database error: user not found", + }) + a.logger.Log(ctx, err) + return echoErr + } + + options, sessionData, err := a.webAuthN.BeginLogin(userFromDB) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error begin login", + }) + a.logger.Log(ctx, err) + return echoErr + } + + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error: storing session data while web authn begin login", + }) + a.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "options": &options, + }) + a.logger.Log(ctx, echoErr) + return echoErr + +} +func (a *auth) FinishLogin(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + var user types.User + + if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid JSON object", + }) + a.logger.Log(ctx, err) + return echoErr + } + + defer ctx.Request().Body.Close() + + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error: user not found", + }) + a.logger.Log(ctx, err) + return echoErr + } + + sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDb.Id) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error: session data for user not found in finish login", + }) + a.logger.Log(ctx, err) + return echoErr + } + + parsedResponse, err := protocol.ParseCredentialRequestResponseBody(ctx.Request().Body) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "parsing error: could not parse credential request body in finish login", + }) + a.logger.Log(ctx, err) + return echoErr + } + + //Validate login gives back credential + _, err = a.webAuthN.ValidateLogin(userFromDb, *sessionData, parsedResponse) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "could not validate user login", + }) + a.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "Login Success", + }) + a.logger.Log(ctx, echoErr) + return echoErr +} diff --git a/config/config.go b/config/config.go index fe0bd615..6afe30ed 100644 --- a/config/config.go +++ b/config/config.go @@ -103,6 +103,13 @@ type ( WelcomeEmailTemplateId string `yaml:"welcome_template_id" mapstructure:"welcome_template_id" validate:"required"` Enabled bool `yaml:"enabled" mapstructure:"enabled"` } + + WebAuthnConfig struct { + RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` // Display Name for your site + RPID string `yaml:"rp_id" mapstructure:"rp_id"` // Generally the FQDN for your site + RPOrigin string `yaml:"rp_origin" mapstructure:"rp_origin"` // The origin URL for WebAuthn requests + RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` // Optional icon URL for your site + } ) func (r *Registry) Address() string { diff --git a/db/migrations/000008_create_web_authn_creds_table.down.sql b/db/migrations/000008_create_web_authn_creds_table.down.sql new file mode 100644 index 00000000..27c38cc1 --- /dev/null +++ b/db/migrations/000008_create_web_authn_creds_table.down.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS web_authn_creds; diff --git a/db/migrations/000008_create_web_authn_creds_table.up.sql b/db/migrations/000008_create_web_authn_creds_table.up.sql new file mode 100644 index 00000000..d108d18c --- /dev/null +++ b/db/migrations/000008_create_web_authn_creds_table.up.sql @@ -0,0 +1,8 @@ +CREATE TABLE "web_authn_creds" ( + "id" text, + "public_key" text, + "attestation_type" text, + "aaguid" bytea, + "sign_count" integer, + "clone_warning" bool +) diff --git a/db/migrations/000008_create_web_authn_session_table.up.sql b/db/migrations/000008_create_web_authn_session_table.up.sql new file mode 100644 index 00000000..b56f259e --- /dev/null +++ b/db/migrations/000008_create_web_authn_session_table.up.sql @@ -0,0 +1,7 @@ +CREATE TABLE "web_authn_session" ( + "challenge" text, + "user_id" bytea, + "allowed_credential_id" bytea, + "user_verification" text, + "extensions" text +) diff --git a/db/migrations/000009_create_web_authn_session_table.down.sql b/db/migrations/000009_create_web_authn_session_table.down.sql new file mode 100644 index 00000000..060db7ff --- /dev/null +++ b/db/migrations/000009_create_web_authn_session_table.down.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS web_authn_session; diff --git a/go.mod b/go.mod index a4ccd6a0..09e9bf6e 100644 --- a/go.mod +++ b/go.mod @@ -48,9 +48,17 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect + github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-querystring v1.1.0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.0 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -81,6 +89,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/x448/float16 v0.8.4 // indirect + github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.6.0 // indirect diff --git a/go.sum b/go.sum index 6d400d7e..c1fc20c0 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,10 @@ +bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= +bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -17,6 +21,10 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -29,6 +37,7 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/spanner v1.17.0/go.mod h1:+17t2ixFwRG4lWRwE+5kipDR9Ef07Jkmc8z0IbMDKUs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -36,8 +45,22 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= +github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= +github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= @@ -77,6 +100,13 @@ github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= +github.com/bradleyfalzon/ghinstallation/v2 v2.0.3/go.mod h1:tlgi+JWCXnKFx/Y4WtnDbZEINo31N5bcvnCoqieefmk= +github.com/casbin/casbin/v2 v2.51.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -84,6 +114,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= +github.com/cloudflare/cfssl v1.6.1 h1:aIOUjpeuDJOpWjVJFP2ByplF53OgqG8I1S40Ggdlk3g= +github.com/cloudflare/cfssl v1.6.1/go.mod h1:ENhCj4Z17+bY2XikpxVmTHDg/C2IsG2Q0ZBeXpAqhCk= +github.com/cloudflare/redoctober v0.0.0-20201013214028-99c99a8e7544/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -92,8 +126,15 @@ github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMe github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d h1:FJN3IBHTidtf0RgzkUpqESXY9Q7IomATzYgKlwMpYw0= github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d/go.mod h1:XOk0zwGlXeGjHQgmhXTEk7qTD6FVv3dXPW38Wh3XsIc= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -103,12 +144,26 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d h1:QyzYnTnPE15SQyUeqU6qLbWxMkwyAyu+vGksa0b7j00= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= +github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66+5Xo0= +github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= +github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= +github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= +github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= 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= @@ -127,10 +182,16 @@ github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPh github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= +github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -138,6 +199,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -157,6 +220,12 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod h1:6CKh9dscIRoqc2kC6YUFICHZMT9NrClyPrRVFrdw1QQ= +github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 h1:806qveZBQtRNHroYHyg6yrsjqBJh9kIB4nfmB8uJnak= +github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92/go.mod h1:kXWPsHVPSKVuxPPG69BRtumCbAW537FydV/GH89oBhM= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -171,10 +240,16 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec= github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= +github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= +github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -189,14 +264,31 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= +github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= +github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -280,7 +372,9 @@ github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4= github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -376,16 +470,33 @@ github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= -github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= +github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= +github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b h1:wA3QeTsaAXybLL2kb2cKhCAQTHgYTMwuI8lBlJSv5V8= +github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b/go.mod h1:xT1Y5p2JR2PfSZihE0s4mjdJaRGp1waCTf5JzhQLBck= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= +github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= +github.com/zmap/zcrypto v0.0.0-20210123152837-9cf5beac6d91/go.mod h1:R/deQh6+tSWlgI9tb4jNmXxn8nSCabl5ZQsBX9//I/E= +github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk= +github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 h1:gZfMjx7Jr6N8b7iJO4eUjDsn6xJqoyXg8D+ogdoAfKY= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0 h1:2aQv6F436YnN7I4VbI8PPYrBhu+SmrTaADcf8Mi/6PU= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= +go.etcd.io/etcd/client/v2 v2.305.0 h1:ftQ0nOOHMcbMS3KIaDQ0g5Qcd6bhaBrQT6b89DfwLTs= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -396,19 +507,28 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -429,6 +549,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -461,11 +583,17 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -473,6 +601,7 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -482,6 +611,8 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -490,7 +621,9 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -504,6 +637,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -514,6 +648,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -522,6 +657,7 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -538,6 +674,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -545,11 +682,20 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -583,11 +729,14 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -595,14 +744,17 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -620,14 +772,19 @@ golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -642,9 +799,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -660,15 +820,22 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/api v0.45.0/go.mod h1:ISLIJCedJolbZvDfAk+Ctuq5hf+aJ33WgtUsfyFoLXA= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -689,6 +856,7 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= @@ -704,6 +872,15 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -717,9 +894,18 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= 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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -730,6 +916,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= @@ -757,6 +944,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/router/helpers.go b/router/helpers.go index 1505ce57..48c2a0fb 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -25,4 +25,8 @@ func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { authRouter.Add(http.MethodPost, "/reset-password", authSvc.ResetPassword, authSvc.JWT()) authRouter.Add(http.MethodPost, "/reset-forgotten-password", authSvc.ResetForgottenPassword, authSvc.JWT()) authRouter.Add(http.MethodGet, "/forgot-password", authSvc.ForgotPassword) + + webAuthnRouter := authRouter.Group("/webauthn") + webAuthnRouter.Add(http.MethodPost, "/begin-registration", authSvc.BeginRegistration) + webAuthnRouter.Add(http.MethodPost, "/finish-registration", authSvc.FinishRegistration) } diff --git a/store/postgres/auth.go b/store/postgres/auth.go deleted file mode 100644 index bf560bea..00000000 --- a/store/postgres/auth.go +++ /dev/null @@ -1 +0,0 @@ -package postgres diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 42fa7da6..bdc6ddd3 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -2,6 +2,7 @@ package postgres import ( "context" + "github.com/duo-labs/webauthn/webauthn" "time" "github.com/containerish/OpenRegistry/config" @@ -15,6 +16,7 @@ type PersistentStore interface { UserStore RegistryStore SessionStore + WebAuthN Close() } @@ -71,6 +73,13 @@ type SessionStore interface { DeleteAllSessions(ctx context.Context, userId string) error } +type WebAuthN interface { + GetWebAuthNCredentials(ctx context.Context, id string) (*webauthn.Credential, error) + AddWebAuthNCredentials(ctx context.Context, credential *webauthn.Credential) error + GetWebAuthNSessionData(ctx context.Context, userId string) (*webauthn.SessionData, error) + AddWebAuthSessionData(ctx context.Context, sessionData *webauthn.SessionData) error +} + type pg struct { conn *pgxpool.Pool } diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go new file mode 100644 index 00000000..7188a330 --- /dev/null +++ b/store/postgres/queries/web_authn.go @@ -0,0 +1,11 @@ +package queries + +var ( + AddWebAuthNSessionData = `insert into web_authn_session (challenge,user_id,allowed_credential_id, + user_verification,extensions) values ($1,$2,$3,$4,$5);` + GetWebAuthNSessionData = `select * from web_authn_session where user_id=$1;` + + AddWebAuthNCredentials = `insert into web_authn_creds (id,public_key,attestation_type,aaguid, + sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6);` + GetWebAuthNCredentials = `select * from web_authn_creds where id=$1;` +) diff --git a/store/postgres/web_authn.go b/store/postgres/web_authn.go new file mode 100644 index 00000000..1a1bb495 --- /dev/null +++ b/store/postgres/web_authn.go @@ -0,0 +1,87 @@ +package postgres + +import ( + "context" + "fmt" + "github.com/containerish/OpenRegistry/store/postgres/queries" + "github.com/duo-labs/webauthn/webauthn" + "time" +) + +func (p *pg) AddWebAuthSessionData(ctx context.Context, sessionData *webauthn.SessionData) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + _, err := p.conn.Exec(childCtx, + queries.AddWebAuthNSessionData, + sessionData.Challenge, + sessionData.UserID, + sessionData.AllowedCredentialIDs, + sessionData.UserVerification, + sessionData.Extensions, + ) + if err != nil { + return fmt.Errorf("ERR_ADD_WEB_AUTHN_SESSION_DATA :%w", err) + } + return nil +} + +func (p *pg) GetWebAuthNSessionData(ctx context.Context, userId string) (*webauthn.SessionData, error) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + + var sessionData webauthn.SessionData + + row := p.conn.QueryRow(childCtx, queries.GetWebAuthNSessionData, userId) + if err := row.Scan( + &sessionData.Challenge, + &sessionData.UserID, + &sessionData.AllowedCredentialIDs, + &sessionData.UserVerification, + &sessionData.Extensions, + ); err != nil { + return nil, fmt.Errorf("ERR_GET_WEB_AUTHN_SESSION_DATA: %w", err) + } + + return &sessionData, nil +} + +func (p *pg) AddWebAuthNCredentials(ctx context.Context, credential *webauthn.Credential) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + + _, err := p.conn.Exec( + childCtx, + queries.AddWebAuthNCredentials, + credential.ID, + credential.PublicKey, + credential.AttestationType, + credential.Authenticator.AAGUID, + credential.Authenticator.SignCount, + credential.Authenticator.CloneWarning, + ) + if err != nil { + return fmt.Errorf("ERR_STORE_WEB_AUTHN_SESSION_DATA: %w", err) + } + return nil +} + +func (p *pg) GetWebAuthNCredentials(ctx context.Context, id string) (*webauthn.Credential, error) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + + var creds webauthn.Credential + + row := p.conn.QueryRow(childCtx, queries.GetWebAuthNCredentials) + err := row.Scan( + &creds.ID, + &creds.PublicKey, + &creds.AttestationType, + &creds.Authenticator.AAGUID, + &creds.Authenticator.SignCount, + &creds.Authenticator.CloneWarning, + ) + if err != nil { + return nil, fmt.Errorf("ERR_GET_WEB_AUTHN_SESSION_DATA: %w", err) + } + return &creds, nil +} diff --git a/types/users.go b/types/users.go index f7ed10c0..f1495863 100644 --- a/types/users.go +++ b/types/users.go @@ -7,6 +7,7 @@ import ( "time" "unicode" + "github.com/duo-labs/webauthn/webauthn" "github.com/go-playground/validator/v10" ) @@ -35,6 +36,7 @@ type ( OAuthID int `json:"id,omitempty"` IsActive bool `json:"is_active,omitempty" validate:"-"` Hireable bool `json:"hireable,omitempty"` + credentials []webauthn.Credential } OAuthUser struct { @@ -146,21 +148,27 @@ func (u *User) Bytes() ([]byte, error) { return json.Marshal(u) } -func (u *User) StripForToken() *User { - u.CreatedAt = time.Time{} - u.UpdatedAt = time.Time{} - u.Password = "" - u.URL = "" - u.Company = "" - u.ReceivedEventsURL = "" - u.Bio = "" - u.GravatarID = "" - u.TwitterUsername = "" - u.HTMLURL = "" - u.Location = "" - u.OrganizationsURL = "" - u.AvatarURL = "" - u.Hireable = false - - return u +// WebAuthnID - User ID according to the Relying Party +func (u *User) WebAuthnID() []byte { + return []byte(u.Id) +} + +// WebAuthnName - User Name according to the Relying Party +func (u *User) WebAuthnName() string { + return u.Username +} + +// WebAuthnDisplayName - Display Name of the user +func (u *User) WebAuthnDisplayName() string { + return u.Username +} + +// WebAuthnIcon - User's icon url +func (u *User) WebAuthnIcon() string { + return u.AvatarURL +} + +// WebAuthnCredentials - Credentials owned by the user +func (u *User) WebAuthnCredentials() []webauthn.Credential { + return u.credentials } From 027fc5389c664e55757fe63c6c21b2946ceb5f80 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Tue, 24 May 2022 14:19:30 +0530 Subject: [PATCH 02/19] Fix: WebAuthN Schema Signed-off-by: jay-dee7 --- auth/signup.go | 4 +- auth/web_authn.go | 130 ++-- ...000008_create_web_authn_creds_table.up.sql | 5 +- ...0008_create_web_authn_session_table.up.sql | 7 - ...0009_create_web_authn_session_table.up.sql | 9 + go.mod | 53 +- go.sum | 692 +++++++++++++++++- router/helpers.go | 2 + store/postgres/postgres.go | 11 +- store/postgres/queries/web_authn.go | 16 +- store/postgres/web_authn.go | 47 +- types/users.go | 14 +- types/web_authn.go | 10 + 13 files changed, 875 insertions(+), 125 deletions(-) delete mode 100644 db/migrations/000008_create_web_authn_session_table.up.sql create mode 100644 db/migrations/000009_create_web_authn_session_table.up.sql create mode 100644 types/web_authn.go diff --git a/auth/signup.go b/auth/signup.go index 15f3632c..5742fc45 100644 --- a/auth/signup.go +++ b/auth/signup.go @@ -142,8 +142,8 @@ func (a *auth) SignUp(ctx echo.Context) error { return echoErr } - echoErr := ctx.JSON(http.StatusCreated, echo.Map{ - "message": "sign up was successful, please check your email to activate your account", + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "signup was successful, please check your email to activate your account", }) a.logger.Log(ctx, echoErr) return echoErr diff --git a/auth/web_authn.go b/auth/web_authn.go index ba6a3895..acc3136a 100644 --- a/auth/web_authn.go +++ b/auth/web_authn.go @@ -3,10 +3,14 @@ package auth import ( "encoding/json" "errors" - "github.com/duo-labs/webauthn/protocol" + "fmt" "net/http" "time" + "github.com/duo-labs/webauthn/protocol" + "github.com/fatih/color" + "github.com/google/uuid" + "github.com/containerish/OpenRegistry/types" "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" @@ -24,7 +28,6 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { a.logger.Log(ctx, err) return echoErr } - _ = ctx.Request().Body.Close() err := user.Validate() @@ -47,7 +50,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { if err != nil { if errors.Unwrap(err) == pgx.ErrNoRows { //user does not exist, create new user - if err := a.pgStore.AddUser(ctx.Request().Context(), &user); err != nil { + if err = a.pgStore.AddUser(ctx.Request().Context(), &user); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "database error, failed to add user", @@ -56,8 +59,8 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { return echoErr } // user successfully created - options, sessionData, err := a.webAuthN.BeginRegistration(&user, nil) - if err != nil { + options, sessionData, wErr := a.webAuthN.BeginRegistration(&user) + if wErr != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error begin registration", @@ -66,7 +69,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { return echoErr } // store session data in DB - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), user.Id, sessionData, "registration"); err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "database error, failed to add web authn session data for new user", @@ -91,7 +94,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { return echoErr } - options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb, nil) + options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -102,7 +105,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { } // store session data in DB - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDb.Id, sessionData, "registration"); err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "database error, failed to add web authn session data for existing user", @@ -120,20 +123,9 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { func (a *auth) FinishRegistration(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) - var user types.User - - if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "invalid JSON object", - }) - a.logger.Log(ctx, err) - return echoErr - } - defer ctx.Request().Body.Close() - - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + username := ctx.QueryParam("username") + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -143,7 +135,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } - sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id) + sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id, "registration") if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -162,6 +154,11 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { a.logger.Log(ctx, err) return echoErr } + defer ctx.Request().Body.Close() + color.Red("sessionData: %+v", sessionData) + color.Yellow("userFromDB: %+v", userFromDB) + color.Green("parsedResponse: %+v", parsedResponse) + credentials, err := a.webAuthN.CreateCredential(userFromDB, *sessionData, parsedResponse) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -172,7 +169,8 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } - if err := a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), credentials); err != nil { + userFromDB.AddWebAuthNCredential(credentials) + if err := a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id, credentials); err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "database error storing webauthn credentials", @@ -191,28 +189,28 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { func (a *auth) BeginLogin(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) - var user types.User - if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + username := ctx.QueryParam("username") + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), - "message": "invalid JSON object", + "message": "database error: user not found", }) a.logger.Log(ctx, err) return echoErr } - _ = ctx.Request().Body.Close() - - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id) if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "database error: user not found", + "message": "error getting credentials for user", }) a.logger.Log(ctx, err) return echoErr } + userFromDB.AddWebAuthNCredential(creds) options, sessionData, err := a.webAuthN.BeginLogin(userFromDB) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -223,7 +221,7 @@ func (a *auth) BeginLogin(ctx echo.Context) error { return echoErr } - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), sessionData); err != nil { + if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDB.Id, sessionData, "authentication"); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "database error: storing session data while web authn begin login", @@ -241,49 +239,52 @@ func (a *auth) BeginLogin(ctx echo.Context) error { } func (a *auth) FinishLogin(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) - var user types.User - if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + username := ctx.QueryParam("username") + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) + if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "invalid JSON object", + "message": "database error: user not found", }) a.logger.Log(ctx, err) return echoErr } - defer ctx.Request().Body.Close() - - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), user.Username, false) + sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDb.Id, "authentication") if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "database error: user not found", + "message": "database error: session data for user not found in finish login", }) a.logger.Log(ctx, err) return echoErr } - sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDb.Id) + parsedResponse, err := protocol.ParseCredentialRequestResponseBody(ctx.Request().Body) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "database error: session data for user not found in finish login", + "message": "parsing error: could not parse credential request body in finish login", }) a.logger.Log(ctx, err) return echoErr } - - parsedResponse, err := protocol.ParseCredentialRequestResponseBody(ctx.Request().Body) + defer ctx.Request().Body.Close() + color.Red("parsed Response: %+v", parsedResponse) + color.Red("session data: %+v", *sessionData) + creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDb.Id) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "parsing error: could not parse credential request body in finish login", + "message": "error getting credentials for user", }) a.logger.Log(ctx, err) return echoErr } + userFromDb.AddWebAuthNCredential(creds) + //Validate login gives back credential _, err = a.webAuthN.ValidateLogin(userFromDb, *sessionData, parsedResponse) if err != nil { @@ -295,9 +296,48 @@ func (a *auth) FinishLogin(ctx echo.Context) error { return echoErr } + access, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "access") + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error creating web login token", + }) + a.logger.Log(ctx, err) + return echoErr + } + + refresh, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "refresh") + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error creating refresh token", + }) + a.logger.Log(ctx, err) + return echoErr + } + id := uuid.NewString() + sessionId := fmt.Sprintf("%s:%s", id, userFromDb.Id) + + if err = a.pgStore.AddSession(ctx.Request().Context(), id, refresh, userFromDb.Username); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error creating session", + }) + a.logger.Log(ctx, err) + return echoErr + } + + sessionCookie := a.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) + accessCookie := a.createCookie("access", access, true, time.Now().Add(time.Hour*750)) + refreshCookie := a.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) + ctx.SetCookie(accessCookie) + ctx.SetCookie(refreshCookie) + ctx.SetCookie(sessionCookie) + echoErr := ctx.JSON(http.StatusOK, echo.Map{ "message": "Login Success", }) + a.logger.Log(ctx, echoErr) return echoErr } diff --git a/db/migrations/000008_create_web_authn_creds_table.up.sql b/db/migrations/000008_create_web_authn_creds_table.up.sql index d108d18c..f149025b 100644 --- a/db/migrations/000008_create_web_authn_creds_table.up.sql +++ b/db/migrations/000008_create_web_authn_creds_table.up.sql @@ -1,6 +1,7 @@ CREATE TABLE "web_authn_creds" ( - "id" text, - "public_key" text, + "credential_owner_id" uuid, + "id" bytea, + "public_key" bytea, "attestation_type" text, "aaguid" bytea, "sign_count" integer, diff --git a/db/migrations/000008_create_web_authn_session_table.up.sql b/db/migrations/000008_create_web_authn_session_table.up.sql deleted file mode 100644 index b56f259e..00000000 --- a/db/migrations/000008_create_web_authn_session_table.up.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE "web_authn_session" ( - "challenge" text, - "user_id" bytea, - "allowed_credential_id" bytea, - "user_verification" text, - "extensions" text -) diff --git a/db/migrations/000009_create_web_authn_session_table.up.sql b/db/migrations/000009_create_web_authn_session_table.up.sql new file mode 100644 index 00000000..7f70c1c5 --- /dev/null +++ b/db/migrations/000009_create_web_authn_session_table.up.sql @@ -0,0 +1,9 @@ +CREATE TABLE "web_authn_session" ( + "challenge" text, + "user_id" bytea, + "credential_owner_id" uuid, + "allowed_credential_id" bytea[], + "user_verification" text, + "extensions" jsonb, + "session_type" text +) diff --git a/go.mod b/go.mod index 09e9bf6e..cb6edd37 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.19 github.com/aws/aws-sdk-go-v2/credentials v1.13.18 github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 + github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec github.com/fatih/color v1.15.0 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 @@ -30,6 +31,8 @@ require ( ) require ( + cloud.google.com/go/compute v1.15.1 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect @@ -45,12 +48,29 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cloudflare/cfssl v1.6.1 // indirect + github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect + github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/envoyproxy/go-control-plane v0.10.3 // indirect + github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/fullstorydev/grpcurl v1.8.1 // indirect + github.com/fxamacker/cbor/v2 v2.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v4 v4.1.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/mock v1.5.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect - github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -67,39 +87,70 @@ require ( github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect github.com/jackc/puddle v1.3.0 // indirect + github.com/jhump/protoreflect v1.8.2 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/labstack/gommon v0.4.0 // indirect github.com/leodido/go-urn v1.2.2 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-runewidth v0.0.12 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.40.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sendgrid/rest v2.6.9+incompatible // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/cobra v1.1.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect + github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect + github.com/urfave/cli v1.22.5 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 // indirect + go.etcd.io/bbolt v1.3.5 // indirect + go.etcd.io/etcd/api/v3 v3.5.6 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect + go.etcd.io/etcd/client/v2 v2.305.6 // indirect + go.etcd.io/etcd/client/v3 v3.5.6 // indirect + go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect + go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/multierr v1.8.0 // indirect + go.uber.org/zap v1.21.0 // indirect + golang.org/x/mod v0.8.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/text v0.8.0 // indirect golang.org/x/time v0.3.0 // indirect + golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect + google.golang.org/grpc v1.53.0 // indirect google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) replace github.com/SkynetLabs/go-skynet/v2 => github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d diff --git a/go.sum b/go.sum index c1fc20c0..9bf06666 100644 --- a/go.sum +++ b/go.sum @@ -23,7 +23,6 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -31,8 +30,13 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= +cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -44,6 +48,13 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= +contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= +contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= +contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= +contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= +contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= @@ -54,7 +65,9 @@ github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxw github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= +github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4= +github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -62,6 +75,46 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= +github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu/ACaQhYjeefzQ0y1o= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= +github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= +github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= +github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= @@ -98,21 +151,38 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 h1:bWNgNdRko2x6gqa0blfATqAZKZok github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= -github.com/bradleyfalzon/ghinstallation/v2 v2.0.3/go.mod h1:tlgi+JWCXnKFx/Y4WtnDbZEINo31N5bcvnCoqieefmk= -github.com/casbin/casbin/v2 v2.51.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= +github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= +github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= +github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s= +github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= github.com/cloudflare/cfssl v1.6.1 h1:aIOUjpeuDJOpWjVJFP2ByplF53OgqG8I1S40Ggdlk3g= @@ -121,53 +191,125 @@ github.com/cloudflare/redoctober v0.0.0-20201013214028-99c99a8e7544/go.mod h1:6S github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210322005330-6414d713912e/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +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 h1:ACGZRIr7HsgBKHsueQ1yM4WaVaXh21ynwqsF8M8tXhA= +github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= 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/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E= +github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= +github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs= +github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d h1:FJN3IBHTidtf0RgzkUpqESXY9Q7IomATzYgKlwMpYw0= github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d/go.mod h1:XOk0zwGlXeGjHQgmhXTEk7qTD6FVv3dXPW38Wh3XsIc= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= +github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= +github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec h1:darQ1FPPrwlzwmuN3fRMVCrsaCpuDqkKHADYzcMa73M= +github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec/go.mod h1:V3q8IgNpNqFio+56G0vy/QZIi7iho65UFrDwdF5OtZA= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d h1:QyzYnTnPE15SQyUeqU6qLbWxMkwyAyu+vGksa0b7j00= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -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 h1:xdCVXxEe0Y3FQith+0cj2irwZudqGYvecuLB1HtdexY= +github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= +github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= +github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= +github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= +github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66+5Xo0= github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= +github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= 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-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +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= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -176,17 +318,33 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI= github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA= +github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -216,8 +374,10 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -234,10 +394,14 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec= github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= @@ -262,7 +426,16 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod h1:1dPv0CUjNQVFEDuAUFhZql16pw/VlPgaX8qj+g5pVzQ= +github.com/google/trillian v1.3.14-0.20210428093031-b4ddea2e86b1/go.mod h1:FdIJX+NoDk/dIN2ZxTyz5nAJWgf+NSSSriPAMThChTY= +github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -277,11 +450,32 @@ github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1: github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -291,12 +485,36 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= +github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -346,22 +564,60 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= +github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= +github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= +github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= +github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkGnWpac= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo-contrib v0.14.1 h1:oNUSCeXQOlCGt3eWafzu0mkXjIh3SINnYgE/UR2kYXQ= github.com/labstack/echo-contrib v0.14.1/go.mod h1:6jgpHPjGRk0qrysPCfv3SCau6kewjQtYzOk1fLZGMeQ= github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= @@ -370,6 +626,7 @@ github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4= github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ= +github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -377,110 +634,329 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-star v0.5.1/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU= +github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= +github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= +github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= +github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= +github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= +github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.24.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= +github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2uQ5b24BIhcr0GCcpd/RNAFWaN2CJFrWIIQ= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0= github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= github.com/sendgrid/sendgrid-go v3.12.0+incompatible h1:/N2vx18Fg1KmQOh6zESc5FJB8pYwt5QFBDflYPh1KVg= github.com/sendgrid/sendgrid-go v3.12.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= 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.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= +github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= +github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= +github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= +github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= -github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b h1:wA3QeTsaAXybLL2kb2cKhCAQTHgYTMwuI8lBlJSv5V8= -github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b/go.mod h1:xT1Y5p2JR2PfSZihE0s4mjdJaRGp1waCTf5JzhQLBck= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= @@ -491,47 +967,92 @@ github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlN github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 h1:gZfMjx7Jr6N8b7iJO4eUjDsn6xJqoyXg8D+ogdoAfKY= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0 h1:2aQv6F436YnN7I4VbI8PPYrBhu+SmrTaADcf8Mi/6PU= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= +go.etcd.io/etcd/api/v3 v3.5.6 h1:Cy2qx3npLcYqTKqGJzMypnMv2tiRyifZJ17BlWIWA7A= +go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= +go.etcd.io/etcd/client/pkg/v3 v3.5.6 h1:TXQWYceBKqLp4sa87rcPs11SXxUA/mHwH975v+BDvLU= +go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= -go.etcd.io/etcd/client/v2 v2.305.0 h1:ftQ0nOOHMcbMS3KIaDQ0g5Qcd6bhaBrQT6b89DfwLTs= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.6 h1:fIDR0p4KMjw01MJMfUIDWdQbjo06PD6CeYM5z4EHLi0= +go.etcd.io/etcd/client/v2 v2.305.6/go.mod h1:BHha8XJGe8vCIBfWBpbBLVZ4QjOIlfoouvOwydu63E0= +go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= +go.etcd.io/etcd/client/v3 v3.5.6 h1:coLs69PWCXE9G4FKquzNaSHrRyMCAXwF+IX1tAPVO8E= +go.etcd.io/etcd/client/v3 v3.5.6/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= +go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 h1:odMFuQQCg0UmPd7Cyw6TViRYv9ybGuXuki4CusDSzqA= +go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0/go.mod h1:YPwSaBciV5G6Gpt435AasAG3ROetZsKNUzibRa/++oo= +go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY= +go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= +go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 h1:DvYJotxV9q1Lkn7pknzAbFO/CLtCVidCr2K9qRLJ8pA= +go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod h1:FAwse6Zlm5v4tEWZaTjmNhe17Int4Oxbu7+2r0DiD3w= +go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 h1:fYv7CmmdyuIu27UmKQjS9K/1GtcCa+XnPKqiKBbQkrk= +go.etcd.io/etcd/server/v3 v3.5.0-alpha.0/go.mod h1:tsKetYpt980ZTpzl/gb+UOJj9RkIyCb1u4wjzMg90BQ= +go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 h1:UcRoCA1FgXoc4CEM8J31fqEvI69uFIObY5ZDEFH7Znc= +go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0/go.mod h1:HnrHxjyCuZ8YDt8PYVyQQ5d1ZQfzJVEtQWllr5Vp/30= +go.etcd.io/etcd/v3 v3.5.0-alpha.0 h1:ZuqKJkD2HrzFUj8IB+GLkTMKZ3+7mWx172vx6F1TukM= +go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= +go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= +golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -550,7 +1071,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -564,6 +1084,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -574,10 +1095,21 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -615,7 +1147,12 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= @@ -631,6 +1168,11 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -644,9 +1186,17 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -661,10 +1211,14 @@ golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -679,6 +1233,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -688,8 +1244,11 @@ golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -697,8 +1256,12 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -718,16 +1281,22 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -752,6 +1321,7 @@ golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -789,15 +1359,21 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= @@ -822,9 +1398,10 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.45.0/go.mod h1:ISLIJCedJolbZvDfAk+Ctuq5hf+aJ33WgtUsfyFoLXA= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -840,6 +1417,9 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -859,6 +1439,7 @@ google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -871,6 +1452,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -879,12 +1461,21 @@ google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba/go.mod h1:9lPAdzaE google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= +google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -902,10 +1493,14 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= +google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -919,24 +1514,47 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= +gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -949,3 +1567,7 @@ pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/router/helpers.go b/router/helpers.go index 48c2a0fb..44de309d 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -29,4 +29,6 @@ func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { webAuthnRouter := authRouter.Group("/webauthn") webAuthnRouter.Add(http.MethodPost, "/begin-registration", authSvc.BeginRegistration) webAuthnRouter.Add(http.MethodPost, "/finish-registration", authSvc.FinishRegistration) + webAuthnRouter.Add(http.MethodGet, "/begin-login", authSvc.BeginLogin) + webAuthnRouter.Add(http.MethodPost, "/finish-login", authSvc.FinishLogin) } diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index bdc6ddd3..336916e8 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -2,9 +2,10 @@ package postgres import ( "context" - "github.com/duo-labs/webauthn/webauthn" "time" + "github.com/duo-labs/webauthn/webauthn" + "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/types" "github.com/fatih/color" @@ -74,10 +75,10 @@ type SessionStore interface { } type WebAuthN interface { - GetWebAuthNCredentials(ctx context.Context, id string) (*webauthn.Credential, error) - AddWebAuthNCredentials(ctx context.Context, credential *webauthn.Credential) error - GetWebAuthNSessionData(ctx context.Context, userId string) (*webauthn.SessionData, error) - AddWebAuthSessionData(ctx context.Context, sessionData *webauthn.SessionData) error + GetWebAuthNSessionData(ctx context.Context, userId string, sessionType string) (*webauthn.SessionData, error) + AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error + GetWebAuthNCredentials(ctx context.Context, userId string) (*webauthn.Credential, error) + AddWebAuthNCredentials(ctx context.Context, userId string, credential *webauthn.Credential) error } type pg struct { diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index 7188a330..fbf35ff7 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -1,11 +1,15 @@ package queries var ( - AddWebAuthNSessionData = `insert into web_authn_session (challenge,user_id,allowed_credential_id, - user_verification,extensions) values ($1,$2,$3,$4,$5);` - GetWebAuthNSessionData = `select * from web_authn_session where user_id=$1;` + // user_id is the web_authn_session user_id + // credential_owner_id is from our user table + AddWebAuthNSessionData = `insert into web_authn_session (credential_owner_id,user_id,challenge,allowed_credential_id, + user_verification,extensions,session_type) values ($1,$2,$3,$4,$5,$6,$7);` + GetWebAuthNSessionData = `select user_id,challenge,allowed_credential_id,user_verification,extensions from + web_authn_session where credential_owner_id=$1 and session_type=$2;` - AddWebAuthNCredentials = `insert into web_authn_creds (id,public_key,attestation_type,aaguid, - sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6);` - GetWebAuthNCredentials = `select * from web_authn_creds where id=$1;` + AddWebAuthNCredentials = `insert into web_authn_creds (credential_owner_id,id,public_key,attestation_type,aaguid, + sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6,$7);` + GetWebAuthNCredentials = `select id,public_key,attestation_type,aaguid,sign_count,clone_warning from web_authn_creds + where credential_owner_id=$1;` ) diff --git a/store/postgres/web_authn.go b/store/postgres/web_authn.go index 1a1bb495..181f87d9 100644 --- a/store/postgres/web_authn.go +++ b/store/postgres/web_authn.go @@ -3,21 +3,30 @@ package postgres import ( "context" "fmt" + "time" + "github.com/containerish/OpenRegistry/store/postgres/queries" "github.com/duo-labs/webauthn/webauthn" - "time" ) -func (p *pg) AddWebAuthSessionData(ctx context.Context, sessionData *webauthn.SessionData) error { - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) +func (p *pg) AddWebAuthSessionData( + ctx context.Context, + credentialOwnerID string, + sessionData *webauthn.SessionData, + sessionType string, +) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() - _, err := p.conn.Exec(childCtx, + _, err := p.conn.Exec( + childCtx, queries.AddWebAuthNSessionData, - sessionData.Challenge, + credentialOwnerID, sessionData.UserID, + sessionData.Challenge, sessionData.AllowedCredentialIDs, sessionData.UserVerification, sessionData.Extensions, + sessionType, ) if err != nil { return fmt.Errorf("ERR_ADD_WEB_AUTHN_SESSION_DATA :%w", err) @@ -25,16 +34,19 @@ func (p *pg) AddWebAuthSessionData(ctx context.Context, sessionData *webauthn.Se return nil } -func (p *pg) GetWebAuthNSessionData(ctx context.Context, userId string) (*webauthn.SessionData, error) { - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) +func (p *pg) GetWebAuthNSessionData( + ctx context.Context, + credentialOwnerID string, + sessionType string, +) (*webauthn.SessionData, error) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() var sessionData webauthn.SessionData - - row := p.conn.QueryRow(childCtx, queries.GetWebAuthNSessionData, userId) + row := p.conn.QueryRow(childCtx, queries.GetWebAuthNSessionData, credentialOwnerID, sessionType) if err := row.Scan( - &sessionData.Challenge, &sessionData.UserID, + &sessionData.Challenge, &sessionData.AllowedCredentialIDs, &sessionData.UserVerification, &sessionData.Extensions, @@ -45,13 +57,14 @@ func (p *pg) GetWebAuthNSessionData(ctx context.Context, userId string) (*webaut return &sessionData, nil } -func (p *pg) AddWebAuthNCredentials(ctx context.Context, credential *webauthn.Credential) error { - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) +func (p *pg) AddWebAuthNCredentials(ctx context.Context, credentialOwnerID string, credential *webauthn.Credential) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() _, err := p.conn.Exec( childCtx, queries.AddWebAuthNCredentials, + credentialOwnerID, credential.ID, credential.PublicKey, credential.AttestationType, @@ -59,19 +72,19 @@ func (p *pg) AddWebAuthNCredentials(ctx context.Context, credential *webauthn.Cr credential.Authenticator.SignCount, credential.Authenticator.CloneWarning, ) + if err != nil { return fmt.Errorf("ERR_STORE_WEB_AUTHN_SESSION_DATA: %w", err) } return nil } -func (p *pg) GetWebAuthNCredentials(ctx context.Context, id string) (*webauthn.Credential, error) { - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) +func (p *pg) GetWebAuthNCredentials(ctx context.Context, credentialOwnerID string) (*webauthn.Credential, error) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() var creds webauthn.Credential - - row := p.conn.QueryRow(childCtx, queries.GetWebAuthNCredentials) + row := p.conn.QueryRow(childCtx, queries.GetWebAuthNCredentials, credentialOwnerID) err := row.Scan( &creds.ID, &creds.PublicKey, @@ -81,7 +94,7 @@ func (p *pg) GetWebAuthNCredentials(ctx context.Context, id string) (*webauthn.C &creds.Authenticator.CloneWarning, ) if err != nil { - return nil, fmt.Errorf("ERR_GET_WEB_AUTHN_SESSION_DATA: %w", err) + return nil, fmt.Errorf("ERR_GET_WEB_AUTHN_CREDENTIAL_DATA: %w", err) } return &creds, nil } diff --git a/types/users.go b/types/users.go index f1495863..09a8178f 100644 --- a/types/users.go +++ b/types/users.go @@ -15,7 +15,7 @@ type ( User struct { CreatedAt time.Time `json:"created_at,omitempty" validate:"-"` UpdatedAt time.Time `json:"updated_at,omitempty" validate:"-"` - Id string `json:"uuid,omitempty" validate:"-"` + TwitterUsername string `json:"twitter_username,omitempty"` Password string `json:"password,omitempty"` Username string `json:"username,omitempty" validate:"-"` Email string `json:"email,omitempty" validate:"email"` @@ -25,7 +25,7 @@ type ( Bio string `json:"bio,omitempty"` Type string `json:"type,omitempty"` GravatarID string `json:"gravatar_id,omitempty"` - TwitterUsername string `json:"twitter_username,omitempty"` + Id string `json:"uuid,omitempty" validate:"-"` HTMLURL string `json:"html_url,omitempty"` Location string `json:"location,omitempty"` Login string `json:"login,omitempty"` @@ -33,10 +33,10 @@ type ( NodeID string `json:"node_id,omitempty"` OrganizationsURL string `json:"organizations_url,omitempty"` AvatarURL string `json:"avatar_url,omitempty"` - OAuthID int `json:"id,omitempty"` - IsActive bool `json:"is_active,omitempty" validate:"-"` - Hireable bool `json:"hireable,omitempty"` credentials []webauthn.Credential + OAuthID int `json:"id,omitempty"` + IsActive bool `json:"is_active,omitempty" validate:"-"` + Hireable bool `json:"hireable,omitempty"` } OAuthUser struct { @@ -172,3 +172,7 @@ func (u *User) WebAuthnIcon() string { func (u *User) WebAuthnCredentials() []webauthn.Credential { return u.credentials } + +func (u *User) AddWebAuthNCredential(creds *webauthn.Credential) { + u.credentials = append(u.credentials, *creds) +} diff --git a/types/web_authn.go b/types/web_authn.go new file mode 100644 index 00000000..1f0f8bd4 --- /dev/null +++ b/types/web_authn.go @@ -0,0 +1,10 @@ +package types + +import "github.com/duo-labs/webauthn/webauthn" + +type ( + WebAuthNSessiondata struct { + webauthn.SessionData + CredentialOwnerId string + } +) From 860f8c8afe4ce9e82caf111db257a1f0144179ab Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 15 Oct 2022 17:56:06 +0530 Subject: [PATCH 03/19] feat: PasswordLess login with WebAuthn --- auth/auth.go | 27 ++- auth/github.go | 11 +- auth/jwt_middleware.go | 2 +- auth/renew.go | 2 +- auth/reset_password.go | 6 +- auth/signin.go | 4 +- auth/signup.go | 4 +- auth/validate_user.go | 2 +- auth/verify_email.go | 2 +- auth/web_authn.go | 196 +++++++++++++----- config/config.go | 17 +- ...0009_create_web_authn_session_table.up.sql | 2 +- go.sum | 2 + router/helpers.go | 9 +- store/postgres/postgres.go | 6 +- store/postgres/queries/web_authn.go | 2 +- store/postgres/users.go | 62 ++++-- types/users.go | 55 ++--- types/web_authn.go | 60 +++++- 19 files changed, 323 insertions(+), 148 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index 596871f3..462439bb 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,10 +1,12 @@ package auth import ( + "context" "log" "time" "github.com/duo-labs/webauthn/webauthn" + "github.com/jackc/pgx" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/services/email" @@ -37,6 +39,7 @@ type Authentication interface { ForgotPassword(ctx echo.Context) error Invites(ctx echo.Context) error BeginRegistration(ctx echo.Context) error + RollbackRegisteration(ctx echo.Context) error FinishRegistration(ctx echo.Context) error BeginLogin(ctx echo.Context) error FinishLogin(ctx echo.Context) error @@ -48,7 +51,6 @@ func New( pgStore postgres.PersistentStore, logger telemetry.Logger, ) Authentication { - githubOAuth := &oauth2.Config{ ClientID: c.OAuth.Github.ClientID, ClientSecret: c.OAuth.Github.ClientSecret, @@ -77,9 +79,11 @@ func New( oauthStateStore: make(map[string]time.Time), webAuthN: webAuthN, emailClient: emailClient, + txnStore: make(map[string]*webAuthNMeta), } - go a.StateTokenCleanup() + go a.stateTokenCleanup() + go a.webAuthNTxnCleanup() return a } @@ -94,11 +98,17 @@ type ( c *config.OpenRegistryConfig webAuthN *webauthn.WebAuthn emailClient email.MailService + txnStore map[string]*webAuthNMeta + } + + webAuthNMeta struct { + expiresAt time.Time + txn pgx.Tx } ) // @TODO (jay-dee7) maybe a better way to do it? -func (a *auth) StateTokenCleanup() { +func (a *auth) stateTokenCleanup() { // tick every 10 minutes, delete ant oauth state tokens which are older than 10 mins // duration = 10mins, because github short lived code is valid for 10 mins for range time.Tick(time.Second * 10) { @@ -109,3 +119,14 @@ func (a *auth) StateTokenCleanup() { } } } + +func (a *auth) webAuthNTxnCleanup() { + for range time.Tick(time.Second * 10) { + for username, meta := range a.txnStore { + if meta.expiresAt.Unix() >= time.Now().Unix() { + _ = meta.txn.Rollback(context.Background()) + delete(a.txnStore, username) + } + } + } +} diff --git a/auth/github.go b/auth/github.go index e3117c24..a15b2892 100644 --- a/auth/github.go +++ b/auth/github.go @@ -107,7 +107,14 @@ func (a *auth) GithubLoginCallbackHandler(ctx echo.Context) error { return echoErr } - oauthUser.Password = refreshToken + if err = oauthUser.Validate(false); err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + }) + a.logger.Log(ctx, err) + return echoErr + } + if err = a.pgStore.AddOAuthUser(ctx.Request().Context(), &oauthUser); err != nil { redirectPath := fmt.Sprintf("%s%s?error=%s", a.c.WebAppEndpoint, a.c.WebAppErrorRedirectPath, err.Error()) echoErr := ctx.Redirect(http.StatusTemporaryRedirect, redirectPath) @@ -192,7 +199,7 @@ func (a *auth) getUserWithGithubOauthToken(ctx context.Context, token string) (* return nil, fmt.Errorf("GHO_UNAUTHORIZED") } - user, err := a.pgStore.GetUser(ctx, oauthUser.Email, false) + user, err := a.pgStore.GetUser(ctx, oauthUser.Email, false, nil) if err != nil { return nil, fmt.Errorf("PG_GET_USER_ERR: %w", err) } diff --git a/auth/jwt_middleware.go b/auth/jwt_middleware.go index 0b46a7a5..5eb94145 100644 --- a/auth/jwt_middleware.go +++ b/auth/jwt_middleware.go @@ -106,7 +106,7 @@ func (a *auth) ACL() echo.MiddlewareFunc { username := ctx.Param("username") - user, err := a.pgStore.GetUserById(ctx.Request().Context(), claims.Id, false) + user, err := a.pgStore.GetUserById(ctx.Request().Context(), claims.Id, false, nil) if err != nil { a.logger.Log(ctx, err) return ctx.NoContent(http.StatusUnauthorized) diff --git a/auth/renew.go b/auth/renew.go index 1ac256e0..1e09a29b 100644 --- a/auth/renew.go +++ b/auth/renew.go @@ -76,7 +76,7 @@ func (a *auth) RenewAccessToken(ctx echo.Context) error { } userId := claims.Id - user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, false) + user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, false, nil) if err != nil { echoErr := ctx.JSON(http.StatusUnauthorized, echo.Map{ "error": err.Error(), diff --git a/auth/reset_password.go b/auth/reset_password.go index 4b672384..b652e03c 100644 --- a/auth/reset_password.go +++ b/auth/reset_password.go @@ -49,7 +49,7 @@ func (a *auth) ResetForgottenPassword(ctx echo.Context) error { _ = ctx.Request().Body.Close() userId := c.Id - user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, true) + user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, true, nil) if err != nil { echoErr := ctx.JSON(http.StatusNotFound, echo.Map{ "error": err.Error(), @@ -143,7 +143,7 @@ func (a *auth) ResetPassword(ctx echo.Context) error { _ = ctx.Request().Body.Close() userId := c.Id - user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, true) + user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, true, nil) if err != nil { echoErr := ctx.JSON(http.StatusNotFound, echo.Map{ "error": err.Error(), @@ -222,7 +222,7 @@ func (a *auth) ForgotPassword(ctx echo.Context) error { return echoErr } - user, err := a.pgStore.GetUser(ctx.Request().Context(), userEmail, false) + user, err := a.pgStore.GetUser(ctx.Request().Context(), userEmail, false, nil) if err != nil { if errors.Unwrap(err) == pgx.ErrNoRows { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ diff --git a/auth/signin.go b/auth/signin.go index 28501078..1f86cb2d 100644 --- a/auth/signin.go +++ b/auth/signin.go @@ -26,7 +26,7 @@ func (a *auth) SignIn(ctx echo.Context) error { return echoErr } - err := user.Validate() + err := user.Validate(true) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -42,7 +42,7 @@ func (a *auth) SignIn(ctx echo.Context) error { key = user.Username } - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true) + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true, nil) if err != nil { if errors.Unwrap(err) == pgx.ErrNoRows { diff --git a/auth/signup.go b/auth/signup.go index 5742fc45..54cbd889 100644 --- a/auth/signup.go +++ b/auth/signup.go @@ -30,7 +30,7 @@ func (a *auth) SignUp(ctx echo.Context) error { } _ = ctx.Request().Body.Close() - if err := u.Validate(); err != nil { + if err := u.Validate(true); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "invalid request for user sign up", @@ -75,7 +75,7 @@ func (a *auth) SignUp(ctx echo.Context) error { newUser.IsActive = true } - err = a.pgStore.AddUser(ctx.Request().Context(), newUser) + err = a.pgStore.AddUser(ctx.Request().Context(), newUser, nil) if err != nil { if strings.Contains(err.Error(), postgres.ErrDuplicateConstraintUsername) { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ diff --git a/auth/validate_user.go b/auth/validate_user.go index 7f9267e4..16401c7e 100644 --- a/auth/validate_user.go +++ b/auth/validate_user.go @@ -13,7 +13,7 @@ func (a *auth) validateUser(username, password string) (map[string]interface{}, return nil, fmt.Errorf("Email/Password cannot be empty") } - userFromDb, err := a.pgStore.GetUser(context.Background(), username, true) + userFromDb, err := a.pgStore.GetUser(context.Background(), username, true, nil) if err != nil { return nil, err } diff --git a/auth/verify_email.go b/auth/verify_email.go index 2c40dd04..9d2a6612 100644 --- a/auth/verify_email.go +++ b/auth/verify_email.go @@ -43,7 +43,7 @@ func (a *auth) VerifyEmail(ctx echo.Context) error { return echoErr } - user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, false) + user, err := a.pgStore.GetUserById(ctx.Request().Context(), userId, false, nil) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), diff --git a/auth/web_authn.go b/auth/web_authn.go index acc3136a..9204ee6a 100644 --- a/auth/web_authn.go +++ b/auth/web_authn.go @@ -1,6 +1,7 @@ package auth import ( + "context" "encoding/json" "errors" "fmt" @@ -8,7 +9,6 @@ import ( "time" "github.com/duo-labs/webauthn/protocol" - "github.com/fatih/color" "github.com/google/uuid" "github.com/containerish/OpenRegistry/types" @@ -30,7 +30,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { } _ = ctx.Request().Body.Close() - err := user.Validate() + err := user.Validate(false) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -46,11 +46,26 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { key = user.Username } - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true) + txn, err := a.pgStore.NewTxn(ctx.Request().Context()) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add user", + }) + a.logger.Log(ctx, err) + return echoErr + } + a.txnStore[user.Username] = &webAuthNMeta{ + txn: txn, + expiresAt: time.Now().Add(time.Second * 60), + } + + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true, nil) if err != nil { if errors.Unwrap(err) == pgx.ErrNoRows { //user does not exist, create new user - if err = a.pgStore.AddUser(ctx.Request().Context(), &user); err != nil { + user.Id = uuid.NewString() + if err = a.pgStore.AddUser(ctx.Request().Context(), &user, txn); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "database error, failed to add user", @@ -58,78 +73,121 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { a.logger.Log(ctx, err) return echoErr } - // user successfully created - options, sessionData, wErr := a.webAuthN.BeginRegistration(&user) - if wErr != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error begin registration", - }) - a.logger.Log(ctx, err) - return echoErr - } - // store session data in DB - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), user.Id, sessionData, "registration"); err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "database error, failed to add web authn session data for new user", - }) - a.logger.Log(ctx, err) - return echoErr - } - //return response - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "registration successful", - "options": &options, + + // set it here so that we can continue to use userFromDb object + userFromDb = &user + // credentialCreation, err := a.doWebAuthnRegisteration(ctx.Request().Context(), &user) + // if err != nil { + // + // } + // echoErr := ctx.JSON(http.StatusOK, echo.Map{ + // "message": "registration successful", + // "options": &options, + // }) + // a.logger.Log(ctx, echoErr) + // return echoErr + + } else { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to get user", }) - a.logger.Log(ctx, echoErr) + a.logger.Log(ctx, err) return echoErr - } - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + } + + // options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb) + // if err != nil { + // echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + // "error": err.Error(), + // "message": "error begin registration", + // }) + // a.logger.Log(ctx, err) + // return echoErr + // } + // + // // store session data in DB + // if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDb.Id, sessionData, "registration"); err != nil { + // echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + // "error": err.Error(), + // "message": "failed to add web authn session data for existing user", + // }) + // a.logger.Log(ctx, err) + // return echoErr + // } + + credentialOpts, err := a.doWebAuthnRegisteration(ctx.Request().Context(), userFromDb) + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), - "message": "database error, failed to get user", + "message": "failed to add web authn session data for existing user", }) a.logger.Log(ctx, err) return echoErr } - options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error begin registration", + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + "options": credentialOpts, + }) + + a.logger.Log(ctx, echoErr) + return echoErr +} + +func (a *auth) RollbackRegisteration(ctx echo.Context) error { + username := ctx.QueryParam("username") + meta, ok := a.txnStore[username] + if !ok { + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "user txn does not exist", }) - a.logger.Log(ctx, err) + + a.logger.Log(ctx, echoErr) return echoErr } - // store session data in DB - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDb.Id, sessionData, "registration"); err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + err := meta.txn.Rollback(ctx.Request().Context()) + if err != nil { + echoErr := ctx.JSON(http.StatusOK, echo.Map{ "error": err.Error(), - "message": "database error, failed to add web authn session data for existing user", + "message": "user txn does not exist", }) - a.logger.Log(ctx, err) + + a.logger.Log(ctx, echoErr) return echoErr } echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "options": &options, + "message": "txn rolled back successfully", }) + a.logger.Log(ctx, echoErr) - return echoErr + return nil } func (a *auth) FinishRegistration(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) username := ctx.QueryParam("username") - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) + meta, ok := a.txnStore[username] + if !ok { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": "missing begin registration step", + "message": "no user found with this username", + }) + + a.logger.Log(ctx, nil) + return echoErr + } + + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, meta.txn) if err != nil { + meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "database error, user not found", + "message": "no user found with this username", }) a.logger.Log(ctx, err) return echoErr @@ -137,6 +195,8 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id, "registration") if err != nil { + meta.txn.Rollback(ctx.Request().Context()) + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "database error, session data not found", @@ -147,6 +207,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { parsedResponse, err := protocol.ParseCredentialCreationResponseBody(ctx.Request().Body) if err != nil { + meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error parsing credential creation response body", @@ -155,12 +216,10 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } defer ctx.Request().Body.Close() - color.Red("sessionData: %+v", sessionData) - color.Yellow("userFromDB: %+v", userFromDB) - color.Green("parsedResponse: %+v", parsedResponse) credentials, err := a.webAuthN.CreateCredential(userFromDB, *sessionData, parsedResponse) if err != nil { + meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error creating webauthn credentials", @@ -169,8 +228,10 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } + // append the credential to the User.credentials field userFromDB.AddWebAuthNCredential(credentials) if err := a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id, credentials); err != nil { + meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "database error storing webauthn credentials", @@ -179,9 +240,11 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } + meta.txn.Commit(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusOK, echo.Map{ "message": "registration successful", }) + a.logger.Log(ctx, echoErr) return echoErr } @@ -190,7 +253,7 @@ func (a *auth) BeginLogin(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) username := ctx.QueryParam("username") - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) + userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, nil) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), @@ -210,8 +273,10 @@ func (a *auth) BeginLogin(ctx echo.Context) error { return echoErr } + // these credentials are added here because WebAuthn will try to access then via + // user.WebAuthnCredentials method userFromDB.AddWebAuthNCredential(creds) - options, sessionData, err := a.webAuthN.BeginLogin(userFromDB) + credentialAssertionOpts, sessionData, err := a.webAuthN.BeginLogin(userFromDB) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -231,7 +296,7 @@ func (a *auth) BeginLogin(ctx echo.Context) error { } echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "options": &options, + "options": &credentialAssertionOpts, }) a.logger.Log(ctx, echoErr) return echoErr @@ -241,7 +306,7 @@ func (a *auth) FinishLogin(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) username := ctx.QueryParam("username") - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), username, false) + userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, nil) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -271,8 +336,6 @@ func (a *auth) FinishLogin(ctx echo.Context) error { return echoErr } defer ctx.Request().Body.Close() - color.Red("parsed Response: %+v", parsedResponse) - color.Red("session data: %+v", *sessionData) creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDb.Id) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -341,3 +404,26 @@ func (a *auth) FinishLogin(ctx echo.Context) error { a.logger.Log(ctx, echoErr) return echoErr } + +func (a *auth) doWebAuthnRegisteration(ctx context.Context, user *types.User) (*protocol.CredentialCreation, error) { + creds, err := a.pgStore.GetWebAuthNCredentials(ctx, user.Id) + if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { + return nil, err + } + + user.AddWebAuthNCredentials(creds) + credentialCreation, sessionData, err := a.webAuthN.BeginRegistration( + user, + func(o *protocol.PublicKeyCredentialCreationOptions) { + o.CredentialExcludeList = user.GetExistingPublicKeyCredentials() + }) + if err != nil { + return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) + } + // store session data in DB + if err = a.pgStore.AddWebAuthSessionData(ctx, user.Id, sessionData, "registration"); err != nil { + return nil, err + } + + return credentialCreation, err +} diff --git a/config/config.go b/config/config.go index 6afe30ed..de92c458 100644 --- a/config/config.go +++ b/config/config.go @@ -19,14 +19,15 @@ type ( OAuth *OAuth `yaml:"oauth" mapstructure:"oauth"` WebAppEndpoint string `yaml:"web_app_url" mapstructure:"web_app_url" validate:"required"` //nolint - WebAppRedirectURL string `yaml:"web_app_redirect_url" mapstructure:"web_app_redirect_url" validate:"required"` - WebAppErrorRedirectPath string `yaml:"web_app_error_redirect_path" mapstructure:"web_app_error_redirect_path"` - StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` - LogConfig Log `yaml:"log_service" mapstructure:"log_service"` - Email Email `yaml:"email" mapstructure:"email" validate:"-"` - Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` - Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` - Debug bool `yaml:"debug" mapstructure:"debug"` + WebAppRedirectURL string `yaml:"web_app_redirect_url" mapstructure:"web_app_redirect_url" validate:"required"` + WebAppErrorRedirectPath string `yaml:"web_app_error_redirect_path" mapstructure:"web_app_error_redirect_path"` + StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` + LogConfig Log `yaml:"log_service" mapstructure:"log_service"` + Email Email `yaml:"email" mapstructure:"email" validate:"-"` + WebAuthnConfig *WebAuthnConfig `yaml:"web_authn_config" mapstructure:"web_authn_config"` + Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` + Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` + Debug bool `yaml:"debug" mapstructure:"debug"` } DFS struct { diff --git a/db/migrations/000009_create_web_authn_session_table.up.sql b/db/migrations/000009_create_web_authn_session_table.up.sql index 7f70c1c5..f8c28aaf 100644 --- a/db/migrations/000009_create_web_authn_session_table.up.sql +++ b/db/migrations/000009_create_web_authn_session_table.up.sql @@ -1,7 +1,7 @@ CREATE TABLE "web_authn_session" ( "challenge" text, "user_id" bytea, - "credential_owner_id" uuid, + "credential_owner_id" uuid PRIMARY KEY, "allowed_credential_id" bytea[], "user_verification" text, "extensions" jsonb, diff --git a/go.sum b/go.sum index 9bf06666..02d87f04 100644 --- a/go.sum +++ b/go.sum @@ -519,6 +519,8 @@ github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= +github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= diff --git a/router/helpers.go b/router/helpers.go index 44de309d..d9b34f03 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -27,8 +27,9 @@ func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { authRouter.Add(http.MethodGet, "/forgot-password", authSvc.ForgotPassword) webAuthnRouter := authRouter.Group("/webauthn") - webAuthnRouter.Add(http.MethodPost, "/begin-registration", authSvc.BeginRegistration) - webAuthnRouter.Add(http.MethodPost, "/finish-registration", authSvc.FinishRegistration) - webAuthnRouter.Add(http.MethodGet, "/begin-login", authSvc.BeginLogin) - webAuthnRouter.Add(http.MethodPost, "/finish-login", authSvc.FinishLogin) + webAuthnRouter.Add(http.MethodPost, "/registration/begin", authSvc.BeginRegistration) + webAuthnRouter.Add(http.MethodDelete, "/registration/rollback", authSvc.RollbackRegisteration) + webAuthnRouter.Add(http.MethodPost, "/registration/finish", authSvc.FinishRegistration) + webAuthnRouter.Add(http.MethodGet, "/login/begin", authSvc.BeginLogin) + webAuthnRouter.Add(http.MethodPost, "/login/finish", authSvc.FinishLogin) } diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 336916e8..13df40da 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -22,11 +22,11 @@ type PersistentStore interface { } type UserStore interface { - AddUser(ctx context.Context, u *types.User) error + AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error AddOAuthUser(ctx context.Context, u *types.User) error UserExists(ctx context.Context, id string) bool - GetUser(ctx context.Context, identifier string, wihtPassword bool) (*types.User, error) - GetUserById(ctx context.Context, userId string, wihtPassword bool) (*types.User, error) + GetUser(ctx context.Context, identifier string, wihtPassword bool, txn pgx.Tx) (*types.User, error) + GetUserById(ctx context.Context, userId string, wihtPassword bool, txn pgx.Tx) (*types.User, error) GetUserWithSession(ctx context.Context, sessionId string) (*types.User, error) UpdateUser(ctx context.Context, identifier string, u *types.User) error UpdateUserPWD(ctx context.Context, identifier string, newPassword string) error diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index fbf35ff7..9b321e1c 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -4,7 +4,7 @@ var ( // user_id is the web_authn_session user_id // credential_owner_id is from our user table AddWebAuthNSessionData = `insert into web_authn_session (credential_owner_id,user_id,challenge,allowed_credential_id, - user_verification,extensions,session_type) values ($1,$2,$3,$4,$5,$6,$7);` + user_verification,extensions,session_type) values ($1,$2,$3,$4,$5,$6,$7) on conflict (credential_owner_id) do update set user_id=$2,challenge=$3,allowed_credential_id=$4,user_verification=$5,extensions=$6,session_type=$7;` GetWebAuthNSessionData = `select user_id,challenge,allowed_credential_id,user_verification,extensions from web_authn_session where credential_owner_id=$1 and session_type=$2;` diff --git a/store/postgres/users.go b/store/postgres/users.go index 05424670..fe21862f 100644 --- a/store/postgres/users.go +++ b/store/postgres/users.go @@ -8,13 +8,10 @@ import ( "github.com/containerish/OpenRegistry/store/postgres/queries" "github.com/containerish/OpenRegistry/types" "github.com/google/uuid" + "github.com/jackc/pgx/v4" ) -func (p *pg) AddUser(ctx context.Context, u *types.User) error { - if err := u.Validate(); err != nil { - return err - } - +func (p *pg) AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() @@ -26,6 +23,29 @@ func (p *pg) AddUser(ctx context.Context, u *types.User) error { } u.Id = id.String() } + + if txn != nil { + _, err := txn.Exec( + childCtx, + queries.AddUser, + u.Id, + u.IsActive, + u.Username, + u.Name, + u.Email, + u.Password, + u.Hireable, + u.HTMLURL, + t, + t, + ) + if err != nil { + return fmt.Errorf("error adding user to database with transaction: %w", err) + } + + return nil + } + _, err := p.conn.Exec( childCtx, queries.AddUser, @@ -48,10 +68,6 @@ func (p *pg) AddUser(ctx context.Context, u *types.User) error { } func (p *pg) AddOAuthUser(ctx context.Context, u *types.User) error { - if err := u.Validate(); err != nil { - return err - } - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() @@ -88,13 +104,18 @@ func (p *pg) AddOAuthUser(ctx context.Context, u *types.User) error { return nil } -func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool) (*types.User, error) { +func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, txn pgx.Tx) (*types.User, error) { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() + queryRow := p.conn.QueryRow + if txn != nil { + queryRow = txn.QueryRow + } + var user types.User if withPassword { - row := p.conn.QueryRow(childCtx, queries.GetUserWithPassword, identifier) + row := queryRow(childCtx, queries.GetUserWithPassword, identifier) err := row.Scan( &user.Id, @@ -112,7 +133,7 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool) return &user, nil } - row := p.conn.QueryRow(childCtx, queries.GetUser, identifier) + row := queryRow(childCtx, queries.GetUser, identifier) err := row.Scan( &user.Id, &user.IsActive, @@ -128,12 +149,17 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool) return &user, nil } -func (p *pg) GetUserById(ctx context.Context, userId string, withPassword bool) (*types.User, error) { +func (p *pg) GetUserById(ctx context.Context, userId string, withPassword bool, txn pgx.Tx) (*types.User, error) { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() + queryRow := p.conn.QueryRow + if txn != nil { + queryRow = txn.QueryRow + } + if withPassword { - row := p.conn.QueryRow(childCtx, queries.GetUserByIdWithPassword, userId) + row := queryRow(childCtx, queries.GetUserByIdWithPassword, userId) var user types.User if err := row.Scan( @@ -151,7 +177,7 @@ func (p *pg) GetUserById(ctx context.Context, userId string, withPassword bool) return &user, nil } - row := p.conn.QueryRow(childCtx, queries.GetUserById, userId) + row := queryRow(childCtx, queries.GetUserById, userId) var user types.User err := row.Scan( &user.Id, @@ -193,7 +219,7 @@ func (p *pg) GetUserWithSession(ctx context.Context, sessionId string) (*types.U } // UpdateUser -//update users set username = $1, email = $2, updated_at = $3 where username = $4 +// update users set username = $1, email = $2, updated_at = $3 where username = $4 func (p *pg) UpdateUser(ctx context.Context, userId string, u *types.User) error { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() @@ -272,7 +298,7 @@ func (p *pg) DeleteUser(ctx context.Context, identifier string) error { return nil } -//IsActive - if the user has logged in, isActive returns true +// IsActive - if the user has logged in, isActive returns true // this method is also useful for limiting access of malicious actors func (p *pg) IsActive(ctx context.Context, identifier string) bool { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) @@ -285,7 +311,7 @@ func (p *pg) UserExists(ctx context.Context, id string) bool { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() - row, err := p.GetUserById(childCtx, id, false) + row, err := p.GetUserById(childCtx, id, false, nil) if err != nil || row == nil { return false } diff --git a/types/users.go b/types/users.go index 09a8178f..2fc66c7a 100644 --- a/types/users.go +++ b/types/users.go @@ -13,35 +13,35 @@ import ( type ( User struct { - CreatedAt time.Time `json:"created_at,omitempty" validate:"-"` UpdatedAt time.Time `json:"updated_at,omitempty" validate:"-"` - TwitterUsername string `json:"twitter_username,omitempty"` + CreatedAt time.Time `json:"created_at,omitempty" validate:"-"` + GravatarID string `json:"gravatar_id,omitempty"` Password string `json:"password,omitempty"` + Id string `json:"uuid,omitempty" validate:"-"` Username string `json:"username,omitempty" validate:"-"` Email string `json:"email,omitempty" validate:"email"` URL string `json:"url,omitempty"` Company string `json:"company,omitempty"` ReceivedEventsURL string `json:"received_events_url,omitempty"` - Bio string `json:"bio,omitempty"` - Type string `json:"type,omitempty"` - GravatarID string `json:"gravatar_id,omitempty"` - Id string `json:"uuid,omitempty" validate:"-"` HTMLURL string `json:"html_url,omitempty"` + Type string `json:"type,omitempty"` + AvatarURL string `json:"avatar_url,omitempty"` + TwitterUsername string `json:"twitter_username,omitempty"` + Bio string `json:"bio,omitempty"` Location string `json:"location,omitempty"` Login string `json:"login,omitempty"` Name string `json:"name,omitempty"` NodeID string `json:"node_id,omitempty"` OrganizationsURL string `json:"organizations_url,omitempty"` - AvatarURL string `json:"avatar_url,omitempty"` credentials []webauthn.Credential OAuthID int `json:"id,omitempty"` - IsActive bool `json:"is_active,omitempty" validate:"-"` Hireable bool `json:"hireable,omitempty"` + IsActive bool `json:"is_active,omitempty" validate:"-"` } OAuthUser struct { - UpdatedAt time.Time `json:"updated_at"` CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` Location string `json:"location"` ReceivedEventsURL string `json:"received_events_url"` Email string `json:"email"` @@ -68,13 +68,15 @@ type ( } ) -func (u *User) Validate() error { +func (u *User) Validate(validatePassword bool) error { if u == nil { return fmt.Errorf("user is nil") } - if err := ValidatePassword(u.Password); err != nil { - return err + if validatePassword { + if err := ValidatePassword(u.Password); err != nil { + return err + } } v := validator.New() @@ -147,32 +149,3 @@ func (u *User) Bytes() ([]byte, error) { return json.Marshal(u) } - -// WebAuthnID - User ID according to the Relying Party -func (u *User) WebAuthnID() []byte { - return []byte(u.Id) -} - -// WebAuthnName - User Name according to the Relying Party -func (u *User) WebAuthnName() string { - return u.Username -} - -// WebAuthnDisplayName - Display Name of the user -func (u *User) WebAuthnDisplayName() string { - return u.Username -} - -// WebAuthnIcon - User's icon url -func (u *User) WebAuthnIcon() string { - return u.AvatarURL -} - -// WebAuthnCredentials - Credentials owned by the user -func (u *User) WebAuthnCredentials() []webauthn.Credential { - return u.credentials -} - -func (u *User) AddWebAuthNCredential(creds *webauthn.Credential) { - u.credentials = append(u.credentials, *creds) -} diff --git a/types/web_authn.go b/types/web_authn.go index 1f0f8bd4..fac5f920 100644 --- a/types/web_authn.go +++ b/types/web_authn.go @@ -1,6 +1,10 @@ package types -import "github.com/duo-labs/webauthn/webauthn" +import ( + "github.com/duo-labs/webauthn/protocol" + "github.com/duo-labs/webauthn/webauthn" + "github.com/google/uuid" +) type ( WebAuthNSessiondata struct { @@ -8,3 +12,57 @@ type ( CredentialOwnerId string } ) + +// WebAuthnID - User ID according to the Relying Party +func (u *User) WebAuthnID() []byte { + // TODO(jay-dee7): This will panic + userID := uuid.MustParse(u.Id) + return userID[:] +} + +// WebAuthnName - User Name according to the Relying Party +func (u *User) WebAuthnName() string { + return u.Username +} + +// WebAuthnDisplayName - Display Name of the user +func (u *User) WebAuthnDisplayName() string { + return u.Username +} + +// WebAuthnIcon - User's icon url +func (u *User) WebAuthnIcon() string { + return u.AvatarURL +} + +// WebAuthnCredentials - Credentials owned by the user +func (u *User) WebAuthnCredentials() []webauthn.Credential { + return u.credentials +} + +func (u *User) AddWebAuthNCredential(creds *webauthn.Credential) { + u.credentials = append(u.credentials, *creds) +} + +func (u *User) AddWebAuthNCredentials(creds ...*webauthn.Credential) { + for _, c := range creds { + if c == nil { + continue + } + + u.credentials = append(u.credentials, *c) + } +} + +func (u *User) GetExistingPublicKeyCredentials() []protocol.CredentialDescriptor { + var list []protocol.CredentialDescriptor + + for _, cred := range u.credentials { + list = append(list, protocol.CredentialDescriptor{ + Type: protocol.PublicKeyCredentialType, + CredentialID: cred.ID, + }) + } + + return list +} From 9bb56fc2f5937c0704f9821d9419fd0e62d5c1f2 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sun, 16 Oct 2022 21:00:01 +0530 Subject: [PATCH 04/19] fix: Time comparison for webauthn registration API --- auth/auth.go | 6 +++--- auth/web_authn.go | 5 ++--- go.sum | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index 462439bb..e5474b9a 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -6,7 +6,7 @@ import ( "time" "github.com/duo-labs/webauthn/webauthn" - "github.com/jackc/pgx" + "github.com/jackc/pgx/v4" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/services/email" @@ -59,7 +59,7 @@ func New( } ghClient := gh.NewClient(nil) - emailClient := email.New(c.Email, c.WebAppEndpoint) + emailClient := email.New(&c.Email, c.WebAppEndpoint) webAuthN, err := webauthn.New(&webauthn.Config{ RPDisplayName: c.WebAuthnConfig.RPDisplayName, RPID: c.WebAuthnConfig.RPID, @@ -123,7 +123,7 @@ func (a *auth) stateTokenCleanup() { func (a *auth) webAuthNTxnCleanup() { for range time.Tick(time.Second * 10) { for username, meta := range a.txnStore { - if meta.expiresAt.Unix() >= time.Now().Unix() { + if meta.expiresAt.Unix() <= time.Now().Unix() { _ = meta.txn.Rollback(context.Background()) delete(a.txnStore, username) } diff --git a/auth/web_authn.go b/auth/web_authn.go index 9204ee6a..812be88f 100644 --- a/auth/web_authn.go +++ b/auth/web_authn.go @@ -8,10 +8,9 @@ import ( "net/http" "time" + "github.com/containerish/OpenRegistry/types" "github.com/duo-labs/webauthn/protocol" "github.com/google/uuid" - - "github.com/containerish/OpenRegistry/types" "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" ) @@ -57,7 +56,7 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { } a.txnStore[user.Username] = &webAuthNMeta{ txn: txn, - expiresAt: time.Now().Add(time.Second * 60), + expiresAt: time.Now().Add(time.Minute), } userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true, nil) diff --git a/go.sum b/go.sum index 02d87f04..9bf06666 100644 --- a/go.sum +++ b/go.sum @@ -519,8 +519,6 @@ github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= From a8ad1a438abb5a1c52bd9863a36127faaac3714d Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Fri, 6 Jan 2023 23:48:01 +0530 Subject: [PATCH 05/19] remove: Dead code in WebAuthn --- auth/signout.go | 4 ++-- auth/web_authn.go | 32 +------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/auth/signout.go b/auth/signout.go index 9cc573eb..39d28502 100644 --- a/auth/signout.go +++ b/auth/signout.go @@ -24,7 +24,7 @@ func (a *auth) SignOut(ctx echo.Context) error { } parts := strings.Split(sessionCookie.Value, ":") if len(parts) != 2 { - err := fmt.Errorf("invalid session id") + err = fmt.Errorf("invalid session id") echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": "INVALID_SESSION_ID", "message": err, @@ -36,7 +36,7 @@ func (a *auth) SignOut(ctx echo.Context) error { sessionId := parts[0] userId := parts[1] - if err := a.pgStore.DeleteSession(ctx.Request().Context(), sessionId, userId); err != nil { + if err = a.pgStore.DeleteSession(ctx.Request().Context(), sessionId, userId); err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "could not delete sessions", diff --git a/auth/web_authn.go b/auth/web_authn.go index 812be88f..8e9ab318 100644 --- a/auth/web_authn.go +++ b/auth/web_authn.go @@ -75,16 +75,6 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { // set it here so that we can continue to use userFromDb object userFromDb = &user - // credentialCreation, err := a.doWebAuthnRegisteration(ctx.Request().Context(), &user) - // if err != nil { - // - // } - // echoErr := ctx.JSON(http.StatusOK, echo.Map{ - // "message": "registration successful", - // "options": &options, - // }) - // a.logger.Log(ctx, echoErr) - // return echoErr } else { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -96,26 +86,6 @@ func (a *auth) BeginRegistration(ctx echo.Context) error { } } - // options, sessionData, err := a.webAuthN.BeginRegistration(userFromDb) - // if err != nil { - // echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - // "error": err.Error(), - // "message": "error begin registration", - // }) - // a.logger.Log(ctx, err) - // return echoErr - // } - // - // // store session data in DB - // if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDb.Id, sessionData, "registration"); err != nil { - // echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - // "error": err.Error(), - // "message": "failed to add web authn session data for existing user", - // }) - // a.logger.Log(ctx, err) - // return echoErr - // } - credentialOpts, err := a.doWebAuthnRegisteration(ctx.Request().Context(), userFromDb) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ @@ -299,8 +269,8 @@ func (a *auth) BeginLogin(ctx echo.Context) error { }) a.logger.Log(ctx, echoErr) return echoErr - } + func (a *auth) FinishLogin(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) From 14def92f20e8e9d99603972b4f54c64871010b36 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 7 Jan 2023 16:05:19 +0530 Subject: [PATCH 06/19] fix(deps): Use go-webauthn instead of duo-labs --- auth/auth.go | 6 +- auth/web_authn.go | 55 ++- config.yaml.example | 44 ++ config/config.go | 26 +- go.mod | 72 +-- go.sum | 655 ++-------------------------- store/postgres/postgres.go | 2 +- store/postgres/queries/web_authn.go | 1 + store/postgres/web_authn.go | 16 +- types/users.go | 2 +- types/web_authn.go | 4 +- 11 files changed, 157 insertions(+), 726 deletions(-) create mode 100644 config.yaml.example diff --git a/auth/auth.go b/auth/auth.go index e5474b9a..9e5c47a2 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/duo-labs/webauthn/webauthn" + "github.com/go-webauthn/webauthn/webauthn" "github.com/jackc/pgx/v4" "github.com/containerish/OpenRegistry/config" @@ -60,10 +60,12 @@ func New( ghClient := gh.NewClient(nil) emailClient := email.New(&c.Email, c.WebAppEndpoint) + + // Initialise the Webauthn service webAuthN, err := webauthn.New(&webauthn.Config{ RPDisplayName: c.WebAuthnConfig.RPDisplayName, RPID: c.WebAuthnConfig.RPID, - RPOrigin: c.WebAuthnConfig.RPOrigin, + RPOrigins: c.WebAuthnConfig.RPOrigins, RPIcon: c.WebAuthnConfig.RPIcon, }) if err != nil { diff --git a/auth/web_authn.go b/auth/web_authn.go index 8e9ab318..00465fba 100644 --- a/auth/web_authn.go +++ b/auth/web_authn.go @@ -9,7 +9,8 @@ import ( "time" "github.com/containerish/OpenRegistry/types" - "github.com/duo-labs/webauthn/protocol" + "github.com/go-webauthn/webauthn/protocol" + "github.com/go-webauthn/webauthn/webauthn" "github.com/google/uuid" "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" @@ -153,7 +154,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, meta.txn) if err != nil { - meta.txn.Rollback(ctx.Request().Context()) + _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "no user found with this username", @@ -164,7 +165,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id, "registration") if err != nil { - meta.txn.Rollback(ctx.Request().Context()) + _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -176,7 +177,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { parsedResponse, err := protocol.ParseCredentialCreationResponseBody(ctx.Request().Body) if err != nil { - meta.txn.Rollback(ctx.Request().Context()) + _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error parsing credential creation response body", @@ -188,7 +189,7 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { credentials, err := a.webAuthN.CreateCredential(userFromDB, *sessionData, parsedResponse) if err != nil { - meta.txn.Rollback(ctx.Request().Context()) + _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error creating webauthn credentials", @@ -199,8 +200,8 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { // append the credential to the User.credentials field userFromDB.AddWebAuthNCredential(credentials) - if err := a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id, credentials); err != nil { - meta.txn.Rollback(ctx.Request().Context()) + if err = a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id, credentials); err != nil { + _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), "message": "database error storing webauthn credentials", @@ -209,7 +210,16 @@ func (a *auth) FinishRegistration(ctx echo.Context) error { return echoErr } - meta.txn.Commit(ctx.Request().Context()) + if err = meta.txn.Commit(ctx.Request().Context()); err != nil { + _ = meta.txn.Rollback(ctx.Request().Context()) + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error storing the credential info", + }) + a.logger.Log(ctx, err) + return echoErr + } + echoErr := ctx.JSON(http.StatusOK, echo.Map{ "message": "registration successful", }) @@ -245,7 +255,11 @@ func (a *auth) BeginLogin(ctx echo.Context) error { // these credentials are added here because WebAuthn will try to access then via // user.WebAuthnCredentials method userFromDB.AddWebAuthNCredential(creds) - credentialAssertionOpts, sessionData, err := a.webAuthN.BeginLogin(userFromDB) + + credentialAssertionOpts, sessionData, err := a.webAuthN.BeginLogin( + userFromDB, + webauthn.WithAllowedCredentials(userFromDB.GetExistingPublicKeyCredentials()), + ) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -255,7 +269,8 @@ func (a *auth) BeginLogin(ctx echo.Context) error { return echoErr } - if err := a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDB.Id, sessionData, "authentication"); err != nil { + err = a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDB.Id, sessionData, "authentication") + if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "database error: storing session data while web authn begin login", @@ -305,6 +320,7 @@ func (a *auth) FinishLogin(ctx echo.Context) error { return echoErr } defer ctx.Request().Body.Close() + creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDb.Id) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -380,12 +396,25 @@ func (a *auth) doWebAuthnRegisteration(ctx context.Context, user *types.User) (* return nil, err } + // User might already have few credentials. They shouldn't be considered when creating a new credential for them. + // A user can have multiple credentials + excludeList := user.GetExistingPublicKeyCredentials() + + authSelect := &protocol.AuthenticatorSelection{ + AuthenticatorAttachment: protocol.Platform, + RequireResidentKey: protocol.ResidentKeyRequired(), + UserVerification: protocol.VerificationRequired, + } + + conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) + user.AddWebAuthNCredentials(creds) credentialCreation, sessionData, err := a.webAuthN.BeginRegistration( user, - func(o *protocol.PublicKeyCredentialCreationOptions) { - o.CredentialExcludeList = user.GetExistingPublicKeyCredentials() - }) + webauthn.WithExclusions(excludeList), + webauthn.WithAuthenticatorSelection(*authSelect), + webauthn.WithConveyancePreference(conveyancePref), + ) if err != nil { return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) } diff --git a/config.yaml.example b/config.yaml.example new file mode 100644 index 00000000..8bbc2d5a --- /dev/null +++ b/config.yaml.example @@ -0,0 +1,44 @@ +environment: local +debug: true +web_app_url: "http://localhost:3000" +web_app_redirect_url: "/" +web_app_error_redirect_path: "/auth/unhandled" +registry: + dns_address: localhost + version: master + fqdn: localhost + jwt_signing_secret: super-secret + host: 0.0.0.0 + port: 5000 + tls: + enabled: true + priv_key: .certs/registry.local + pub_key: .certs/registry.local.crt + services: + - github + - token + - skynet_homescreen +oauth: + github: + client_id: dummy-gh-client-id + client_secret: dummy-gh-client-secret +dfs: + s3_any: + access_key: + secret_key: + endpoint: + bucket_name: + dfs_link_resolver: +database: + kind: postgres + host: 0.0.0.0 + port: 5432 + username: postgres + password: Qwerty@123 + name: open_registry +web_authn_config: + rp_display_name: + rp_id: localhost + rp_origins: + - http://localhost:3000 + rp_icon: diff --git a/config/config.go b/config/config.go index de92c458..13920039 100644 --- a/config/config.go +++ b/config/config.go @@ -19,15 +19,15 @@ type ( OAuth *OAuth `yaml:"oauth" mapstructure:"oauth"` WebAppEndpoint string `yaml:"web_app_url" mapstructure:"web_app_url" validate:"required"` //nolint - WebAppRedirectURL string `yaml:"web_app_redirect_url" mapstructure:"web_app_redirect_url" validate:"required"` - WebAppErrorRedirectPath string `yaml:"web_app_error_redirect_path" mapstructure:"web_app_error_redirect_path"` - StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` - LogConfig Log `yaml:"log_service" mapstructure:"log_service"` - Email Email `yaml:"email" mapstructure:"email" validate:"-"` - WebAuthnConfig *WebAuthnConfig `yaml:"web_authn_config" mapstructure:"web_authn_config"` - Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` - Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` - Debug bool `yaml:"debug" mapstructure:"debug"` + WebAppRedirectURL string `yaml:"web_app_redirect_url" mapstructure:"web_app_redirect_url" validate:"required"` + WebAppErrorRedirectPath string `yaml:"web_app_error_redirect_path" mapstructure:"web_app_error_redirect_path"` + StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` + LogConfig Log `yaml:"log_service" mapstructure:"log_service"` + Email Email `yaml:"email" mapstructure:"email" validate:"-"` + WebAuthnConfig WebAuthnConfig `yaml:"web_authn_config" mapstructure:"web_authn_config"` + Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` + Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` + Debug bool `yaml:"debug" mapstructure:"debug"` } DFS struct { @@ -106,10 +106,10 @@ type ( } WebAuthnConfig struct { - RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` // Display Name for your site - RPID string `yaml:"rp_id" mapstructure:"rp_id"` // Generally the FQDN for your site - RPOrigin string `yaml:"rp_origin" mapstructure:"rp_origin"` // The origin URL for WebAuthn requests - RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` // Optional icon URL for your site + RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` + RPID string `yaml:"rp_id" mapstructure:"rp_id"` + RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` + RPOrigins []string `yaml:"rp_origin" mapstructure:"rp_origin"` } ) diff --git a/go.mod b/go.mod index cb6edd37..084ce204 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,11 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.19 github.com/aws/aws-sdk-go-v2/credentials v1.13.18 github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 - github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec github.com/fatih/color v1.15.0 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.12.0 + github.com/go-webauthn/webauthn v0.6.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/google/go-github/v42 v42.0.0 github.com/google/uuid v1.3.0 @@ -23,7 +23,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 github.com/rs/zerolog v1.29.0 github.com/sendgrid/sendgrid-go v3.12.0+incompatible - github.com/spf13/viper v1.15.0 + github.com/spf13/viper v1.8.1 github.com/valyala/fasttemplate v1.2.2 golang.org/x/crypto v0.7.0 golang.org/x/oauth2 v0.6.0 @@ -31,8 +31,6 @@ require ( ) require ( - cloud.google.com/go/compute v1.15.1 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect @@ -48,37 +46,16 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cloudflare/cfssl v1.6.1 // indirect - github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect - github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect - github.com/envoyproxy/go-control-plane v0.10.3 // indirect - github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect - github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/fullstorydev/grpcurl v1.8.1 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.1.0 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.5.0 // indirect + github.com/go-webauthn/revoke v0.1.6 // indirect + github.com/golang-jwt/jwt/v4 v4.4.3 // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/gorilla/websocket v1.4.2 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/google/go-tpm v0.3.3 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.0 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -87,70 +64,37 @@ require ( github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect github.com/jackc/puddle v1.3.0 // indirect - github.com/jhump/protoreflect v1.8.2 // indirect - github.com/jonboulle/clockwork v0.2.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/labstack/gommon v0.4.0 // indirect github.com/leodido/go-urn v1.2.2 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect - github.com/mattn/go-runewidth v0.0.12 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.40.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/rivo/uniseg v0.2.0 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sendgrid/rest v2.6.9+incompatible // indirect - github.com/sirupsen/logrus v1.8.1 // indirect - github.com/soheilhy/cmux v0.1.5 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.1.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect - github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect - github.com/urfave/cli v1.22.5 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 // indirect - go.etcd.io/bbolt v1.3.5 // indirect - go.etcd.io/etcd/api/v3 v3.5.6 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect - go.etcd.io/etcd/client/v2 v2.305.6 // indirect - go.etcd.io/etcd/client/v3 v3.5.6 // indirect - go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect - go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect - go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.21.0 // indirect - golang.org/x/mod v0.8.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/text v0.8.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/grpc v1.53.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - sigs.k8s.io/yaml v1.2.0 // indirect ) replace github.com/SkynetLabs/go-skynet/v2 => github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d diff --git a/go.sum b/go.sum index 9bf06666..9fb0eb13 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,6 @@ -bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -30,10 +26,6 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= -cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -41,80 +33,24 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/spanner v1.17.0/go.mod h1:+17t2ixFwRG4lWRwE+5kipDR9Ef07Jkmc8z0IbMDKUs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= -contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= -contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= -contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0= -github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= -github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= -github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4= -github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu/ACaQhYjeefzQ0y1o= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= -github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= -github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= @@ -151,162 +87,67 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 h1:bWNgNdRko2x6gqa0blfATqAZKZok github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= -github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= -github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= -github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= -github.com/cloudflare/cfssl v1.6.1 h1:aIOUjpeuDJOpWjVJFP2ByplF53OgqG8I1S40Ggdlk3g= -github.com/cloudflare/cfssl v1.6.1/go.mod h1:ENhCj4Z17+bY2XikpxVmTHDg/C2IsG2Q0ZBeXpAqhCk= -github.com/cloudflare/redoctober v0.0.0-20201013214028-99c99a8e7544/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210322005330-6414d713912e/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= -github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -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 h1:ACGZRIr7HsgBKHsueQ1yM4WaVaXh21ynwqsF8M8tXhA= -github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= 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/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d h1:FJN3IBHTidtf0RgzkUpqESXY9Q7IomATzYgKlwMpYw0= github.com/containerish/go-skynet/v2 v2.0.2-0.20220629062209-f31ff192458d/go.mod h1:XOk0zwGlXeGjHQgmhXTEk7qTD6FVv3dXPW38Wh3XsIc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E= -github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec h1:darQ1FPPrwlzwmuN3fRMVCrsaCpuDqkKHADYzcMa73M= -github.com/duo-labs/webauthn v0.0.0-20221205164246-ebaf9b74c6ec/go.mod h1:V3q8IgNpNqFio+56G0vy/QZIi7iho65UFrDwdF5OtZA= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.3 h1:xdCVXxEe0Y3FQith+0cj2irwZudqGYvecuLB1HtdexY= -github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= -github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= -github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= -github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= -github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod h1:49H/RkXP8pKaZy4h0d+NW16rSLhyVBt4o6VLJbmOqDE= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= -github.com/fullstorydev/grpcurl v1.8.1 h1:Pp648wlTTg3OKySeqxM5pzh8XF6vLqrm8wRq66+5Xo0= -github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= -github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= 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-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= 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= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -318,38 +159,26 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI= github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/go-webauthn/revoke v0.1.6 h1:3tv+itza9WpX5tryRQx4GwxCCBrCIiJ8GIkOhxiAmmU= +github.com/go-webauthn/revoke v0.1.6/go.mod h1:TB4wuW4tPlwgF3znujA96F70/YSQXHPPWl7vgY09Iy8= +github.com/go-webauthn/webauthn v0.6.0 h1:uLInMApSvBfP+vEFasNE0rnVPG++fjp7lmAIvNhe+UU= +github.com/go-webauthn/webauthn v0.6.0/go.mod h1:7edMRZXwuM6JIVjN68G24Bzt+bPCvTmjiL0j+cAmXtY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= -github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU= +github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -357,7 +186,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -377,15 +205,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod h1:6CKh9dscIRoqc2kC6YUFICHZMT9NrClyPrRVFrdw1QQ= -github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 h1:806qveZBQtRNHroYHyg6yrsjqBJh9kIB4nfmB8uJnak= -github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92/go.mod h1:kXWPsHVPSKVuxPPG69BRtumCbAW537FydV/GH89oBhM= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -397,23 +218,20 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec= github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= -github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= -github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= +github.com/google/go-tpm v0.1.2-0.20190725015402-ae6dd98980d4/go.mod h1:H9HbmUG2YgV/PHITkO7p6wxEEj/v5nlsVWIwumwH2NI= +github.com/google/go-tpm v0.3.0/go.mod h1:iVLWvrPp/bHeEkxTFi9WG6K9w0iy2yIszHwZGHPbzAw= +github.com/google/go-tpm v0.3.3 h1:P/ZFNBZYXRxc+z7i5uyd8VP7MaDteuLZInzrH2idRGo= +github.com/google/go-tpm v0.3.3/go.mod h1:9Hyn3rgnzWF9XBWVk6ml6A6hNkbWjNFlDQL51BeghL4= +github.com/google/go-tpm-tools v0.0.0-20190906225433-1614c142f845/go.mod h1:AVfHadzbdzHo54inR2x1v640jdi1YSi3NauM2DUsxk0= +github.com/google/go-tpm-tools v0.2.0/go.mod h1:npUd03rQ60lxN7tzeBJreG38RvWwme2N1reF/eeiBk4= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -429,69 +247,34 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod h1:1dPv0CUjNQVFEDuAUFhZql16pw/VlPgaX8qj+g5pVzQ= -github.com/google/trillian v1.3.14-0.20210428093031-b4ddea2e86b1/go.mod h1:FdIJX+NoDk/dIN2ZxTyz5nAJWgf+NSSSriPAMThChTY= -github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= -github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/goreleaser/goreleaser v0.134.0/go.mod h1:ZT6Y2rSYa6NxQzIsdfWWNWAlYGXGbreo66NmE+3X3WQ= -github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -501,20 +284,9 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -564,60 +336,29 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= -github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= -github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= -github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkGnWpac= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo-contrib v0.14.1 h1:oNUSCeXQOlCGt3eWafzu0mkXjIh3SINnYgE/UR2kYXQ= github.com/labstack/echo-contrib v0.14.1/go.mod h1:6jgpHPjGRk0qrysPCfv3SCau6kewjQtYzOk1fLZGMeQ= github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= @@ -626,62 +367,35 @@ github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4= github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ= -github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-star v0.5.1/go.mod h1:9toiA3cC7z5uVbODF7kEQ91Xn7XNFkVUl+SrEe+ZORU= -github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= -github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -689,10 +403,9 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -700,126 +413,46 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= -github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.24.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= -github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= @@ -828,81 +461,50 @@ github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2uQ5b24BIhcr0GCcpd/RNAFWaN2CJFrWIIQ= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0= github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= github.com/sendgrid/sendgrid-go v3.12.0+incompatible h1:/N2vx18Fg1KmQOh6zESc5FJB8pYwt5QFBDflYPh1KVg= github.com/sendgrid/sendgrid-go v3.12.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= 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.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -915,41 +517,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= -github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= -github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= -github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= -github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -959,45 +538,12 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= -github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= -github.com/zmap/zcrypto v0.0.0-20210123152837-9cf5beac6d91/go.mod h1:R/deQh6+tSWlgI9tb4jNmXxn8nSCabl5ZQsBX9//I/E= -github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk= -github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8 h1:gZfMjx7Jr6N8b7iJO4eUjDsn6xJqoyXg8D+ogdoAfKY= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= -go.etcd.io/etcd/api/v3 v3.5.6 h1:Cy2qx3npLcYqTKqGJzMypnMv2tiRyifZJ17BlWIWA7A= -go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= -go.etcd.io/etcd/client/pkg/v3 v3.5.6 h1:TXQWYceBKqLp4sa87rcPs11SXxUA/mHwH975v+BDvLU= -go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= -go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= -go.etcd.io/etcd/client/v2 v2.305.6 h1:fIDR0p4KMjw01MJMfUIDWdQbjo06PD6CeYM5z4EHLi0= -go.etcd.io/etcd/client/v2 v2.305.6/go.mod h1:BHha8XJGe8vCIBfWBpbBLVZ4QjOIlfoouvOwydu63E0= -go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= -go.etcd.io/etcd/client/v3 v3.5.6 h1:coLs69PWCXE9G4FKquzNaSHrRyMCAXwF+IX1tAPVO8E= -go.etcd.io/etcd/client/v3 v3.5.6/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk= -go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 h1:odMFuQQCg0UmPd7Cyw6TViRYv9ybGuXuki4CusDSzqA= -go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0/go.mod h1:YPwSaBciV5G6Gpt435AasAG3ROetZsKNUzibRa/++oo= -go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY= -go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= -go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 h1:DvYJotxV9q1Lkn7pknzAbFO/CLtCVidCr2K9qRLJ8pA= -go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod h1:FAwse6Zlm5v4tEWZaTjmNhe17Int4Oxbu7+2r0DiD3w= -go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 h1:fYv7CmmdyuIu27UmKQjS9K/1GtcCa+XnPKqiKBbQkrk= -go.etcd.io/etcd/server/v3 v3.5.0-alpha.0/go.mod h1:tsKetYpt980ZTpzl/gb+UOJj9RkIyCb1u4wjzMg90BQ= -go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 h1:UcRoCA1FgXoc4CEM8J31fqEvI69uFIObY5ZDEFH7Znc= -go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0/go.mod h1:HnrHxjyCuZ8YDt8PYVyQQ5d1ZQfzJVEtQWllr5Vp/30= -go.etcd.io/etcd/v3 v3.5.0-alpha.0 h1:ZuqKJkD2HrzFUj8IB+GLkTMKZ3+7mWx172vx6F1TukM= -go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= -go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1005,54 +551,32 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= -golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -1070,7 +594,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1096,20 +619,14 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1117,15 +634,10 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1133,7 +645,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -1144,23 +655,18 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1170,16 +676,13 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1191,14 +694,11 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1207,18 +707,14 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1228,40 +724,29 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1287,25 +772,19 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1313,18 +792,15 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1342,19 +818,15 @@ golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1363,24 +835,17 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -1398,28 +863,20 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.45.0/go.mod h1:ISLIJCedJolbZvDfAk+Ctuq5hf+aJ33WgtUsfyFoLXA= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1436,7 +893,6 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -1457,25 +913,13 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1485,22 +929,13 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= -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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1511,50 +946,32 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1562,12 +979,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 13df40da..36a3eaef 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/duo-labs/webauthn/webauthn" + "github.com/go-webauthn/webauthn/webauthn" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/types" diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index 9b321e1c..fbf74c35 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -1,3 +1,4 @@ +//nolint package queries var ( diff --git a/store/postgres/web_authn.go b/store/postgres/web_authn.go index 181f87d9..078f194c 100644 --- a/store/postgres/web_authn.go +++ b/store/postgres/web_authn.go @@ -6,7 +6,7 @@ import ( "time" "github.com/containerish/OpenRegistry/store/postgres/queries" - "github.com/duo-labs/webauthn/webauthn" + "github.com/go-webauthn/webauthn/webauthn" ) func (p *pg) AddWebAuthSessionData( @@ -57,7 +57,7 @@ func (p *pg) GetWebAuthNSessionData( return &sessionData, nil } -func (p *pg) AddWebAuthNCredentials(ctx context.Context, credentialOwnerID string, credential *webauthn.Credential) error { +func (p *pg) AddWebAuthNCredentials(ctx context.Context, credentialOwnerID string, cred *webauthn.Credential) error { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() @@ -65,12 +65,12 @@ func (p *pg) AddWebAuthNCredentials(ctx context.Context, credentialOwnerID strin childCtx, queries.AddWebAuthNCredentials, credentialOwnerID, - credential.ID, - credential.PublicKey, - credential.AttestationType, - credential.Authenticator.AAGUID, - credential.Authenticator.SignCount, - credential.Authenticator.CloneWarning, + cred.ID, + cred.PublicKey, + cred.AttestationType, + cred.Authenticator.AAGUID, + cred.Authenticator.SignCount, + cred.Authenticator.CloneWarning, ) if err != nil { diff --git a/types/users.go b/types/users.go index 2fc66c7a..4de21823 100644 --- a/types/users.go +++ b/types/users.go @@ -7,8 +7,8 @@ import ( "time" "unicode" - "github.com/duo-labs/webauthn/webauthn" "github.com/go-playground/validator/v10" + "github.com/go-webauthn/webauthn/webauthn" ) type ( diff --git a/types/web_authn.go b/types/web_authn.go index fac5f920..18fa5827 100644 --- a/types/web_authn.go +++ b/types/web_authn.go @@ -1,8 +1,8 @@ package types import ( - "github.com/duo-labs/webauthn/protocol" - "github.com/duo-labs/webauthn/webauthn" + "github.com/go-webauthn/webauthn/protocol" + "github.com/go-webauthn/webauthn/webauthn" "github.com/google/uuid" ) From 24e8f90fbe07935870526fa56a77e0b942489479 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 4 Feb 2023 02:05:42 +0530 Subject: [PATCH 07/19] refactor: Split user related storage interfaces Instead of one large interface to cover for everything, we now have multiple, smaller interfaces to make our backend more composable. Refactor goes like this: ```go // Postgres Core type PgTxnHandler interface { NewTxn(ctx context.Context) (pgx.Tx, error) Abort(ctx context.Context, txn pgx.Tx) error Commit(ctx context.Context, txn pgx.Tx) error } // User specific type UserReader interface { PgTxnHandler ... } type UserWriter interface { PgTxnHandler ... } type UserDeleter interface { PgTxnHandler ... } type UserReadWriteDeleter interface { PgTxnHandler ... } // WebAuthn specific type WebAuthn interface { PgTxnHandler UserReader UserWriter GetWebAuthNSessionData(ctx context.Context, userId string, sessionType string) (*webauthn.SessionData, error) AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error GetWebAuthNCredentials(ctx context.Context, userId string) (*webauthn.Credential, error) AddWebAuthNCredentials(ctx context.Context, userId string, credential *webauthn.Credential) error } ``` --- store/postgres/postgres.go | 48 +++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 36a3eaef..99b4f915 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -21,29 +21,45 @@ type PersistentStore interface { Close() } -type UserStore interface { - AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error - AddOAuthUser(ctx context.Context, u *types.User) error - UserExists(ctx context.Context, id string) bool +type UserReader interface { GetUser(ctx context.Context, identifier string, wihtPassword bool, txn pgx.Tx) (*types.User, error) GetUserById(ctx context.Context, userId string, wihtPassword bool, txn pgx.Tx) (*types.User, error) GetUserWithSession(ctx context.Context, sessionId string) (*types.User, error) + IsActive(ctx context.Context, identifier string) bool + GetVerifyEmail(ctx context.Context, userId string) (string, error) + UserExists(ctx context.Context, id string) bool +} + +type UserWriter interface { + AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error + AddOAuthUser(ctx context.Context, u *types.User) error UpdateUser(ctx context.Context, identifier string, u *types.User) error UpdateUserPWD(ctx context.Context, identifier string, newPassword string) error - DeleteUser(ctx context.Context, identifier string) error - IsActive(ctx context.Context, identifier string) bool AddSession(ctx context.Context, sessionId, refreshToken, owner string) error + AddVerifyEmail(ctx context.Context, userId, token string) error +} + +type UserDeleter interface { + DeleteUser(ctx context.Context, identifier string) error DeleteSession(ctx context.Context, sessionId, userId string) error DeleteAllSessions(ctx context.Context, userId string) error - AddVerifyEmail(ctx context.Context, userId, token string) error - GetVerifyEmail(ctx context.Context, userId string) (string, error) DeleteVerifyEmail(ctx context.Context, userId string) error } +type UserReadWriteDeleter interface { + PgTxnHandler + UserReader + UserWriter + UserDeleter +} + +type UserStore interface { + PgTxnHandler + UserReadWriteDeleter +} + type RegistryStore interface { - NewTxn(ctx context.Context) (pgx.Tx, error) - Abort(ctx context.Context, txn pgx.Tx) error - Commit(ctx context.Context, txn pgx.Tx) error + PgTxnHandler SetLayer(ctx context.Context, txn pgx.Tx, l *types.LayerV2) error SetManifest(ctx context.Context, txn pgx.Tx, im *types.ImageManifestV2) error SetBlob(ctx context.Context, txn pgx.Tx, b *types.Blob) error @@ -74,7 +90,17 @@ type SessionStore interface { DeleteAllSessions(ctx context.Context, userId string) error } +type PgTxnHandler interface { + NewTxn(ctx context.Context) (pgx.Tx, error) + Abort(ctx context.Context, txn pgx.Tx) error + Commit(ctx context.Context, txn pgx.Tx) error +} + type WebAuthN interface { + PgTxnHandler + UserReader + UserWriter + GetWebAuthNSessionData(ctx context.Context, userId string, sessionType string) (*webauthn.SessionData, error) AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error GetWebAuthNCredentials(ctx context.Context, userId string) (*webauthn.Credential, error) From 5c5964eaf908812cc1860e974899060421b66337 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sun, 5 Feb 2023 19:17:46 +0530 Subject: [PATCH 08/19] feat: Webauthn service --- .gitignore | 2 + auth/auth.go | 48 +--- auth/server/helpers.go | 132 ++++++++++ auth/server/webauthn_server.go | 370 ++++++++++++++++++++++++++++ auth/web_authn.go | 427 --------------------------------- auth/webauthn/types.go | 84 +++++++ auth/webauthn/webauthn.go | 335 ++++++++++++++++++++++++++ config/config.go | 3 +- go.mod | 2 +- go.sum | 4 +- main.go | 4 +- router/helpers.go | 10 - router/route_names.go | 1 + router/router.go | 4 + router/webauthn_routes.go | 19 ++ 15 files changed, 961 insertions(+), 484 deletions(-) create mode 100644 auth/server/helpers.go create mode 100644 auth/server/webauthn_server.go delete mode 100644 auth/web_authn.go create mode 100644 auth/webauthn/types.go create mode 100644 auth/webauthn/webauthn.go create mode 100644 router/webauthn_routes.go diff --git a/.gitignore b/.gitignore index 91cff917..53d33e53 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ certs *.pem *.bak *.backup +config.yaml.bak +config.yml.bak diff --git a/auth/auth.go b/auth/auth.go index 9e5c47a2..8cede5f9 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -1,13 +1,8 @@ package auth import ( - "context" - "log" "time" - "github.com/go-webauthn/webauthn/webauthn" - "github.com/jackc/pgx/v4" - "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/services/email" "github.com/containerish/OpenRegistry/store/postgres" @@ -38,11 +33,12 @@ type Authentication interface { ResetForgottenPassword(ctx echo.Context) error ForgotPassword(ctx echo.Context) error Invites(ctx echo.Context) error - BeginRegistration(ctx echo.Context) error - RollbackRegisteration(ctx echo.Context) error - FinishRegistration(ctx echo.Context) error - BeginLogin(ctx echo.Context) error - FinishLogin(ctx echo.Context) error + + // BeginRegistration(ctx echo.Context) error + // RollbackRegisteration(ctx echo.Context) error + // FinishRegistration(ctx echo.Context) error + // BeginLogin(ctx echo.Context) error + // FinishLogin(ctx echo.Context) error } // New is the constructor function returns an Authentication implementation @@ -61,17 +57,6 @@ func New( ghClient := gh.NewClient(nil) emailClient := email.New(&c.Email, c.WebAppEndpoint) - // Initialise the Webauthn service - webAuthN, err := webauthn.New(&webauthn.Config{ - RPDisplayName: c.WebAuthnConfig.RPDisplayName, - RPID: c.WebAuthnConfig.RPID, - RPOrigins: c.WebAuthnConfig.RPOrigins, - RPIcon: c.WebAuthnConfig.RPIcon, - }) - if err != nil { - log.Fatalf("webauthn config is missing") - } - a := &auth{ c: c, pgStore: pgStore, @@ -79,13 +64,10 @@ func New( github: githubOAuth, ghClient: ghClient, oauthStateStore: make(map[string]time.Time), - webAuthN: webAuthN, emailClient: emailClient, - txnStore: make(map[string]*webAuthNMeta), } go a.stateTokenCleanup() - go a.webAuthNTxnCleanup() return a } @@ -98,14 +80,7 @@ type ( ghClient *gh.Client oauthStateStore map[string]time.Time c *config.OpenRegistryConfig - webAuthN *webauthn.WebAuthn emailClient email.MailService - txnStore map[string]*webAuthNMeta - } - - webAuthNMeta struct { - expiresAt time.Time - txn pgx.Tx } ) @@ -121,14 +96,3 @@ func (a *auth) stateTokenCleanup() { } } } - -func (a *auth) webAuthNTxnCleanup() { - for range time.Tick(time.Second * 10) { - for username, meta := range a.txnStore { - if meta.expiresAt.Unix() <= time.Now().Unix() { - _ = meta.txn.Rollback(context.Background()) - delete(a.txnStore, username) - } - } - } -} diff --git a/auth/server/helpers.go b/auth/server/helpers.go new file mode 100644 index 00000000..6aa36954 --- /dev/null +++ b/auth/server/helpers.go @@ -0,0 +1,132 @@ +package server + +import ( + "bytes" + "crypto/sha256" + "crypto/x509" + "encoding/base32" + "fmt" + "net/http" + "os" + "strings" + "time" + + "github.com/containerish/OpenRegistry/auth" + "github.com/containerish/OpenRegistry/config" + "github.com/golang-jwt/jwt" +) + +func (wa *webauthn_server) createCookie(name string, value string, httpOnly bool, expiresAt time.Time) *http.Cookie { + + secure := true + sameSite := http.SameSiteNoneMode + domain := wa.cfg.Registry.FQDN + if wa.cfg.Environment == config.Local { + secure = false + sameSite = http.SameSiteLaxMode + domain = "localhost" + } + + cookie := &http.Cookie{ + Name: name, + Value: value, + Path: "/", + Domain: domain, + Expires: expiresAt, + Secure: secure, + SameSite: sameSite, + HttpOnly: httpOnly, + } + return cookie +} +func (wa *webauthn_server) newWebLoginToken(userId, username, tokenType string) (string, error) { + acl := auth.AccessList{ + { + Type: "repository", + Name: fmt.Sprintf("%s/*", username), + Actions: []string{"push", "pull"}, + }, + } + claims := wa.createClaims(userId, tokenType, acl) + rawPrivateKey, err := os.ReadFile(wa.cfg.Registry.TLS.PrivateKey) + if err != nil { + return "", err + } + + pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) + if err != nil { + panic(err) + } + + rawPublicKey, err := os.ReadFile(wa.cfg.Registry.TLS.PubKey) + if err != nil { + return "", err + } + + pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) + if err != nil { + panic(err) + } + + pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) + if err != nil { + return "", err + } + + hasher := sha256.New() + hasher.Write(pubKeyDerBz) + raw := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) + raw.Header["kid"] = wa.keyIDEncode(hasher.Sum(nil)[:30]) + token, err := raw.SignedString(pv) + if err != nil { + return "", err + } + + return token, nil +} + +func (wa *webauthn_server) createClaims(id, tokenType string, acl auth.AccessList) auth.Claims { + + tokenLife := time.Now().Add(time.Minute * 10).Unix() + switch tokenType { + case "access": + // TODO (jay-dee7) + // token can live for month now, but must be addressed when we implement PASETO + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "refresh": + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "service": + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "short-lived": + tokenLife = time.Now().Add(time.Minute * 30).Unix() + } + + claims := auth.Claims{ + StandardClaims: jwt.StandardClaims{ + Audience: wa.cfg.Endpoint(), + ExpiresAt: tokenLife, + Id: id, + IssuedAt: time.Now().Unix(), + Issuer: "OpenRegistry", + NotBefore: time.Now().Unix(), + Subject: id, + }, + Access: acl, + Type: tokenType, + } + return claims +} + +func (wa *webauthn_server) keyIDEncode(b []byte) string { + s := strings.TrimRight(base32.StdEncoding.EncodeToString(b), "=") + var buf bytes.Buffer + var i int + for i = 0; i < len(s)/4-1; i++ { + start := i * 4 + end := start + 4 + buf.WriteString(s[start:end] + ":") + } + + buf.WriteString(s[i*4:]) + return buf.String() +} diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go new file mode 100644 index 00000000..59f618ab --- /dev/null +++ b/auth/server/webauthn_server.go @@ -0,0 +1,370 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "net/http" + "time" + + "github.com/containerish/OpenRegistry/auth/webauthn" + "github.com/containerish/OpenRegistry/config" + "github.com/containerish/OpenRegistry/store/postgres" + "github.com/containerish/OpenRegistry/telemetry" + "github.com/containerish/OpenRegistry/types" + "github.com/google/uuid" + "github.com/jackc/pgx/v4" + "github.com/labstack/echo/v4" +) + +type ( + webauthn_server struct { + store postgres.PersistentStore + logger telemetry.Logger + cfg *config.OpenRegistryConfig + webAuthN webauthn.WebAuthnService + txnStore map[string]*webAuthNMeta + } + + webAuthNMeta struct { + expiresAt time.Time + txn pgx.Tx + } + + WebauthnServer interface { + BeginRegistration(ctx echo.Context) error + RollbackRegisteration(ctx echo.Context) error + FinishRegistration(ctx echo.Context) error + BeginLogin(ctx echo.Context) error + FinishLogin(ctx echo.Context) error + } +) + +func NewWebauthnServer(cfg *config.OpenRegistryConfig, store postgres.PersistentStore, logger telemetry.Logger) WebauthnServer { + webauthnService := webauthn.New(&cfg.WebAuthnConfig, store) + + server := &webauthn_server{ + store: store, + logger: logger, + cfg: cfg, + webAuthN: webauthnService, + txnStore: make(map[string]*webAuthNMeta), + } + + go server.webAuthNTxnCleanup() + return server +} + +func (wa *webauthn_server) webAuthNTxnCleanup() { + for range time.Tick(time.Second * 2) { + for username, meta := range wa.txnStore { + if meta.expiresAt.Unix() <= time.Now().Unix() { + _ = meta.txn.Rollback(context.Background()) + delete(wa.txnStore, username) + } + } + } +} + +func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + var user types.User + + if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid JSON object", + }) + wa.logger.Log(ctx, err) + return echoErr + } + _ = ctx.Request().Body.Close() + + err := user.Validate(false) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "invalid data provided for user login", + "code": "INVALID_CREDENTIALS", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + key := user.Email + if user.Username != "" { + key = user.Username + } + + txn, err := wa.store.NewTxn(ctx.Request().Context()) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add user", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + wa.txnStore[user.Username] = &webAuthNMeta{ + txn: txn, + expiresAt: time.Now().Add(time.Minute), + } + + existingUser, err := wa.store.GetUser(ctx.Request().Context(), key, true, nil) + if err != nil { + if errors.Unwrap(err) == pgx.ErrNoRows { + //user does not exist, create new user + user.Id = uuid.NewString() + if err = wa.store.AddUser(ctx.Request().Context(), &user, txn); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to add user", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + // set it here so that we can continue to use existingUser object + existingUser = &user + + } else { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error, failed to get user", + }) + wa.logger.Log(ctx, err) + return echoErr + } + } + + webauthnUser := &webauthn.WebAuthnUser{User: existingUser} + credentialOpts, err := wa.webAuthN.BeginRegistration(ctx.Request().Context(), webauthnUser) + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "failed to add web authn session data for existing user", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + "options": credentialOpts, + }) + + wa.logger.Log(ctx, echoErr) + return echoErr +} + +func (wa *webauthn_server) RollbackRegisteration(ctx echo.Context) error { + username := ctx.QueryParam("username") + meta, ok := wa.txnStore[username] + if !ok { + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "user txn does not exist", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr + } + + err := meta.txn.Rollback(ctx.Request().Context()) + if err != nil { + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "error": err.Error(), + "message": "user txn does not exist", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "txn rolled back successfully", + }) + + wa.logger.Log(ctx, echoErr) + return nil +} + +func (wa *webauthn_server) FinishRegistration(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + + username := ctx.QueryParam("username") + meta, ok := wa.txnStore[username] + if !ok { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": "missing begin registration step", + "message": "no user found with this username", + }) + + wa.logger.Log(ctx, nil) + return echoErr + } + + user, err := wa.store.GetUser(ctx.Request().Context(), username, false, meta.txn) + if err != nil { + _ = meta.txn.Rollback(ctx.Request().Context()) + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "no user found with this username", + }) + return echoErr + } + + opts := &webauthn.FinishRegistrationOpts{ + RequestBody: ctx.Request().Body, + User: &webauthn.WebAuthnUser{ + User: user, + }, + } + + if err = wa.webAuthN.FinishRegistration(ctx.Request().Context(), opts); err != nil { + _ = meta.txn.Rollback(ctx.Request().Context()) + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error creating webauthn credentials", + }) + wa.logger.Log(ctx, err) + return echoErr + + } + defer ctx.Request().Body.Close() + + if err = meta.txn.Commit(ctx.Request().Context()); err != nil { + _ = meta.txn.Rollback(ctx.Request().Context()) + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error storing the credential info", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr +} + +func (wa *webauthn_server) BeginLogin(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + + username := ctx.QueryParam("username") + user, err := wa.store.GetUser(ctx.Request().Context(), username, false, nil) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error: user not found", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + opts := &webauthn.BeginLoginOptions{ + RequestBody: ctx.Request().Body, + User: &webauthn.WebAuthnUser{ + User: user, + }, + } + + credentialAssertion, err := wa.webAuthN.BeginLogin(ctx.Request().Context(), opts) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error performing Webauthn login", + }) + wa.logger.Log(ctx, err) + return echoErr + } + defer ctx.Request().Body.Close() + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "options": credentialAssertion, + }) + + wa.logger.Log(ctx, echoErr) + return echoErr +} + +func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { + ctx.Set(types.HandlerStartTime, time.Now()) + + username := ctx.QueryParam("username") + user, err := wa.store.GetUser(ctx.Request().Context(), username, false, nil) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "database error: user not found", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + opts := &webauthn.FinishLoginOpts{ + RequestBody: ctx.Request().Body, + User: &webauthn.WebAuthnUser{ + User: user, + }, + } + + if err = wa.webAuthN.FinishLogin(ctx.Request().Context(), opts); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "parsing error: could not parse credential request body in finish login", + }) + wa.logger.Log(ctx, err) + return echoErr + } + defer ctx.Request().Body.Close() + + access, err := wa.newWebLoginToken(user.Id, user.Username, "access") + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error creating web login token", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + refresh, err := wa.newWebLoginToken(user.Id, user.Username, "refresh") + if err != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error creating refresh token", + }) + wa.logger.Log(ctx, err) + return echoErr + } + id := uuid.NewString() + sessionId := fmt.Sprintf("%s:%s", id, user.Id) + + if err = wa.store.AddSession(ctx.Request().Context(), id, refresh, user.Username); err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error creating session", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + sessionCookie := wa.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) + accessCookie := wa.createCookie("access", access, true, time.Now().Add(time.Hour*750)) + refreshCookie := wa.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) + ctx.SetCookie(accessCookie) + ctx.SetCookie(refreshCookie) + ctx.SetCookie(sessionCookie) + + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "Login Success", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr +} diff --git a/auth/web_authn.go b/auth/web_authn.go deleted file mode 100644 index 00465fba..00000000 --- a/auth/web_authn.go +++ /dev/null @@ -1,427 +0,0 @@ -package auth - -import ( - "context" - "encoding/json" - "errors" - "fmt" - "net/http" - "time" - - "github.com/containerish/OpenRegistry/types" - "github.com/go-webauthn/webauthn/protocol" - "github.com/go-webauthn/webauthn/webauthn" - "github.com/google/uuid" - "github.com/jackc/pgx/v4" - "github.com/labstack/echo/v4" -) - -func (a *auth) BeginRegistration(ctx echo.Context) error { - ctx.Set(types.HandlerStartTime, time.Now()) - var user types.User - - if err := json.NewDecoder(ctx.Request().Body).Decode(&user); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "invalid JSON object", - }) - a.logger.Log(ctx, err) - return echoErr - } - _ = ctx.Request().Body.Close() - - err := user.Validate(false) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "invalid data provided for user login", - "code": "INVALID_CREDENTIALS", - }) - a.logger.Log(ctx, err) - return echoErr - } - - key := user.Email - if user.Username != "" { - key = user.Username - } - - txn, err := a.pgStore.NewTxn(ctx.Request().Context()) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error, failed to add user", - }) - a.logger.Log(ctx, err) - return echoErr - } - a.txnStore[user.Username] = &webAuthNMeta{ - txn: txn, - expiresAt: time.Now().Add(time.Minute), - } - - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), key, true, nil) - if err != nil { - if errors.Unwrap(err) == pgx.ErrNoRows { - //user does not exist, create new user - user.Id = uuid.NewString() - if err = a.pgStore.AddUser(ctx.Request().Context(), &user, txn); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error, failed to add user", - }) - a.logger.Log(ctx, err) - return echoErr - } - - // set it here so that we can continue to use userFromDb object - userFromDb = &user - - } else { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error, failed to get user", - }) - a.logger.Log(ctx, err) - return echoErr - } - } - - credentialOpts, err := a.doWebAuthnRegisteration(ctx.Request().Context(), userFromDb) - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "failed to add web authn session data for existing user", - }) - a.logger.Log(ctx, err) - return echoErr - } - - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "registration successful", - "options": credentialOpts, - }) - - a.logger.Log(ctx, echoErr) - return echoErr -} - -func (a *auth) RollbackRegisteration(ctx echo.Context) error { - username := ctx.QueryParam("username") - meta, ok := a.txnStore[username] - if !ok { - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "user txn does not exist", - }) - - a.logger.Log(ctx, echoErr) - return echoErr - } - - err := meta.txn.Rollback(ctx.Request().Context()) - if err != nil { - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "error": err.Error(), - "message": "user txn does not exist", - }) - - a.logger.Log(ctx, echoErr) - return echoErr - } - - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "txn rolled back successfully", - }) - - a.logger.Log(ctx, echoErr) - return nil -} - -func (a *auth) FinishRegistration(ctx echo.Context) error { - ctx.Set(types.HandlerStartTime, time.Now()) - - username := ctx.QueryParam("username") - meta, ok := a.txnStore[username] - if !ok { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": "missing begin registration step", - "message": "no user found with this username", - }) - - a.logger.Log(ctx, nil) - return echoErr - } - - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, meta.txn) - if err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "no user found with this username", - }) - a.logger.Log(ctx, err) - return echoErr - } - - sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDB.Id, "registration") - if err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error, session data not found", - }) - a.logger.Log(ctx, err) - return echoErr - } - - parsedResponse, err := protocol.ParseCredentialCreationResponseBody(ctx.Request().Body) - if err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error parsing credential creation response body", - }) - a.logger.Log(ctx, err) - return echoErr - } - defer ctx.Request().Body.Close() - - credentials, err := a.webAuthN.CreateCredential(userFromDB, *sessionData, parsedResponse) - if err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error creating webauthn credentials", - }) - a.logger.Log(ctx, err) - return echoErr - } - - // append the credential to the User.credentials field - userFromDB.AddWebAuthNCredential(credentials) - if err = a.pgStore.AddWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id, credentials); err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "database error storing webauthn credentials", - }) - a.logger.Log(ctx, err) - return echoErr - } - - if err = meta.txn.Commit(ctx.Request().Context()); err != nil { - _ = meta.txn.Rollback(ctx.Request().Context()) - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "error storing the credential info", - }) - a.logger.Log(ctx, err) - return echoErr - } - - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "registration successful", - }) - - a.logger.Log(ctx, echoErr) - return echoErr -} - -func (a *auth) BeginLogin(ctx echo.Context) error { - ctx.Set(types.HandlerStartTime, time.Now()) - - username := ctx.QueryParam("username") - userFromDB, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, nil) - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "database error: user not found", - }) - a.logger.Log(ctx, err) - return echoErr - } - - creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDB.Id) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error getting credentials for user", - }) - a.logger.Log(ctx, err) - return echoErr - } - - // these credentials are added here because WebAuthn will try to access then via - // user.WebAuthnCredentials method - userFromDB.AddWebAuthNCredential(creds) - - credentialAssertionOpts, sessionData, err := a.webAuthN.BeginLogin( - userFromDB, - webauthn.WithAllowedCredentials(userFromDB.GetExistingPublicKeyCredentials()), - ) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error begin login", - }) - a.logger.Log(ctx, err) - return echoErr - } - - err = a.pgStore.AddWebAuthSessionData(ctx.Request().Context(), userFromDB.Id, sessionData, "authentication") - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error: storing session data while web authn begin login", - }) - a.logger.Log(ctx, err) - return echoErr - } - - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "options": &credentialAssertionOpts, - }) - a.logger.Log(ctx, echoErr) - return echoErr -} - -func (a *auth) FinishLogin(ctx echo.Context) error { - ctx.Set(types.HandlerStartTime, time.Now()) - - username := ctx.QueryParam("username") - userFromDb, err := a.pgStore.GetUser(ctx.Request().Context(), username, false, nil) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error: user not found", - }) - a.logger.Log(ctx, err) - return echoErr - } - - sessionData, err := a.pgStore.GetWebAuthNSessionData(ctx.Request().Context(), userFromDb.Id, "authentication") - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error: session data for user not found in finish login", - }) - a.logger.Log(ctx, err) - return echoErr - } - - parsedResponse, err := protocol.ParseCredentialRequestResponseBody(ctx.Request().Body) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "parsing error: could not parse credential request body in finish login", - }) - a.logger.Log(ctx, err) - return echoErr - } - defer ctx.Request().Body.Close() - - creds, err := a.pgStore.GetWebAuthNCredentials(ctx.Request().Context(), userFromDb.Id) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error getting credentials for user", - }) - a.logger.Log(ctx, err) - return echoErr - } - - userFromDb.AddWebAuthNCredential(creds) - - //Validate login gives back credential - _, err = a.webAuthN.ValidateLogin(userFromDb, *sessionData, parsedResponse) - if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "could not validate user login", - }) - a.logger.Log(ctx, err) - return echoErr - } - - access, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "access") - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "error creating web login token", - }) - a.logger.Log(ctx, err) - return echoErr - } - - refresh, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "refresh") - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "error creating refresh token", - }) - a.logger.Log(ctx, err) - return echoErr - } - id := uuid.NewString() - sessionId := fmt.Sprintf("%s:%s", id, userFromDb.Id) - - if err = a.pgStore.AddSession(ctx.Request().Context(), id, refresh, userFromDb.Username); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "error creating session", - }) - a.logger.Log(ctx, err) - return echoErr - } - - sessionCookie := a.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) - accessCookie := a.createCookie("access", access, true, time.Now().Add(time.Hour*750)) - refreshCookie := a.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) - ctx.SetCookie(accessCookie) - ctx.SetCookie(refreshCookie) - ctx.SetCookie(sessionCookie) - - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "Login Success", - }) - - a.logger.Log(ctx, echoErr) - return echoErr -} - -func (a *auth) doWebAuthnRegisteration(ctx context.Context, user *types.User) (*protocol.CredentialCreation, error) { - creds, err := a.pgStore.GetWebAuthNCredentials(ctx, user.Id) - if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { - return nil, err - } - - // User might already have few credentials. They shouldn't be considered when creating a new credential for them. - // A user can have multiple credentials - excludeList := user.GetExistingPublicKeyCredentials() - - authSelect := &protocol.AuthenticatorSelection{ - AuthenticatorAttachment: protocol.Platform, - RequireResidentKey: protocol.ResidentKeyRequired(), - UserVerification: protocol.VerificationRequired, - } - - conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) - - user.AddWebAuthNCredentials(creds) - credentialCreation, sessionData, err := a.webAuthN.BeginRegistration( - user, - webauthn.WithExclusions(excludeList), - webauthn.WithAuthenticatorSelection(*authSelect), - webauthn.WithConveyancePreference(conveyancePref), - ) - if err != nil { - return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) - } - // store session data in DB - if err = a.pgStore.AddWebAuthSessionData(ctx, user.Id, sessionData, "registration"); err != nil { - return nil, err - } - - return credentialCreation, err -} diff --git a/auth/webauthn/types.go b/auth/webauthn/types.go new file mode 100644 index 00000000..1d73a6db --- /dev/null +++ b/auth/webauthn/types.go @@ -0,0 +1,84 @@ +package webauthn + +import ( + "github.com/containerish/OpenRegistry/types" + "github.com/go-webauthn/webauthn/protocol" + "github.com/go-webauthn/webauthn/webauthn" + "github.com/google/uuid" +) + +type ( + WebAuthNSessiondata struct { + webauthn.SessionData + CredentialOwnerId string + } + + WebAuthnUser struct { + *types.User + credentials []webauthn.Credential + } +) + +// WebAuthnID - User ID according to the Relying Party +func (u *WebAuthnUser) WebAuthnID() []byte { + // TODO(jay-dee7): This will panic + userID := uuid.MustParse(u.Id) + return userID[:] +} + +// WebAuthnName - User Name according to the Relying Party +func (u *WebAuthnUser) WebAuthnName() string { + return u.Username +} + +// WebAuthnDisplayName - Display Name of the user +func (u *WebAuthnUser) WebAuthnDisplayName() string { + return u.Username +} + +// WebAuthnIcon - User's icon url +func (u *WebAuthnUser) WebAuthnIcon() string { + return u.AvatarURL +} + +// WebAuthnCredentials - Credentials owned by the user +func (u *WebAuthnUser) WebAuthnCredentials() []webauthn.Credential { + return u.credentials +} + +func (u *WebAuthnUser) AddWebAuthNCredential(creds *webauthn.Credential) { + u.credentials = append(u.credentials, *creds) +} + +func (u *WebAuthnUser) AddWebAuthNCredentials(creds ...*webauthn.Credential) { + for _, c := range creds { + if c == nil { + continue + } + + u.credentials = append(u.credentials, *c) + } +} + +func (u *WebAuthnUser) GetExistingPublicKeyCredentials() []protocol.CredentialDescriptor { + var list []protocol.CredentialDescriptor + + for _, cred := range u.credentials { + list = append(list, protocol.CredentialDescriptor{ + Type: protocol.PublicKeyCredentialType, + CredentialID: cred.ID, + }) + } + + return list +} + +func (u *WebAuthnUser) GetUnderlyingUser() *types.User { + return u.User +} + +func (u *WebAuthnUser) FromUnderlyingUser(user *types.User) *WebAuthnUser { + return &WebAuthnUser{ + User: user, + } +} diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go new file mode 100644 index 00000000..00f98f2b --- /dev/null +++ b/auth/webauthn/webauthn.go @@ -0,0 +1,335 @@ +package webauthn + +import ( + "context" + "errors" + "fmt" + "io" + "log" + "time" + + "github.com/containerish/OpenRegistry/config" + "github.com/containerish/OpenRegistry/store/postgres" + "github.com/containerish/OpenRegistry/types" + "github.com/go-webauthn/webauthn/protocol" + "github.com/go-webauthn/webauthn/webauthn" + "github.com/jackc/pgx/v4" +) + +type ( + WebAuthnService interface { + // BeginRegistration takes a WebAuthnUser and performs the "Server" logic on it. The actual work is done by + // the underlying webauthn library "github.com/go-webauthn/webauthn" but normal sanity checks are performed + // here like Only perform the "BeginRegistration" flow is the user doesn't already exist + BeginRegistration(ctx context.Context, user *WebAuthnUser) (*protocol.CredentialCreation, error) + + // FinishRegistration works like sort of a commit txn in database but in Webautnn context. + // A user must perform a BeginRegistration step before proceeding with this. + // Also, user is responsible for handling the failed and successful states for this, i.e, This method does not + // commit rollback your changes into the database. It only takes care of WebAuthn stuff + FinishRegistration(ctx context.Context, opts *FinishRegistrationOpts) error + + BeginLogin(ctx context.Context, opts *BeginLoginOptions) (*protocol.CredentialAssertion, error) + FinishLogin(ctx context.Context, opts *FinishLoginOpts) error + + // RollbackRegisteration rolls a registration back. This can be specially useful for scenarios like when the + // user does not provide input to the authentication + RollbackRegisteration(ctx context.Context, username string) error + } + + webAuthnService struct { + cfg *config.WebAuthnConfig + store postgres.WebAuthN + txnStore map[string]*webAuthNMeta + core *webauthn.WebAuthn + } + + webAuthNMeta struct { + expiresAt time.Time + txn pgx.Tx + } +) + +// Inspired from https://github.com/passwordless-id/webauthn#how-does-it-work +// More of a permalink: https://camo.githubusercontent.com/56fd16123e9cef7d5ed6994812d0edef43e13c2f4bae12a0f7e06b6b9760fd57/68747470733a2f2f70617373776f72646c6573732e69642f70726f746f636f6c732f776562617574686e2f6f766572766965772e737667 +// +// ┌────────┐ ┌─────────┐ ┌────────┐ +// │ User │ │ Browser │ │ Server │ +// └────────┘ └─────────┘ └────────┘ +// ┃ ┃ ┃ +// ┃ ┃ ┌─────────────────┐ ┃ +// ─────────┃────────────────────────────────────────┃──────────│ │──────────┃────────────── +// ─────────┃────────────────────────────────────────┃──────────│ Authentication │──────────┃────────────── +// ─────────┃────────────────────────────────────────┃──────────│ │──────────┃────────────── +// ┃ ┃ └─────────────────┘ ┃ +// ┃ ┃ ┃ +// ┃ ┃ I want to register ┃ +// ┃ ┃━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━►┃ +// ┃ ┃ ┃ +// ┃ ┃ Please send me a public key ┃ +// ┃ ┃◄--------------------------------------┃ +// ┃ Request Biometrics / Device Pin ┃ ┃ +// ┃◄───────────────────────────────────────┃ ┃ +// ┃ ┃ ┃ +// ┃ User Verified ┃ ┃ +// ┃---------------------------------------►┃ ┃ +// ┃ ┃ Cryptographic key pair ┃ +// ┃ ┃ generated ┃ +// ┃ ┃─────────┐ ┃ +// ┃ ┃ │ ┃ +// ┃ ┃◄────────┘ ┃ +// ┃ ┃ Send public key ┃ +// ┃ ┃──────────────────────────────────────►┃ +// ┃ ┃ Device registered ┃ +// ┃ ┃◄--------------------------------------┃ +// ┃ ┃ ┃ +// ┃ ┃ ┌─────────────────┐ ┃ +// ────────┃────────────────────────────────────────┃──────────│ │──────────┃────────────── +// ────────┃────────────────────────────────────────┃──────────│ Authentication │──────────┃────────────── +// ────────┃────────────────────────────────────────┃──────────│ │──────────┃────────────── +// ┃ ┃ └─────────────────┘ ┃ +// ┃ ┃ ┃ +// ┃ ┃ I want to login ┃ +// ┃ ┃━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━►┃ +// ┃ ┃ ┃ +// ┃ ┃ Here's the challenge to prove ┃ +// ┃ ┃ your identity, sign this challenge ┃ +// ┃ ┃◄--------------------------------------┃ +// ┃ Request Biometrics / Device Pin ┃ ┃ +// ┃◄───────────────────────────────────────┃ ┃ +// ┃ User Verified ┃ ┃ +// ┃---------------------------------------►┃ ┃ +// ┃ ┃ Challenge signed with ┃ +// ┃ ┃ Private Key ┃ +// ┃ ┃─────────┐ ┃ +// ┃ ┃ ┃ ┃ +// ┃ ┃◄────────┘ ┃ +// ┃ ┃ Send Signed challenge ┃ +// ┃ ┃━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━►┃ +// ┃ ┃ ┃ Verify signature +// ┃ ┃ ┃ using Public Key +// ┃ ┃ ┃─────────┐ +// ┃ ┃ ┃ │ +// ┃ ┃ ┃◄────────┘ +// ┃ ┃ Success ┃ +// ┃ ┃◄--------------------------------------┃ +// ┃ ┃ ┃ +// ┃ ┃ ┃ +// ┃ ┃ ┃ +// +// New returns a new Webauthn Service, which has simple wrappers for Signing up and registering a user +func New(cfg *config.WebAuthnConfig, store postgres.WebAuthN) WebAuthnService { + core, err := webauthn.New(&webauthn.Config{ + RPDisplayName: cfg.RPDisplayName, + RPID: cfg.RPID, + RPOrigins: cfg.RPOrigins, + RPIcon: cfg.RPIcon, + }) + if err != nil { + log.Fatalf("webauthn config is missing: %s", err) + } + + return &webAuthnService{ + cfg: cfg, + store: store, + txnStore: make(map[string]*webAuthNMeta), + core: core, + } +} + +// BeginRegistration takes a WebAuthnUser and performs the "Server" logic on it. The actual work is done by the +// underlying webauthn library "github.com/go-webauthn/webauthn" but normal sanity checks are performed here like +// Only perform the "BeginRegistration" flow is the user doesn't already exist +func (wa *webAuthnService) BeginRegistration( + ctx context.Context, + user *WebAuthnUser, +) (*protocol.CredentialCreation, error) { + creds, err := wa.store.GetWebAuthNCredentials(ctx, user.Id) + if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { + return nil, err + } + + // User might already have few credentials. They shouldn't be considered when creating a new credential for them. + // A user can have multiple credentials + excludeList := user.GetExistingPublicKeyCredentials() + + authSelect := &protocol.AuthenticatorSelection{ + AuthenticatorAttachment: protocol.Platform, + RequireResidentKey: protocol.ResidentKeyRequired(), + UserVerification: protocol.VerificationRequired, + } + + conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) + + user.AddWebAuthNCredentials(creds) + credentialCreation, sessionData, err := wa.core.BeginRegistration( + user, + webauthn.WithExclusions(excludeList), + webauthn.WithAuthenticatorSelection(*authSelect), + webauthn.WithConveyancePreference(conveyancePref), + ) + if err != nil { + return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) + } + // store session data in DB + if err = wa.store.AddWebAuthSessionData(ctx, user.Id, sessionData, "registration"); err != nil { + return nil, err + } + + return credentialCreation, err +} + +func (wa *webAuthnService) RollbackRegisteration(ctx context.Context, username string) error { + meta, ok := wa.txnStore[username] + if !ok { + return fmt.Errorf("ERR_ROLLBACK_REGISTRATION: txn does not exist") + } + + err := meta.txn.Rollback(ctx) + if err != nil { + return err + } + + return nil +} + +type FinishRegistrationOpts struct { + RequestBody io.Reader + User *WebAuthnUser +} + +// FinishRegistration works like sort of a commit txn in database but in Webautnn context. +// A user must perform a BeginRegistration step before proceeding with this. +// Also, user is responsible for handling the failed and successful states for this, i.e, This method does not commit +// rollback your changes into the database. It only takes care of WebAuthn stuff +func (wa *webAuthnService) FinishRegistration(ctx context.Context, opts *FinishRegistrationOpts) error { + sessionData, err := wa.store.GetWebAuthNSessionData(ctx, opts.User.Id, "registration") + if err != nil { + return err + } + + parsedResponse, err := protocol.ParseCredentialCreationResponseBody(opts.RequestBody) + if err != nil { + return err + } + + credentials, err := wa.core.CreateCredential(opts.User, *sessionData, parsedResponse) + if err != nil { + return err + } + + // append the credential to the User.credentials field + opts.User.AddWebAuthNCredential(credentials) + if err = wa.store.AddWebAuthNCredentials(ctx, opts.User.Id, credentials); err != nil { + return err + } + + return nil +} + +type BeginLoginOptions struct { + RequestBody io.Reader + User *WebAuthnUser +} + +func (wa *webAuthnService) BeginLogin( + ctx context.Context, + opts *BeginLoginOptions, +) (*protocol.CredentialAssertion, error) { + creds, err := wa.store.GetWebAuthNCredentials(ctx, opts.User.Id) + if err != nil { + return nil, err + } + + // these credentials are added here because WebAuthn will try to access then via + // user.WebAuthnCredentials method + opts.User.AddWebAuthNCredential(creds) + + credentialAssertionOpts, sessionData, err := wa.core.BeginLogin( + opts.User, + webauthn.WithAllowedCredentials(opts.User.GetExistingPublicKeyCredentials()), + ) + if err != nil { + return nil, err + } + + err = wa.store.AddWebAuthSessionData(ctx, opts.User.Id, sessionData, "authentication") + if err != nil { + return nil, err + } + + return credentialAssertionOpts, nil +} + +type FinishLoginOpts struct { + RequestBody io.Reader + User *WebAuthnUser +} + +// FinishLogin checks if begin login was performed successfully, parsed the request from the io.Reader, +// and then validates that request. If all is good, then we return nil, anything else, causes it to return an error +func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpts) error { + sessionData, err := wa.store.GetWebAuthNSessionData(ctx, opts.User.Id, "authentication") + if err != nil { + return err + } + + parsedResponse, err := protocol.ParseCredentialRequestResponseBody(opts.RequestBody) + if err != nil { + return err + } + + creds, err := wa.store.GetWebAuthNCredentials(ctx, opts.User.Id) + if err != nil { + return err + } + + opts.User.AddWebAuthNCredential(creds) + + //Validate login gives back credential + _, err = wa.core.ValidateLogin(opts.User, *sessionData, parsedResponse) + if err != nil { + return err + } + + return nil +} + +func (wa *webAuthnService) doWebAuthnRegisteration( + ctx context.Context, + user *types.User, +) (*protocol.CredentialCreation, error) { + creds, err := wa.store.GetWebAuthNCredentials(ctx, user.Id) + if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { + return nil, err + } + + // User might already have few credentials. They shouldn't be considered when creating a new credential for them. + // A user can have multiple credentials + excludeList := user.GetExistingPublicKeyCredentials() + + authSelect := &protocol.AuthenticatorSelection{ + AuthenticatorAttachment: protocol.Platform, + RequireResidentKey: protocol.ResidentKeyRequired(), + UserVerification: protocol.VerificationRequired, + } + + conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) + + user.AddWebAuthNCredentials(creds) + credentialCreation, sessionData, err := wa.core.BeginRegistration( + user, + webauthn.WithExclusions(excludeList), + webauthn.WithAuthenticatorSelection(*authSelect), + webauthn.WithConveyancePreference(conveyancePref), + ) + if err != nil { + return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) + } + // store session data in DB + if err = wa.store.AddWebAuthSessionData(ctx, user.Id, sessionData, "registration"); err != nil { + return nil, err + } + + return credentialCreation, err +} diff --git a/config/config.go b/config/config.go index 13920039..228af478 100644 --- a/config/config.go +++ b/config/config.go @@ -109,7 +109,8 @@ type ( RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` RPID string `yaml:"rp_id" mapstructure:"rp_id"` RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` - RPOrigins []string `yaml:"rp_origin" mapstructure:"rp_origin"` + RPOrigins []string `yaml:"rp_origins" mapstructure:"rp_origins"` + Enabled bool `yaml:"enabled" mapstructure:"enabled"` } ) diff --git a/go.mod b/go.mod index 084ce204..ad85f857 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.12.0 - github.com/go-webauthn/webauthn v0.6.0 + github.com/go-webauthn/webauthn v0.7.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/google/go-github/v42 v42.0.0 github.com/google/uuid v1.3.0 diff --git a/go.sum b/go.sum index 9fb0eb13..e1beb6e9 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,8 @@ github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6A github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-webauthn/revoke v0.1.6 h1:3tv+itza9WpX5tryRQx4GwxCCBrCIiJ8GIkOhxiAmmU= github.com/go-webauthn/revoke v0.1.6/go.mod h1:TB4wuW4tPlwgF3znujA96F70/YSQXHPPWl7vgY09Iy8= -github.com/go-webauthn/webauthn v0.6.0 h1:uLInMApSvBfP+vEFasNE0rnVPG++fjp7lmAIvNhe+UU= -github.com/go-webauthn/webauthn v0.6.0/go.mod h1:7edMRZXwuM6JIVjN68G24Bzt+bPCvTmjiL0j+cAmXtY= +github.com/go-webauthn/webauthn v0.7.0 h1:Tk2evkiZGtmbgGoYUbNw2BbPyI8e65tfi8HY9mSluWA= +github.com/go-webauthn/webauthn v0.7.0/go.mod h1:FrFAvvr9oP+tXr1WeDpRz/rYJi5GRG0/EVFfpN7YhKA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= diff --git a/main.go b/main.go index 67b6add0..87a2f0a1 100644 --- a/main.go +++ b/main.go @@ -4,6 +4,7 @@ import ( "os" "github.com/containerish/OpenRegistry/auth" + auth_server "github.com/containerish/OpenRegistry/auth/server" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/dfs/client" "github.com/containerish/OpenRegistry/registry/v2" @@ -39,6 +40,7 @@ func main() { logger := telemetry.ZLogger(fluentBitCollector, cfg.Environment) authSvc := auth.New(cfg, pgStore, logger) + webauthnServer := auth_server.NewWebauthnServer(cfg, pgStore, logger) dfs := client.NewDFSBackend(&cfg.DFS) reg, err := registry.NewRegistry(pgStore, dfs, logger, cfg) @@ -53,7 +55,7 @@ func main() { return } - router.Register(cfg, e, reg, authSvc, ext) + router.Register(cfg, e, reg, authSvc, webauthnServer, ext) color.Red("error initialising OpenRegistry Server: %s", buildHTTPServer(cfg, e)) } diff --git a/router/helpers.go b/router/helpers.go index d9b34f03..0c6351ae 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -8,11 +8,8 @@ import ( ) // These are helper functions to Register depending on the usability - // RegisterAuthRoutes includes all the auth related endpoints func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { - - //send-email/welcome authRouter.Add(http.MethodPost, "/signup", authSvc.SignUp) authRouter.Add(http.MethodPost, "/send-email/welcome", authSvc.Invites) authRouter.Add(http.MethodGet, "/signup/verify", authSvc.VerifyEmail) @@ -25,11 +22,4 @@ func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { authRouter.Add(http.MethodPost, "/reset-password", authSvc.ResetPassword, authSvc.JWT()) authRouter.Add(http.MethodPost, "/reset-forgotten-password", authSvc.ResetForgottenPassword, authSvc.JWT()) authRouter.Add(http.MethodGet, "/forgot-password", authSvc.ForgotPassword) - - webAuthnRouter := authRouter.Group("/webauthn") - webAuthnRouter.Add(http.MethodPost, "/registration/begin", authSvc.BeginRegistration) - webAuthnRouter.Add(http.MethodDelete, "/registration/rollback", authSvc.RollbackRegisteration) - webAuthnRouter.Add(http.MethodPost, "/registration/finish", authSvc.FinishRegistration) - webAuthnRouter.Add(http.MethodGet, "/login/begin", authSvc.BeginLogin) - webAuthnRouter.Add(http.MethodPost, "/login/finish", authSvc.FinishLogin) } diff --git a/router/route_names.go b/router/route_names.go index 88ebd93a..b035692a 100644 --- a/router/route_names.go +++ b/router/route_names.go @@ -14,6 +14,7 @@ const ( // authentication mechanisms Auth = "/auth" + Webauthn = Auth + "/webauthn" //Beta endpoint refers to the experimental code and features under observation // not to be released or exposed to public Beta = "/beta" diff --git a/router/router.go b/router/router.go index 7b79e79a..2201761b 100644 --- a/router/router.go +++ b/router/router.go @@ -6,6 +6,7 @@ import ( "time" "github.com/containerish/OpenRegistry/auth" + auth_server "github.com/containerish/OpenRegistry/auth/server" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/registry/v2" "github.com/containerish/OpenRegistry/registry/v2/extensions" @@ -22,6 +23,7 @@ func Register( e *echo.Echo, reg registry.Registry, authSvc auth.Authentication, + webauthnServer auth_server.WebauthnServer, ext extensions.Extenion, ) { e.Use(middleware.Recover()) @@ -54,6 +56,7 @@ func Register( authRouter := e.Group(Auth) githubRouter := authRouter.Group("/github") + webauthnRouter := e.Group(Webauthn) v2Router.Add(http.MethodGet, Root, reg.ApiVersion) @@ -65,6 +68,7 @@ func Register( RegisterNSRoutes(nsRouter, reg) RegisterAuthRoutes(authRouter, authSvc) Extensions(v2Router, reg, ext, authSvc.JWT()) + RegisterWebauthnRoutes(webauthnRouter, webauthnServer) //catch-all will redirect user back to web interface e.Add(http.MethodGet, "/", func(ctx echo.Context) error { diff --git a/router/webauthn_routes.go b/router/webauthn_routes.go new file mode 100644 index 00000000..8ea44f10 --- /dev/null +++ b/router/webauthn_routes.go @@ -0,0 +1,19 @@ +package router + +import ( + "net/http" + + auth_server "github.com/containerish/OpenRegistry/auth/server" + "github.com/labstack/echo/v4" +) + +func RegisterWebauthnRoutes( + router *echo.Group, + webauthnServer auth_server.WebauthnServer, +) { + router.Add(http.MethodPost, "/registration/begin", webauthnServer.BeginRegistration) + router.Add(http.MethodDelete, "/registration/rollback", webauthnServer.RollbackRegisteration) + router.Add(http.MethodPost, "/registration/finish", webauthnServer.FinishRegistration) + router.Add(http.MethodGet, "/login/begin", webauthnServer.BeginLogin) + router.Add(http.MethodPost, "/login/finish", webauthnServer.FinishLogin) +} From 52276fb98e44d2a54ad2dc28dcd6d1d5eb193b2c Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sun, 5 Feb 2023 21:52:30 +0530 Subject: [PATCH 09/19] refactor: Export methods from auth package We have some utility methods in `auth` package which can be used in different packages. We now make rewrite those methods as public functions. --- auth/auth.go | 6 - auth/helpers.go | 176 +++++++++++++++++++++++ auth/jwt.go | 247 +++++++++++++++------------------ auth/renew.go | 10 +- auth/reset_password.go | 14 +- auth/server/helpers.go | 132 ------------------ auth/server/webauthn_server.go | 67 +++++++-- auth/signin.go | 21 ++- auth/verify_email.go | 22 ++- auth/webauthn/webauthn.go | 1 + store/postgres/users.go | 7 + 11 files changed, 413 insertions(+), 290 deletions(-) create mode 100644 auth/helpers.go delete mode 100644 auth/server/helpers.go diff --git a/auth/auth.go b/auth/auth.go index 8cede5f9..704e56f2 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -33,12 +33,6 @@ type Authentication interface { ResetForgottenPassword(ctx echo.Context) error ForgotPassword(ctx echo.Context) error Invites(ctx echo.Context) error - - // BeginRegistration(ctx echo.Context) error - // RollbackRegisteration(ctx echo.Context) error - // FinishRegistration(ctx echo.Context) error - // BeginLogin(ctx echo.Context) error - // FinishLogin(ctx echo.Context) error } // New is the constructor function returns an Authentication implementation diff --git a/auth/helpers.go b/auth/helpers.go new file mode 100644 index 00000000..56de8f93 --- /dev/null +++ b/auth/helpers.go @@ -0,0 +1,176 @@ +package auth + +import ( + "bytes" + "crypto/rsa" + "crypto/sha256" + "crypto/x509" + "encoding/base32" + "fmt" + "net/http" + "os" + "strings" + "time" + + "github.com/containerish/OpenRegistry/config" + "github.com/golang-jwt/jwt" +) + +type CreateCookieOptions struct { + ExpiresAt time.Time + Name string + Value string + FQDN string + Environment config.Environment + HTTPOnly bool +} + +func CreateCookie(opts *CreateCookieOptions) *http.Cookie { + secure := true + sameSite := http.SameSiteNoneMode + domain := opts.FQDN + if opts.Environment == config.Local { + secure = false + sameSite = http.SameSiteLaxMode + domain = "localhost" + } + + return &http.Cookie{ + Name: opts.Name, + Value: opts.Value, + Path: "/", + Domain: domain, + Expires: opts.ExpiresAt, + Secure: secure, + SameSite: sameSite, + HttpOnly: opts.HTTPOnly, + } +} + +const ( + OpenRegistryIssuer = "OpenRegistry" +) + +func ReadRSAKeyPair(privKeyPath, pubKeyPath string) (*rsa.PrivateKey, *rsa.PublicKey, error) { + rawPrivateKey, err := os.ReadFile(privKeyPath) + if err != nil { + return nil, nil, err + } + + privKey, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) + if err != nil { + return nil, nil, err + } + + rawPublicKey, err := os.ReadFile(pubKeyPath) + if err != nil { + return nil, nil, err + } + + pubKey, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) + if err != nil { + return nil, nil, err + } + + return privKey, pubKey, nil +} + +type WebLoginJWTOptions struct { + Id string + Username string + TokenType string + Audience string + Privkey string + Pubkey string +} + +func NewWebLoginToken(opts *WebLoginJWTOptions) (string, error) { + acl := AccessList{ + { + Type: "repository", + Name: fmt.Sprintf("%s/*", opts.Username), + Actions: []string{"push", "pull"}, + }, + } + + claims := CreateClaims(&CreateClaimOptions{ + Audience: opts.Audience, + Issuer: OpenRegistryIssuer, + Id: opts.Id, + TokeType: opts.TokenType, + Acl: acl, + }) + + privKey, pubKey, err := ReadRSAKeyPair(opts.Privkey, opts.Pubkey) + if err != nil { + return "", err + } + + pubkeyDER, err := x509.MarshalPKIXPublicKey(pubKey) + if err != nil { + return "", err + } + + hasher := sha256.New() + hasher.Write(pubkeyDER) + raw := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) + raw.Header["kid"] = KeyIDEncode(hasher.Sum(nil)[:30]) + token, err := raw.SignedString(privKey) + if err != nil { + return "", err + } + + return token, nil +} + +type CreateClaimOptions struct { + Audience string + Issuer string + Id string + TokeType string + Acl AccessList +} + +func CreateClaims(opts *CreateClaimOptions) Claims { + tokenLife := time.Now().Add(time.Minute * 10).Unix() + switch opts.TokeType { + case "access": + // TODO (jay-dee7) + // token can live for month now, but must be addressed when we implement PASETO + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "refresh": + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "service": + tokenLife = time.Now().Add(time.Hour * 750).Unix() + case "short-lived": + tokenLife = time.Now().Add(time.Minute * 30).Unix() + } + + return Claims{ + StandardClaims: jwt.StandardClaims{ + Audience: opts.Audience, + ExpiresAt: tokenLife, + Id: opts.Id, + IssuedAt: time.Now().Unix(), + Issuer: opts.Issuer, + NotBefore: time.Now().Unix(), + Subject: opts.Id, + }, + Access: opts.Acl, + Type: opts.TokeType, + } +} + +func KeyIDEncode(b []byte) string { + s := strings.TrimRight(base32.StdEncoding.EncodeToString(b), "=") + var buf bytes.Buffer + var i int + for i = 0; i < len(s)/4-1; i++ { + start := i * 4 + end := start + 4 + buf.WriteString(s[start:end] + ":") + } + + buf.WriteString(s[i*4:]) + return buf.String() +} diff --git a/auth/jwt.go b/auth/jwt.go index e32e70d6..7822d021 100644 --- a/auth/jwt.go +++ b/auth/jwt.go @@ -46,7 +46,15 @@ func (a *auth) newPublicPullToken() (string, error) { }, } - claims := a.createClaims("public_pull_user", "", acl) + opts := &CreateClaimOptions{ + Audience: a.c.Registry.FQDN, + Issuer: OpenRegistryIssuer, + Id: "public_pull_user", + TokeType: "service_token", + Acl: acl, + } + + claims := CreateClaims(opts) // TODO (jay-dee7)- handle this properly, check for errors and don't set defaults for actions claims.Access[0].Actions = []string{"pull"} @@ -80,7 +88,7 @@ func (a *auth) newPublicPullToken() (string, error) { hasher.Write(pubKeyDerBz) // token := jwt.NewWithClaims(jwt.SigningMethodHS256, &claims) - token := jwt.NewWithClaims(jwt.SigningMethodRS256, &claims) + token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) token.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) sign, err := token.SignedString(pv) if err != nil { @@ -111,44 +119,28 @@ func (a *auth) newOAuthToken(userId string, payload *oauth2.Token) (string, stri accessClaims := a.createOAuthClaims(userId, payload) refreshClaims := a.createRefreshClaims(userId) - rawPrivateKey, err := os.ReadFile(a.c.Registry.TLS.PrivateKey) - if err != nil { - return "", "", err - } - pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) - if err != nil { - panic(err) - } - - rawPublicKey, err := os.ReadFile(a.c.Registry.TLS.PubKey) + privKey, pubKey, err := ReadRSAKeyPair(a.c.Registry.TLS.PrivateKey, a.c.Registry.TLS.PubKey) if err != nil { return "", "", err } - pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) - if err != nil { - panic(err) - } - - pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) + pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pubKey) if err != nil { return "", "", err } hasher := sha256.New() hasher.Write(pubKeyDerBz) - // accessToken := jwt.NewWithClaims(jwt.SigningMethodHS256, &accessClaims) accessToken := jwt.NewWithClaims(jwt.SigningMethodRS256, &accessClaims) accessToken.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) - accessSign, err := accessToken.SignedString(pv) + accessSign, err := accessToken.SignedString(privKey) if err != nil { return "", "", fmt.Errorf("ERR_ACCESS_TOKEN_SIGN: %w", err) } - // refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, &refreshClaims) refreshToken := jwt.NewWithClaims(jwt.SigningMethodRS256, &refreshClaims) refreshToken.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) - refreshSign, err := refreshToken.SignedString(pv) + refreshSign, err := refreshToken.SignedString(privKey) if err != nil { return "", "", fmt.Errorf("ERR_REFRESH_TOKEN_SIGN: %w", err) } @@ -166,28 +158,21 @@ func (a *auth) newServiceToken(u types.User) (string, error) { Actions: []string{"push", "pull"}, }, } - claims := a.createClaims(u.Id, "service", acl) - rawPrivateKey, err := os.ReadFile(a.c.Registry.TLS.PrivateKey) - if err != nil { - return "", err + opts := &CreateClaimOptions{ + Audience: a.c.Registry.FQDN, + Issuer: OpenRegistryIssuer, + Id: u.Id, + TokeType: "service_token", + Acl: acl, } + claims := CreateClaims(opts) - pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) - if err != nil { - panic(err) - } - - rawPublicKey, err := os.ReadFile(a.c.Registry.TLS.PubKey) + privKey, pubKey, err := ReadRSAKeyPair(a.c.Registry.TLS.PrivateKey, a.c.Registry.TLS.PubKey) if err != nil { return "", err } - pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) - if err != nil { - panic(err) - } - - pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) + pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pubKey) if err != nil { return "", err } @@ -197,7 +182,7 @@ func (a *auth) newServiceToken(u types.User) (string, error) { // token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) token.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) - sign, err := token.SignedString(pv) + sign, err := token.SignedString(privKey) if err != nil { return "", fmt.Errorf("error signing secret %w", err) } @@ -205,52 +190,52 @@ func (a *auth) newServiceToken(u types.User) (string, error) { return sign, nil } -func (a *auth) newWebLoginToken(userId, username, tokenType string) (string, error) { - acl := AccessList{ - { - Type: "repository", - Name: fmt.Sprintf("%s/*", username), - Actions: []string{"push", "pull"}, - }, - } - claims := a.createClaims(userId, tokenType, acl) - rawPrivateKey, err := os.ReadFile(a.c.Registry.TLS.PrivateKey) - if err != nil { - return "", err - } - - pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) - if err != nil { - panic(err) - } - - rawPublicKey, err := os.ReadFile(a.c.Registry.TLS.PubKey) - if err != nil { - return "", err - } - - pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) - if err != nil { - panic(err) - } - - pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) - if err != nil { - return "", err - } - - hasher := sha256.New() - hasher.Write(pubKeyDerBz) - // raw := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) - raw := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) - raw.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) - token, err := raw.SignedString(pv) - if err != nil { - return "", err - } - - return token, nil -} +// func (a *auth) newWebLoginToken(userId, username, tokenType string) (string, error) { +// acl := AccessList{ +// { +// Type: "repository", +// Name: fmt.Sprintf("%s/*", username), +// Actions: []string{"push", "pull"}, +// }, +// } +// claims := a.createClaims(userId, tokenType, acl) +// rawPrivateKey, err := os.ReadFile(a.c.Registry.TLS.PrivateKey) +// if err != nil { +// return "", err +// } +// +// pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) +// if err != nil { +// panic(err) +// } +// +// rawPublicKey, err := os.ReadFile(a.c.Registry.TLS.PubKey) +// if err != nil { +// return "", err +// } +// +// pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) +// if err != nil { +// panic(err) +// } +// +// pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) +// if err != nil { +// return "", err +// } +// +// hasher := sha256.New() +// hasher.Write(pubKeyDerBz) +// // raw := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) +// raw := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) +// raw.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) +// token, err := raw.SignedString(pv) +// if err != nil { +// return "", err +// } +// +// return token, nil +// } // nolint func (a *auth) createServiceClaims(u types.User) ServiceClaims { @@ -321,31 +306,25 @@ func (a *auth) newToken(u *types.User) (string, error) { Actions: []string{"push", "pull"}, }, } - rawPrivateKey, err := os.ReadFile(a.c.Registry.TLS.PrivateKey) - if err != nil { - return "", err - } - pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) - if err != nil { - panic(err) - } - claims := a.createClaims(u.Id, "access", acl) - - rawPublicKey, err := os.ReadFile(a.c.Registry.TLS.PubKey) + privKey, pubKey, err := ReadRSAKeyPair(a.c.Registry.TLS.PrivateKey, a.c.Registry.TLS.PubKey) if err != nil { return "", err } - pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) + pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pubKey) if err != nil { - panic(err) + return "", err } - pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) - if err != nil { - return "", err + opts := &CreateClaimOptions{ + Audience: a.c.Registry.FQDN, + Issuer: OpenRegistryIssuer, + Id: u.Id, + TokeType: "access_token", + Acl: acl, } + claims := CreateClaims(opts) hasher := sha256.New() hasher.Write(pubKeyDerBz) @@ -354,7 +333,7 @@ func (a *auth) newToken(u *types.User) (string, error) { token.Header["kid"] = a.keyIDEncode(hasher.Sum(nil)[:30]) // Generate encoded token and send it as response. - t, err := token.SignedString(pv) + t, err := token.SignedString(privKey) if err != nil { return "", err @@ -386,38 +365,38 @@ claims format ] } */ -func (a *auth) createClaims(id, tokenType string, acl AccessList) Claims { - - tokenLife := time.Now().Add(time.Minute * 10).Unix() - switch tokenType { - case "access": - // TODO (jay-dee7) - // token can live for month now, but must be addressed when we implement PASETO - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "refresh": - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "service": - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "short-lived": - tokenLife = time.Now().Add(time.Minute * 30).Unix() - } - - claims := Claims{ - StandardClaims: jwt.StandardClaims{ - Audience: a.c.Endpoint(), - ExpiresAt: tokenLife, - Id: id, - IssuedAt: time.Now().Unix(), - Issuer: "OpenRegistry", - NotBefore: time.Now().Unix(), - Subject: id, - }, - Access: acl, - Type: tokenType, - } - return claims -} - +// func (a *auth) createClaims(id, tokenType string, acl AccessList) Claims { +// +// tokenLife := time.Now().Add(time.Minute * 10).Unix() +// switch tokenType { +// case "access": +// // TODO (jay-dee7) +// // token can live for month now, but must be addressed when we implement PASETO +// tokenLife = time.Now().Add(time.Hour * 750).Unix() +// case "refresh": +// tokenLife = time.Now().Add(time.Hour * 750).Unix() +// case "service": +// tokenLife = time.Now().Add(time.Hour * 750).Unix() +// case "short-lived": +// tokenLife = time.Now().Add(time.Minute * 30).Unix() +// } +// +// claims := Claims{ +// StandardClaims: jwt.StandardClaims{ +// Audience: a.c.Endpoint(), +// ExpiresAt: tokenLife, +// Id: id, +// IssuedAt: time.Now().Unix(), +// Issuer: "OpenRegistry", +// NotBefore: time.Now().Unix(), +// Subject: id, +// }, +// Access: acl, +// Type: tokenType, +// } +// return claims +// } +// type AccessList []struct { Type string `json:"type"` Name string `json:"name"` diff --git a/auth/renew.go b/auth/renew.go index 1e09a29b..c850e9de 100644 --- a/auth/renew.go +++ b/auth/renew.go @@ -86,7 +86,15 @@ func (a *auth) RenewAccessToken(ctx echo.Context) error { return echoErr } - tokenString, err := a.newWebLoginToken(userId, user.Username, "access") + opts := &WebLoginJWTOptions{ + Id: userId, + Username: user.Username, + TokenType: "access_token", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + tokenString, err := NewWebLoginToken(opts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), diff --git a/auth/reset_password.go b/auth/reset_password.go index b652e03c..acfdc8c1 100644 --- a/auth/reset_password.go +++ b/auth/reset_password.go @@ -62,7 +62,7 @@ func (a *auth) ResetForgottenPassword(ctx echo.Context) error { if err = types.ValidatePassword(pwd.NewPassword); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": `password must be alphanumeric, at least 8 chars long, must have at least one special character + "message": `password must be alphanumeric, at least 8 chars long, must have at least one special character and an uppercase letter`, }) a.logger.Log(ctx, err) @@ -188,7 +188,7 @@ func (a *auth) ResetPassword(ctx echo.Context) error { if err = types.ValidatePassword(pwd.NewPassword); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": `password must be alphanumeric, at least 8 chars long, must have at least one special character + "message": `password must be alphanumeric, at least 8 chars long, must have at least one special character and an uppercase letter`, }) a.logger.Log(ctx, err) @@ -247,7 +247,15 @@ func (a *auth) ForgotPassword(ctx echo.Context) error { }) } - token, err := a.newWebLoginToken(user.Id, user.Username, "short-lived") + opts := &WebLoginJWTOptions{ + Id: user.Id, + Username: user.Username, + TokenType: "access_token", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + token, err := NewWebLoginToken(opts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), diff --git a/auth/server/helpers.go b/auth/server/helpers.go deleted file mode 100644 index 6aa36954..00000000 --- a/auth/server/helpers.go +++ /dev/null @@ -1,132 +0,0 @@ -package server - -import ( - "bytes" - "crypto/sha256" - "crypto/x509" - "encoding/base32" - "fmt" - "net/http" - "os" - "strings" - "time" - - "github.com/containerish/OpenRegistry/auth" - "github.com/containerish/OpenRegistry/config" - "github.com/golang-jwt/jwt" -) - -func (wa *webauthn_server) createCookie(name string, value string, httpOnly bool, expiresAt time.Time) *http.Cookie { - - secure := true - sameSite := http.SameSiteNoneMode - domain := wa.cfg.Registry.FQDN - if wa.cfg.Environment == config.Local { - secure = false - sameSite = http.SameSiteLaxMode - domain = "localhost" - } - - cookie := &http.Cookie{ - Name: name, - Value: value, - Path: "/", - Domain: domain, - Expires: expiresAt, - Secure: secure, - SameSite: sameSite, - HttpOnly: httpOnly, - } - return cookie -} -func (wa *webauthn_server) newWebLoginToken(userId, username, tokenType string) (string, error) { - acl := auth.AccessList{ - { - Type: "repository", - Name: fmt.Sprintf("%s/*", username), - Actions: []string{"push", "pull"}, - }, - } - claims := wa.createClaims(userId, tokenType, acl) - rawPrivateKey, err := os.ReadFile(wa.cfg.Registry.TLS.PrivateKey) - if err != nil { - return "", err - } - - pv, err := jwt.ParseRSAPrivateKeyFromPEM(rawPrivateKey) - if err != nil { - panic(err) - } - - rawPublicKey, err := os.ReadFile(wa.cfg.Registry.TLS.PubKey) - if err != nil { - return "", err - } - - pb, err := jwt.ParseRSAPublicKeyFromPEM(rawPublicKey) - if err != nil { - panic(err) - } - - pubKeyDerBz, err := x509.MarshalPKIXPublicKey(pb) - if err != nil { - return "", err - } - - hasher := sha256.New() - hasher.Write(pubKeyDerBz) - raw := jwt.NewWithClaims(jwt.SigningMethodRS256, claims) - raw.Header["kid"] = wa.keyIDEncode(hasher.Sum(nil)[:30]) - token, err := raw.SignedString(pv) - if err != nil { - return "", err - } - - return token, nil -} - -func (wa *webauthn_server) createClaims(id, tokenType string, acl auth.AccessList) auth.Claims { - - tokenLife := time.Now().Add(time.Minute * 10).Unix() - switch tokenType { - case "access": - // TODO (jay-dee7) - // token can live for month now, but must be addressed when we implement PASETO - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "refresh": - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "service": - tokenLife = time.Now().Add(time.Hour * 750).Unix() - case "short-lived": - tokenLife = time.Now().Add(time.Minute * 30).Unix() - } - - claims := auth.Claims{ - StandardClaims: jwt.StandardClaims{ - Audience: wa.cfg.Endpoint(), - ExpiresAt: tokenLife, - Id: id, - IssuedAt: time.Now().Unix(), - Issuer: "OpenRegistry", - NotBefore: time.Now().Unix(), - Subject: id, - }, - Access: acl, - Type: tokenType, - } - return claims -} - -func (wa *webauthn_server) keyIDEncode(b []byte) string { - s := strings.TrimRight(base32.StdEncoding.EncodeToString(b), "=") - var buf bytes.Buffer - var i int - for i = 0; i < len(s)/4-1; i++ { - start := i * 4 - end := start + 4 - buf.WriteString(s[start:end] + ":") - } - - buf.WriteString(s[i*4:]) - return buf.String() -} diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go index 59f618ab..d127b55f 100644 --- a/auth/server/webauthn_server.go +++ b/auth/server/webauthn_server.go @@ -8,6 +8,7 @@ import ( "net/http" "time" + "github.com/containerish/OpenRegistry/auth" "github.com/containerish/OpenRegistry/auth/webauthn" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/store/postgres" @@ -41,7 +42,11 @@ type ( } ) -func NewWebauthnServer(cfg *config.OpenRegistryConfig, store postgres.PersistentStore, logger telemetry.Logger) WebauthnServer { +func NewWebauthnServer( + cfg *config.OpenRegistryConfig, + store postgres.PersistentStore, + logger telemetry.Logger, +) WebauthnServer { webauthnService := webauthn.New(&cfg.WebAuthnConfig, store) server := &webauthn_server{ @@ -323,7 +328,25 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { } defer ctx.Request().Body.Close() - access, err := wa.newWebLoginToken(user.Id, user.Username, "access") + accessTokenOpts := &auth.WebLoginJWTOptions{ + Id: user.Id, + Username: username, + TokenType: "access_token", + Audience: wa.cfg.Registry.FQDN, + Privkey: wa.cfg.Registry.TLS.PrivateKey, + Pubkey: wa.cfg.Registry.TLS.PubKey, + } + + refreshTokenOpts := &auth.WebLoginJWTOptions{ + Id: user.Id, + Username: username, + TokenType: "refresh_token", + Audience: wa.cfg.Registry.FQDN, + Privkey: wa.cfg.Registry.TLS.PrivateKey, + Pubkey: wa.cfg.Registry.TLS.PubKey, + } + + accessToken, err := auth.NewWebLoginToken(accessTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), @@ -333,7 +356,7 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { return echoErr } - refresh, err := wa.newWebLoginToken(user.Id, user.Username, "refresh") + refreshToken, err := auth.NewWebLoginToken(refreshTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), @@ -345,7 +368,7 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { id := uuid.NewString() sessionId := fmt.Sprintf("%s:%s", id, user.Id) - if err = wa.store.AddSession(ctx.Request().Context(), id, refresh, user.Username); err != nil { + if err = wa.store.AddSession(ctx.Request().Context(), id, refreshToken, user.Username); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error creating session", @@ -354,12 +377,36 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { return echoErr } - sessionCookie := wa.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) - accessCookie := wa.createCookie("access", access, true, time.Now().Add(time.Hour*750)) - refreshCookie := wa.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) - ctx.SetCookie(accessCookie) - ctx.SetCookie(refreshCookie) - ctx.SetCookie(sessionCookie) + sessionIdCookie := auth.CreateCookie(&auth.CreateCookieOptions{ + ExpiresAt: time.Now().Add(time.Hour), //one month + Name: "session_id", + Value: sessionId, + FQDN: wa.cfg.Registry.FQDN, + Environment: wa.cfg.Environment, + HTTPOnly: true, + }) + + accessTokenCookie := auth.CreateCookie(&auth.CreateCookieOptions{ + ExpiresAt: time.Now().Add(time.Minute * 10), + Name: "access_token", + Value: accessToken, + FQDN: wa.cfg.Registry.FQDN, + Environment: wa.cfg.Environment, + HTTPOnly: true, + }) + + refreshTokenCookie := auth.CreateCookie(&auth.CreateCookieOptions{ + ExpiresAt: time.Now().Add(time.Hour * 750), //one month + Name: "refresh_token", + Value: sessionId, + FQDN: wa.cfg.Registry.FQDN, + Environment: wa.cfg.Environment, + HTTPOnly: true, + }) + + ctx.SetCookie(accessTokenCookie) + ctx.SetCookie(refreshTokenCookie) + ctx.SetCookie(sessionIdCookie) echoErr := ctx.JSON(http.StatusOK, echo.Map{ "message": "Login Success", diff --git a/auth/signin.go b/auth/signin.go index 1f86cb2d..e98176a5 100644 --- a/auth/signin.go +++ b/auth/signin.go @@ -82,7 +82,15 @@ func (a *auth) SignIn(ctx echo.Context) error { return echoErr } - access, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "access") + accessTokenOpts := &WebLoginJWTOptions{ + Id: userFromDb.Id, + Username: userFromDb.Username, + TokenType: "access_token", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + access, err := NewWebLoginToken(accessTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), @@ -92,7 +100,16 @@ func (a *auth) SignIn(ctx echo.Context) error { return echoErr } - refresh, err := a.newWebLoginToken(userFromDb.Id, userFromDb.Username, "refresh") + refreshTokenOpts := &WebLoginJWTOptions{ + Id: userFromDb.Id, + Username: userFromDb.Username, + TokenType: "refresh_token", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + + refresh, err := NewWebLoginToken(refreshTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), diff --git a/auth/verify_email.go b/auth/verify_email.go index 9d2a6612..183e3bd4 100644 --- a/auth/verify_email.go +++ b/auth/verify_email.go @@ -75,7 +75,16 @@ func (a *auth) VerifyEmail(ctx echo.Context) error { return echoErr } - access, err := a.newWebLoginToken(userId, user.Username, "access") + accesssTokenOpts := &WebLoginJWTOptions{ + Id: userId, + Username: user.Username, + TokenType: "access_token", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + + access, err := NewWebLoginToken(accesssTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), @@ -84,7 +93,16 @@ func (a *auth) VerifyEmail(ctx echo.Context) error { a.logger.Log(ctx, err) return echoErr } - refresh, err := a.newWebLoginToken(userId, user.Username, "refresh") + + refreshTokenOpts := &WebLoginJWTOptions{ + Id: userId, + Username: user.Username, + TokenType: "refresh", + Audience: a.c.Registry.FQDN, + Privkey: a.c.Registry.TLS.PrivateKey, + Pubkey: a.c.Registry.TLS.PubKey, + } + refresh, err := NewWebLoginToken(refreshTokenOpts) if err != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index 00f98f2b..0ee9bb1d 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -51,6 +51,7 @@ type ( ) // Inspired from https://github.com/passwordless-id/webauthn#how-does-it-work +// nolint // More of a permalink: https://camo.githubusercontent.com/56fd16123e9cef7d5ed6994812d0edef43e13c2f4bae12a0f7e06b6b9760fd57/68747470733a2f2f70617373776f72646c6573732e69642f70726f746f636f6c732f776562617574686e2f6f766572766965772e737667 // // ┌────────┐ ┌─────────┐ ┌────────┐ diff --git a/store/postgres/users.go b/store/postgres/users.go index fe21862f..5c0613d2 100644 --- a/store/postgres/users.go +++ b/store/postgres/users.go @@ -104,6 +104,11 @@ func (p *pg) AddOAuthUser(ctx context.Context, u *types.User) error { return nil } +// GetUser returns a types.User. Any of the following parameters can be used to querying the user: +// - user id +// - user email +// - user's username +// It also takes an optional txn field, which can be helpful to query this information from uncommited txns func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, txn pgx.Tx) (*types.User, error) { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() @@ -149,6 +154,8 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, return &user, nil } +// GetUserById returns a types.User. The parameter used to query the user is userID. +// It also takes an optional txn field, which can be helpful to query this information from uncommited txns func (p *pg) GetUserById(ctx context.Context, userId string, withPassword bool, txn pgx.Tx) (*types.User, error) { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) defer cancel() From 3eae06843161f6bc73eda269e57bc6712133cf7f Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sun, 5 Feb 2023 22:00:15 +0530 Subject: [PATCH 10/19] remove: Dead types & methods --- auth/webauthn/webauthn.go | 3 +- types/web_authn.go | 68 --------------------------------------- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 types/web_authn.go diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index 0ee9bb1d..88a596ba 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -10,7 +10,6 @@ import ( "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/store/postgres" - "github.com/containerish/OpenRegistry/types" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" "github.com/jackc/pgx/v4" @@ -298,7 +297,7 @@ func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpt func (wa *webAuthnService) doWebAuthnRegisteration( ctx context.Context, - user *types.User, + user *WebAuthnUser, ) (*protocol.CredentialCreation, error) { creds, err := wa.store.GetWebAuthNCredentials(ctx, user.Id) if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { diff --git a/types/web_authn.go b/types/web_authn.go deleted file mode 100644 index 18fa5827..00000000 --- a/types/web_authn.go +++ /dev/null @@ -1,68 +0,0 @@ -package types - -import ( - "github.com/go-webauthn/webauthn/protocol" - "github.com/go-webauthn/webauthn/webauthn" - "github.com/google/uuid" -) - -type ( - WebAuthNSessiondata struct { - webauthn.SessionData - CredentialOwnerId string - } -) - -// WebAuthnID - User ID according to the Relying Party -func (u *User) WebAuthnID() []byte { - // TODO(jay-dee7): This will panic - userID := uuid.MustParse(u.Id) - return userID[:] -} - -// WebAuthnName - User Name according to the Relying Party -func (u *User) WebAuthnName() string { - return u.Username -} - -// WebAuthnDisplayName - Display Name of the user -func (u *User) WebAuthnDisplayName() string { - return u.Username -} - -// WebAuthnIcon - User's icon url -func (u *User) WebAuthnIcon() string { - return u.AvatarURL -} - -// WebAuthnCredentials - Credentials owned by the user -func (u *User) WebAuthnCredentials() []webauthn.Credential { - return u.credentials -} - -func (u *User) AddWebAuthNCredential(creds *webauthn.Credential) { - u.credentials = append(u.credentials, *creds) -} - -func (u *User) AddWebAuthNCredentials(creds ...*webauthn.Credential) { - for _, c := range creds { - if c == nil { - continue - } - - u.credentials = append(u.credentials, *c) - } -} - -func (u *User) GetExistingPublicKeyCredentials() []protocol.CredentialDescriptor { - var list []protocol.CredentialDescriptor - - for _, cred := range u.credentials { - list = append(list, protocol.CredentialDescriptor{ - Type: protocol.PublicKeyCredentialType, - CredentialID: cred.ID, - }) - } - - return list -} From 92d6b509580bf36252fc72a540dc4ef466ab8b13 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 18 Feb 2023 00:09:41 +0530 Subject: [PATCH 11/19] refactor: Move webauthn to its own package --- .gitignore | 1 + auth/server/webauthn_server.go | 56 +++++++++++++---- auth/webauthn/types.go | 4 +- auth/webauthn/webauthn.go | 98 +++++++++++++++-------------- config/config.go | 13 ++-- router/webauthn_routes.go | 2 +- store/postgres/postgres.go | 7 +-- store/postgres/queries/web_authn.go | 17 +++-- store/postgres/web_authn.go | 18 ++++++ 9 files changed, 137 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 53d33e53..4e94e2fe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ certs *.backup config.yaml.bak config.yml.bak +*.pem diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go index d127b55f..1f5d38df 100644 --- a/auth/server/webauthn_server.go +++ b/auth/server/webauthn_server.go @@ -24,7 +24,7 @@ type ( store postgres.PersistentStore logger telemetry.Logger cfg *config.OpenRegistryConfig - webAuthN webauthn.WebAuthnService + webauthn webauthn.WebAuthnService txnStore map[string]*webAuthNMeta } @@ -35,7 +35,7 @@ type ( WebauthnServer interface { BeginRegistration(ctx echo.Context) error - RollbackRegisteration(ctx echo.Context) error + RollbackRegistration(ctx echo.Context) error FinishRegistration(ctx echo.Context) error BeginLogin(ctx echo.Context) error FinishLogin(ctx echo.Context) error @@ -53,7 +53,7 @@ func NewWebauthnServer( store: store, logger: logger, cfg: cfg, - webAuthN: webauthnService, + webauthn: webauthnService, txnStore: make(map[string]*webAuthNMeta), } @@ -145,11 +145,32 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { } webauthnUser := &webauthn.WebAuthnUser{User: existingUser} - credentialOpts, err := wa.webAuthN.BeginRegistration(ctx.Request().Context(), webauthnUser) + credentialOpts, err := wa.webauthn.BeginRegistration(ctx.Request().Context(), webauthnUser) if err != nil { + // If we encounter an error here, we need to do the following: + // 1. Rollback the session data (since this session data is irrelevant from this point onwards) + // 2. Rollback the webauthn user store txn + if werr := wa.webauthn.RemoveSessionData(ctx.Request().Context(), existingUser.Id); werr != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": werr.Error(), + "message": "failed to rollback stale session data", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + if rollbackErr := txn.Rollback(ctx.Request().Context()); rollbackErr != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": rollbackErr.Error(), + "message": "failed to rollback webauthn user txn", + }) + wa.logger.Log(ctx, err) + return echoErr + } + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), - "message": "failed to add web authn session data for existing user", + "message": "failed to add webauthn session data for existing user", }) wa.logger.Log(ctx, err) return echoErr @@ -164,12 +185,12 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { return echoErr } -func (wa *webauthn_server) RollbackRegisteration(ctx echo.Context) error { +func (wa *webauthn_server) RollbackRegistration(ctx echo.Context) error { username := ctx.QueryParam("username") meta, ok := wa.txnStore[username] if !ok { echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "user txn does not exist", + "message": "user transaction does not exist", }) wa.logger.Log(ctx, echoErr) @@ -178,9 +199,9 @@ func (wa *webauthn_server) RollbackRegisteration(ctx echo.Context) error { err := meta.txn.Rollback(ctx.Request().Context()) if err != nil { - echoErr := ctx.JSON(http.StatusOK, echo.Map{ + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ "error": err.Error(), - "message": "user txn does not exist", + "message": "failed to rollback transaction", }) wa.logger.Log(ctx, echoErr) @@ -188,7 +209,7 @@ func (wa *webauthn_server) RollbackRegisteration(ctx echo.Context) error { } echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "txn rolled back successfully", + "message": "transaction rolled back successfully", }) wa.logger.Log(ctx, echoErr) @@ -227,7 +248,7 @@ func (wa *webauthn_server) FinishRegistration(ctx echo.Context) error { }, } - if err = wa.webAuthN.FinishRegistration(ctx.Request().Context(), opts); err != nil { + if err = wa.webauthn.FinishRegistration(ctx.Request().Context(), opts); err != nil { _ = meta.txn.Rollback(ctx.Request().Context()) echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), @@ -278,8 +299,17 @@ func (wa *webauthn_server) BeginLogin(ctx echo.Context) error { }, } - credentialAssertion, err := wa.webAuthN.BeginLogin(ctx.Request().Context(), opts) + credentialAssertion, err := wa.webauthn.BeginLogin(ctx.Request().Context(), opts) if err != nil { + if werr := wa.webauthn.RemoveSessionData(ctx.Request().Context(), user.Id); werr != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": err.Error(), + "message": "error removing webauthn session data", + }) + wa.logger.Log(ctx, err) + return echoErr + } + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "error performing Webauthn login", @@ -318,7 +348,7 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { }, } - if err = wa.webAuthN.FinishLogin(ctx.Request().Context(), opts); err != nil { + if err = wa.webauthn.FinishLogin(ctx.Request().Context(), opts); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), "message": "parsing error: could not parse credential request body in finish login", diff --git a/auth/webauthn/types.go b/auth/webauthn/types.go index 1d73a6db..1e9f0c3c 100644 --- a/auth/webauthn/types.go +++ b/auth/webauthn/types.go @@ -20,8 +20,8 @@ type ( ) // WebAuthnID - User ID according to the Relying Party +// TODO(jay-dee7): This will panic if the uuid is not in the requited format func (u *WebAuthnUser) WebAuthnID() []byte { - // TODO(jay-dee7): This will panic userID := uuid.MustParse(u.Id) return userID[:] } @@ -60,7 +60,7 @@ func (u *WebAuthnUser) AddWebAuthNCredentials(creds ...*webauthn.Credential) { } } -func (u *WebAuthnUser) GetExistingPublicKeyCredentials() []protocol.CredentialDescriptor { +func (u *WebAuthnUser) GetWebauthnCredentialDescriptors() []protocol.CredentialDescriptor { var list []protocol.CredentialDescriptor for _, cred := range u.credentials { diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index 88a596ba..ca07914f 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -10,6 +10,7 @@ import ( "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/store/postgres" + "github.com/fatih/color" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" "github.com/jackc/pgx/v4" @@ -31,16 +32,18 @@ type ( BeginLogin(ctx context.Context, opts *BeginLoginOptions) (*protocol.CredentialAssertion, error) FinishLogin(ctx context.Context, opts *FinishLoginOpts) error - // RollbackRegisteration rolls a registration back. This can be specially useful for scenarios like when the - // user does not provide input to the authentication - RollbackRegisteration(ctx context.Context, username string) error + // RemoveSessionData works sort of like a rollback for failed session operations. + // for eg. if the user doesn't answer the prompt within 60s, the client must call this API + // or if the received data is invalid in FinishLogin/FinishRegistration. + // The client is responsible for calling this method because it's possible that all of the Webauthn APIs succeed but + // some custom logic fails which would require the client to rollback + RemoveSessionData(ctx context.Context, userId string) error } webAuthnService struct { - cfg *config.WebAuthnConfig - store postgres.WebAuthN - txnStore map[string]*webAuthNMeta - core *webauthn.WebAuthn + cfg *config.WebAuthnConfig + store postgres.WebAuthN + core *webauthn.WebAuthn } webAuthNMeta struct { @@ -49,6 +52,8 @@ type ( } ) +// New returns a new Webauthn Service, which has simple wrappers for Signing up and registering a user +// Also, if the WebAuthnConfig.Enabled is set to `false`, this will return `nil` // Inspired from https://github.com/passwordless-id/webauthn#how-does-it-work // nolint // More of a permalink: https://camo.githubusercontent.com/56fd16123e9cef7d5ed6994812d0edef43e13c2f4bae12a0f7e06b6b9760fd57/68747470733a2f2f70617373776f72646c6573732e69642f70726f746f636f6c732f776562617574686e2f6f766572766965772e737667 @@ -116,24 +121,35 @@ type ( // ┃ ┃ ┃ // ┃ ┃ ┃ // ┃ ┃ ┃ -// -// New returns a new Webauthn Service, which has simple wrappers for Signing up and registering a user func New(cfg *config.WebAuthnConfig, store postgres.WebAuthN) WebAuthnService { + if !cfg.Enabled { + color.Yellow("Webauthn: disabled") + return nil + } + core, err := webauthn.New(&webauthn.Config{ - RPDisplayName: cfg.RPDisplayName, - RPID: cfg.RPID, - RPOrigins: cfg.RPOrigins, - RPIcon: cfg.RPIcon, + RPDisplayName: cfg.RPDisplayName, + RPID: cfg.RPID, + RPIcon: cfg.RPIcon, + RPOrigin: cfg.RPOrigin, + RPOrigins: cfg.RPOrigins, + AttestationPreference: protocol.PreferNoAttestation, + AuthenticatorSelection: protocol.AuthenticatorSelection{ + RequireResidentKey: protocol.ResidentKeyNotRequired(), + ResidentKey: protocol.ResidentKeyRequirementDiscouraged, + UserVerification: protocol.VerificationRequired, + }, + Timeout: int(cfg.Timeout.Milliseconds()), + Debug: false, }) if err != nil { - log.Fatalf("webauthn config is missing: %s", err) + log.Fatalf("webauthn configuration is invalid: %s", err) } return &webAuthnService{ - cfg: cfg, - store: store, - txnStore: make(map[string]*webAuthNMeta), - core: core, + cfg: cfg, + store: store, + core: core, } } @@ -151,13 +167,13 @@ func (wa *webAuthnService) BeginRegistration( // User might already have few credentials. They shouldn't be considered when creating a new credential for them. // A user can have multiple credentials - excludeList := user.GetExistingPublicKeyCredentials() + excludeList := user.GetWebauthnCredentialDescriptors() - authSelect := &protocol.AuthenticatorSelection{ - AuthenticatorAttachment: protocol.Platform, - RequireResidentKey: protocol.ResidentKeyRequired(), - UserVerification: protocol.VerificationRequired, - } + // authSelect := &protocol.AuthenticatorSelection{ + // RequireResidentKey: protocol.ResidentKeyRequired(), + // ResidentKey: protocol.ResidentKeyRequirementRequired, + // UserVerification: protocol.VerificationRequired, + // } conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) @@ -165,7 +181,7 @@ func (wa *webAuthnService) BeginRegistration( credentialCreation, sessionData, err := wa.core.BeginRegistration( user, webauthn.WithExclusions(excludeList), - webauthn.WithAuthenticatorSelection(*authSelect), + // webauthn.WithAuthenticatorSelection(*authSelect), webauthn.WithConveyancePreference(conveyancePref), ) if err != nil { @@ -179,20 +195,6 @@ func (wa *webAuthnService) BeginRegistration( return credentialCreation, err } -func (wa *webAuthnService) RollbackRegisteration(ctx context.Context, username string) error { - meta, ok := wa.txnStore[username] - if !ok { - return fmt.Errorf("ERR_ROLLBACK_REGISTRATION: txn does not exist") - } - - err := meta.txn.Rollback(ctx) - if err != nil { - return err - } - - return nil -} - type FinishRegistrationOpts struct { RequestBody io.Reader User *WebAuthnUser @@ -244,10 +246,9 @@ func (wa *webAuthnService) BeginLogin( // these credentials are added here because WebAuthn will try to access then via // user.WebAuthnCredentials method opts.User.AddWebAuthNCredential(creds) - credentialAssertionOpts, sessionData, err := wa.core.BeginLogin( opts.User, - webauthn.WithAllowedCredentials(opts.User.GetExistingPublicKeyCredentials()), + webauthn.WithAllowedCredentials(opts.User.GetWebauthnCredentialDescriptors()), ) if err != nil { return nil, err @@ -261,6 +262,10 @@ func (wa *webAuthnService) BeginLogin( return credentialAssertionOpts, nil } +func (wa *webAuthnService) RemoveSessionData(ctx context.Context, userId string) error { + return wa.store.RemoveWebAuthSessionData(ctx, userId) +} + type FinishLoginOpts struct { RequestBody io.Reader User *WebAuthnUser @@ -271,17 +276,16 @@ type FinishLoginOpts struct { func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpts) error { sessionData, err := wa.store.GetWebAuthNSessionData(ctx, opts.User.Id, "authentication") if err != nil { - return err + return fmt.Errorf("ERR_GET_WEBAUTHN_SESSION_DATA: %w", err) } - parsedResponse, err := protocol.ParseCredentialRequestResponseBody(opts.RequestBody) if err != nil { - return err + return fmt.Errorf("ERR_PARSE_REQUEST_RESPONSE_BODY: %w", err) } creds, err := wa.store.GetWebAuthNCredentials(ctx, opts.User.Id) if err != nil { - return err + return fmt.Errorf("ERR_GET_WEBAUTHN_CREDENTIALS: %w", err) } opts.User.AddWebAuthNCredential(creds) @@ -289,7 +293,7 @@ func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpt //Validate login gives back credential _, err = wa.core.ValidateLogin(opts.User, *sessionData, parsedResponse) if err != nil { - return err + return fmt.Errorf("ERR_VALIDATE_WEBAUTHN_LOGIN: %w", err) } return nil @@ -306,7 +310,7 @@ func (wa *webAuthnService) doWebAuthnRegisteration( // User might already have few credentials. They shouldn't be considered when creating a new credential for them. // A user can have multiple credentials - excludeList := user.GetExistingPublicKeyCredentials() + excludeList := user.GetWebauthnCredentialDescriptors() authSelect := &protocol.AuthenticatorSelection{ AuthenticatorAttachment: protocol.Platform, diff --git a/config/config.go b/config/config.go index 228af478..b900ac6b 100644 --- a/config/config.go +++ b/config/config.go @@ -4,6 +4,7 @@ import ( "fmt" "log" "os" + "time" "github.com/go-playground/locales/en" ut "github.com/go-playground/universal-translator" @@ -106,11 +107,13 @@ type ( } WebAuthnConfig struct { - RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` - RPID string `yaml:"rp_id" mapstructure:"rp_id"` - RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` - RPOrigins []string `yaml:"rp_origins" mapstructure:"rp_origins"` - Enabled bool `yaml:"enabled" mapstructure:"enabled"` + RPDisplayName string `yaml:"rp_display_name" mapstructure:"rp_display_name"` + RPID string `yaml:"rp_id" mapstructure:"rp_id"` + RPIcon string `yaml:"rp_icon" mapstructure:"rp_icon"` + RPOrigin string `yaml:"rp_origin" mapstructure:"rp_origin"` + RPOrigins []string `yaml:"rp_origins" mapstructure:"rp_origins"` + Enabled bool `yaml:"enabled" mapstructure:"enabled"` + Timeout time.Duration `yaml:"timeout" mapstructure:"timeout"` } ) diff --git a/router/webauthn_routes.go b/router/webauthn_routes.go index 8ea44f10..ee84ba8b 100644 --- a/router/webauthn_routes.go +++ b/router/webauthn_routes.go @@ -12,7 +12,7 @@ func RegisterWebauthnRoutes( webauthnServer auth_server.WebauthnServer, ) { router.Add(http.MethodPost, "/registration/begin", webauthnServer.BeginRegistration) - router.Add(http.MethodDelete, "/registration/rollback", webauthnServer.RollbackRegisteration) + router.Add(http.MethodDelete, "/registration/rollback", webauthnServer.RollbackRegistration) router.Add(http.MethodPost, "/registration/finish", webauthnServer.FinishRegistration) router.Add(http.MethodGet, "/login/begin", webauthnServer.BeginLogin) router.Add(http.MethodPost, "/login/finish", webauthnServer.FinishLogin) diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 99b4f915..2a0de68e 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -97,14 +97,11 @@ type PgTxnHandler interface { } type WebAuthN interface { - PgTxnHandler - UserReader - UserWriter - GetWebAuthNSessionData(ctx context.Context, userId string, sessionType string) (*webauthn.SessionData, error) - AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error GetWebAuthNCredentials(ctx context.Context, userId string) (*webauthn.Credential, error) + AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error AddWebAuthNCredentials(ctx context.Context, userId string, credential *webauthn.Credential) error + RemoveWebAuthSessionData(ctx context.Context, credentialOwnerID string) error } type pg struct { diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index fbf74c35..3b913a1c 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -1,16 +1,21 @@ -//nolint +// nolint package queries var ( // user_id is the web_authn_session user_id // credential_owner_id is from our user table - AddWebAuthNSessionData = `insert into web_authn_session (credential_owner_id,user_id,challenge,allowed_credential_id, - user_verification,extensions,session_type) values ($1,$2,$3,$4,$5,$6,$7) on conflict (credential_owner_id) do update set user_id=$2,challenge=$3,allowed_credential_id=$4,user_verification=$5,extensions=$6,session_type=$7;` + AddWebAuthNSessionData = `insert into web_authn_session + (credential_owner_id,user_id,challenge,allowed_credential_id, user_verification,extensions,session_type) + values ($1,$2,$3,$4,$5,$6,$7) + on conflict (credential_owner_id) do update + set user_id=$2,challenge=$3,allowed_credential_id=$4,user_verification=$5,extensions=$6,session_type=$7;` GetWebAuthNSessionData = `select user_id,challenge,allowed_credential_id,user_verification,extensions from - web_authn_session where credential_owner_id=$1 and session_type=$2;` + web_authn_session where credential_owner_id=$1 and session_type=$2;` AddWebAuthNCredentials = `insert into web_authn_creds (credential_owner_id,id,public_key,attestation_type,aaguid, - sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6,$7);` + sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6,$7);` GetWebAuthNCredentials = `select id,public_key,attestation_type,aaguid,sign_count,clone_warning from web_authn_creds - where credential_owner_id=$1;` + where credential_owner_id=$1;` + RemoveWebAuthNSessionData = `delete from web_authn_session where credential_owner_id = $1` + RemoveWebAuthNCredentials = `delete from web_authn_creds where credential_owner_id = $1` ) diff --git a/store/postgres/web_authn.go b/store/postgres/web_authn.go index 078f194c..28f9c9cd 100644 --- a/store/postgres/web_authn.go +++ b/store/postgres/web_authn.go @@ -9,6 +9,22 @@ import ( "github.com/go-webauthn/webauthn/webauthn" ) +func (p *pg) RemoveWebAuthSessionData(ctx context.Context, credentialOwnerID string) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) + defer cancel() + + _, err := p.conn.Exec( + childCtx, + queries.RemoveWebAuthNSessionData, + credentialOwnerID, + ) + if err != nil { + return fmt.Errorf("ERR_REMOVE_WEB_AUTHN_SESSION_DATA :%w", err) + } + + return nil +} + func (p *pg) AddWebAuthSessionData( ctx context.Context, credentialOwnerID string, @@ -17,6 +33,7 @@ func (p *pg) AddWebAuthSessionData( ) error { childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) defer cancel() + _, err := p.conn.Exec( childCtx, queries.AddWebAuthNSessionData, @@ -31,6 +48,7 @@ func (p *pg) AddWebAuthSessionData( if err != nil { return fmt.Errorf("ERR_ADD_WEB_AUTHN_SESSION_DATA :%w", err) } + return nil } From cea1ceda1e9059cb0fa8ef1259b366d45da2761b Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 18 Feb 2023 19:24:02 +0530 Subject: [PATCH 12/19] refactor: Cookie nomenclature --- auth/github.go | 4 ++-- auth/renew.go | 2 +- auth/signin.go | 4 ++-- auth/signout.go | 4 ++-- auth/verify_email.go | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/auth/github.go b/auth/github.go index a15b2892..0d156de6 100644 --- a/auth/github.go +++ b/auth/github.go @@ -140,8 +140,8 @@ func (a *auth) GithubLoginCallbackHandler(ctx echo.Context) error { val := fmt.Sprintf("%s:%s", sessionId, oauthUser.Id) sessionCookie := a.createCookie("session_id", val, false, time.Now().Add(time.Hour*750)) - accessCookie := a.createCookie("access", accessToken, true, time.Now().Add(time.Hour*750)) - refreshCookie := a.createCookie("refresh", refreshToken, true, time.Now().Add(time.Hour*750)) + accessCookie := a.createCookie("access_token", accessToken, true, time.Now().Add(time.Hour*750)) + refreshCookie := a.createCookie("refresh_token", refreshToken, true, time.Now().Add(time.Hour*750)) ctx.SetCookie(accessCookie) ctx.SetCookie(refreshCookie) diff --git a/auth/renew.go b/auth/renew.go index c850e9de..e82e96a9 100644 --- a/auth/renew.go +++ b/auth/renew.go @@ -104,7 +104,7 @@ func (a *auth) RenewAccessToken(ctx echo.Context) error { return echoErr } - accessCookie := a.createCookie("access", tokenString, true, time.Now().Add(time.Hour)) + accessCookie := a.createCookie("access_token", tokenString, true, time.Now().Add(time.Hour)) ctx.SetCookie(accessCookie) err = ctx.NoContent(http.StatusNoContent) a.logger.Log(ctx, err) diff --git a/auth/signin.go b/auth/signin.go index e98176a5..5690b335 100644 --- a/auth/signin.go +++ b/auth/signin.go @@ -138,8 +138,8 @@ func (a *auth) SignIn(ctx echo.Context) error { sessionId := fmt.Sprintf("%s:%s", id, userFromDb.Id) sessionCookie := a.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) - accessCookie := a.createCookie("access", access, true, time.Now().Add(time.Hour*750)) - refreshCookie := a.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) + accessCookie := a.createCookie("access_token", access, true, time.Now().Add(time.Hour*750)) + refreshCookie := a.createCookie("refresh_token", refresh, true, time.Now().Add(time.Hour*750)) ctx.SetCookie(accessCookie) ctx.SetCookie(refreshCookie) diff --git a/auth/signout.go b/auth/signout.go index 39d28502..bdea1a6d 100644 --- a/auth/signout.go +++ b/auth/signout.go @@ -45,8 +45,8 @@ func (a *auth) SignOut(ctx echo.Context) error { return echoErr } - ctx.SetCookie(a.createCookie("access", "", true, time.Now().Add(-time.Hour))) - ctx.SetCookie(a.createCookie("refresh", "", true, time.Now().Add(-time.Hour))) + ctx.SetCookie(a.createCookie("access_token", "", true, time.Now().Add(-time.Hour))) + ctx.SetCookie(a.createCookie("refresh_token", "", true, time.Now().Add(-time.Hour))) ctx.SetCookie(a.createCookie("session_id", "", true, time.Now().Add(-time.Hour))) err = ctx.JSON(http.StatusAccepted, echo.Map{ "message": "session deleted successfully", diff --git a/auth/verify_email.go b/auth/verify_email.go index 183e3bd4..1caa421e 100644 --- a/auth/verify_email.go +++ b/auth/verify_email.go @@ -132,8 +132,8 @@ func (a *auth) VerifyEmail(ctx echo.Context) error { sessionId := fmt.Sprintf("%s:%s", id, userId) sessionCookie := a.createCookie("session_id", sessionId, false, time.Now().Add(time.Hour*750)) - accessCookie := a.createCookie("access", access, true, time.Now().Add(time.Hour)) - refreshCookie := a.createCookie("refresh", refresh, true, time.Now().Add(time.Hour*750)) + accessCookie := a.createCookie("access_token", access, true, time.Now().Add(time.Hour)) + refreshCookie := a.createCookie("refresh_token", refresh, true, time.Now().Add(time.Hour*750)) ctx.SetCookie(accessCookie) ctx.SetCookie(refreshCookie) From c27f44601a36819eacac233503608d9db908419d Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 11 Mar 2023 20:55:51 +0530 Subject: [PATCH 13/19] fix: GitHub & Webauthn Sign up conflicts --- auth/auth.go | 2 +- auth/github.go | 204 ++++++++++++------ auth/server/webauthn_server.go | 121 ++++++----- auth/webauthn/types.go | 4 + auth/webauthn/webauthn.go | 58 ++--- config/config.go | 31 +-- .../000001_create_users_table.up.sql | 4 +- go.mod | 3 +- go.sum | 2 + router/helpers.go | 6 +- router/router.go | 4 +- store/postgres/postgres.go | 6 +- store/postgres/queries/users.go | 17 +- store/postgres/queries/web_authn.go | 2 + store/postgres/users.go | 98 +++++++-- store/postgres/web_authn.go | 10 + types/users.go | 11 +- 17 files changed, 369 insertions(+), 214 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index 704e56f2..556180b2 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -49,7 +49,7 @@ func New( } ghClient := gh.NewClient(nil) - emailClient := email.New(&c.Email, c.WebAppEndpoint) + emailClient := email.New(&c.Email, c.WebAppConfig.Endpoint) a := &auth{ c: c, diff --git a/auth/github.go b/auth/github.go index 0d156de6..385161ae 100644 --- a/auth/github.go +++ b/auth/github.go @@ -2,13 +2,18 @@ package auth import ( "context" + "errors" "fmt" "net/http" + "net/url" "time" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/types" "github.com/google/uuid" + "github.com/jackc/pgconn" + "github.com/jackc/pgerrcode" + "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" "golang.org/x/oauth2" ) @@ -24,6 +29,7 @@ func (a *auth) LoginWithGithub(ctx echo.Context) error { a.logger.Log(ctx, err) return echoErr } + a.oauthStateStore[state.String()] = time.Now().Add(time.Minute * 10) url := a.github.AuthCodeURL(state.String(), oauth2.AccessTypeOffline) a.logger.Log(ctx, nil) @@ -36,11 +42,9 @@ func (a *auth) GithubLoginCallbackHandler(ctx echo.Context) error { stateToken := ctx.FormValue("state") _, ok := a.oauthStateStore[stateToken] if !ok { - err := fmt.Errorf("INVALID_STATE_TOKEN") - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "missing or invalid state token", - }) + err := fmt.Errorf("missing or invalid state token") + uri := a.getGitHubErrorURI(http.StatusBadRequest, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) a.logger.Log(ctx, err) return echoErr } @@ -52,22 +56,16 @@ func (a *auth) GithubLoginCallbackHandler(ctx echo.Context) error { code := ctx.FormValue("code") token, err := a.github.Exchange(context.Background(), code) if err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "github exchange error", - "code": "GITHUB_EXCHANGE_ERR", - }) + uri := a.getGitHubErrorURI(http.StatusBadRequest, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) a.logger.Log(ctx, err) return echoErr } req, err := a.ghClient.NewRequest(http.MethodGet, "/user", nil) if err != nil { - echoErr := ctx.JSON(http.StatusPreconditionFailed, echo.Map{ - "error": err.Error(), - "message": "github client request failed", - "code": "GH_CLIENT_REQ_FAILED", - }) + uri := a.getGitHubErrorURI(http.StatusBadRequest, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) a.logger.Log(ctx, err) return echoErr } @@ -76,78 +74,76 @@ func (a *auth) GithubLoginCallbackHandler(ctx echo.Context) error { var oauthUser types.User _, err = a.ghClient.Do(ctx.Request().Context(), req, &oauthUser) if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "github client request execution failed", - "code": "GH_CLIENT_REQ_EXEC_FAILED", - }) + uri := a.getGitHubErrorURI(http.StatusBadRequest, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) a.logger.Log(ctx, err) return echoErr } - oauthUser.Username = oauthUser.Login - id, err := uuid.NewRandom() + user, err := a.pgStore.GetOAuthUser(ctx.Request().Context(), oauthUser.Login, nil) if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "error creating oauth user id", - }) - a.logger.Log(ctx, err) - return echoErr - } - oauthUser.Id = id.String() + err = a.storeGitHubUserIfDoesntExist(ctx.Request().Context(), err, &oauthUser) + if err != nil { + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) + a.logger.Log(ctx, err) + return echoErr + } + if err = a.finishGitHubCallback(ctx, oauthUser.Username, oauthUser.Id, token); err != nil { + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusTemporaryRedirect, uri) + a.logger.Log(ctx, err) + return echoErr + } - accessToken, refreshToken, err := a.SignOAuthToken(oauthUser.Id, token) - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "cause": "JWT_SIGNING", - }) - a.logger.Log(ctx, err) - return echoErr + err = ctx.Redirect(http.StatusTemporaryRedirect, a.c.WebAppConfig.RedirectURL) + a.logger.Log(ctx, nil) + return err } - - if err = oauthUser.Validate(false); err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - }) + if user.WebauthnConnected && !user.GithubConnected { + err = fmt.Errorf("username/email already exists") + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) a.logger.Log(ctx, err) return echoErr } - if err = a.pgStore.AddOAuthUser(ctx.Request().Context(), &oauthUser); err != nil { - redirectPath := fmt.Sprintf("%s%s?error=%s", a.c.WebAppEndpoint, a.c.WebAppErrorRedirectPath, err.Error()) - echoErr := ctx.Redirect(http.StatusTemporaryRedirect, redirectPath) - a.logger.Log(ctx, err) - return echoErr - } + if user.GithubConnected { + err = a.pgStore.UpdateOAuthUser( + ctx.Request().Context(), + oauthUser.Email, + oauthUser.Login, + oauthUser.NodeID, + nil, + ) + if err != nil { + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusSeeOther, uri) + a.logger.Log(ctx, err) + return echoErr + } - sessionId, err := uuid.NewRandom() - if err != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "cause": "error creating session id", - }) - a.logger.Log(ctx, err) - return echoErr + if err = a.finishGitHubCallback(ctx, oauthUser.Login, user.Id, token); err != nil { + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusTemporaryRedirect, uri) + a.logger.Log(ctx, err) + return echoErr + } + + err = ctx.Redirect(http.StatusTemporaryRedirect, a.c.WebAppConfig.RedirectURL) + a.logger.Log(ctx, nil) + return err } - err = a.pgStore.AddSession(ctx.Request().Context(), sessionId.String(), refreshToken, oauthUser.Username) - if err != nil { - echoErr := ctx.Redirect(http.StatusTemporaryRedirect, a.c.WebAppErrorRedirectPath) + + // this will set the add session object to database and attaches cookies to the echo.Context object + if err = a.finishGitHubCallback(ctx, oauthUser.Username, oauthUser.Id, token); err != nil { + uri := a.getGitHubErrorURI(http.StatusConflict, err.Error()) + echoErr := ctx.Redirect(http.StatusTemporaryRedirect, uri) a.logger.Log(ctx, err) return echoErr } - val := fmt.Sprintf("%s:%s", sessionId, oauthUser.Id) - - sessionCookie := a.createCookie("session_id", val, false, time.Now().Add(time.Hour*750)) - accessCookie := a.createCookie("access_token", accessToken, true, time.Now().Add(time.Hour*750)) - refreshCookie := a.createCookie("refresh_token", refreshToken, true, time.Now().Add(time.Hour*750)) - - ctx.SetCookie(accessCookie) - ctx.SetCookie(refreshCookie) - ctx.SetCookie(sessionCookie) - err = ctx.Redirect(http.StatusTemporaryRedirect, a.c.WebAppRedirectURL) + err = ctx.Redirect(http.StatusTemporaryRedirect, a.c.WebAppConfig.RedirectURL) a.logger.Log(ctx, nil) return err } @@ -158,7 +154,6 @@ const ( ) func (a *auth) createCookie(name string, value string, httpOnly bool, expiresAt time.Time) *http.Cookie { - secure := true sameSite := http.SameSiteNoneMode domain := a.c.Registry.FQDN @@ -206,3 +201,70 @@ func (a *auth) getUserWithGithubOauthToken(ctx context.Context, token string) (* return user, nil } + +func (a *auth) getGitHubErrorURI(status int, err string) string { + queryParams := url.Values{ + "status": {fmt.Sprintf("%d", status)}, + "error": {err}, + } + + return fmt.Sprintf("%s%s?%s", a.c.WebAppConfig.Endpoint, a.c.WebAppConfig.CallbackURL, queryParams.Encode()) +} + +func (a *auth) finishGitHubCallback(ctx echo.Context, username, userId string, oauthToken *oauth2.Token) error { + sessionId, err := uuid.NewRandom() + if err != nil { + return err + } + + accessToken, refreshToken, err := a.SignOAuthToken(userId, oauthToken) + if err != nil { + return err + } + + err = a.pgStore.AddSession(ctx.Request().Context(), sessionId.String(), refreshToken, username) + if err != nil { + return err + } + + val := fmt.Sprintf("%s:%s", sessionId, userId) + + sessionCookie := a.createCookie("session_id", val, false, time.Now().Add(time.Hour*750)) + accessCookie := a.createCookie("access_token", accessToken, true, time.Now().Add(time.Hour*750)) + refreshCookie := a.createCookie("refresh_token", refreshToken, true, time.Now().Add(time.Hour*750)) + + ctx.SetCookie(accessCookie) + ctx.SetCookie(refreshCookie) + ctx.SetCookie(sessionCookie) + + return nil +} + +func (a *auth) storeGitHubUserIfDoesntExist(ctx context.Context, pgErr error, user *types.User) error { + if errors.Unwrap(pgErr) == pgx.ErrNoRows { + id, err := uuid.NewRandom() + if err != nil { + return err + } + user.Id = id.String() + if err = user.Validate(false); err != nil { + return err + } + + // In GitHub's response, Login is the GitHub Username + user.Username = user.Login + user.GithubConnected = true + if err = a.pgStore.AddOAuthUser(ctx, user); err != nil { + var pgErr *pgconn.PgError + // this would mean that the user email is already registered + // so we return an error in this case + if errors.As(err, &pgErr) && pgErr.Code == pgerrcode.UniqueViolation { + return fmt.Errorf("username/email already exists") + } + return err + } + return nil + } + + return pgErr +} diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go index 1f5d38df..9f2412ea 100644 --- a/auth/server/webauthn_server.go +++ b/auth/server/webauthn_server.go @@ -15,6 +15,8 @@ import ( "github.com/containerish/OpenRegistry/telemetry" "github.com/containerish/OpenRegistry/types" "github.com/google/uuid" + "github.com/jackc/pgconn" + "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" ) @@ -97,11 +99,6 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { return echoErr } - key := user.Email - if user.Username != "" { - key = user.Username - } - txn, err := wa.store.NewTxn(ctx.Request().Context()) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -117,71 +114,66 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { expiresAt: time.Now().Add(time.Minute), } - existingUser, err := wa.store.GetUser(ctx.Request().Context(), key, true, nil) - if err != nil { - if errors.Unwrap(err) == pgx.ErrNoRows { - //user does not exist, create new user - user.Id = uuid.NewString() - if err = wa.store.AddUser(ctx.Request().Context(), &user, txn); err != nil { - echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ - "error": err.Error(), - "message": "database error, failed to add user", - }) - wa.logger.Log(ctx, err) - return echoErr - } - - // set it here so that we can continue to use existingUser object - existingUser = &user - - } else { + _, err = wa.store.GetUser(ctx.Request().Context(), user.Email, false, nil) + if errors.Unwrap(err) == pgx.ErrNoRows { + user.Id = uuid.NewString() + user.WebauthnConnected = true + if err = wa.store.AddUser(ctx.Request().Context(), &user, txn); err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ "error": err.Error(), - "message": "database error, failed to get user", + "message": "failed to store user details", }) wa.logger.Log(ctx, err) return echoErr } - } - webauthnUser := &webauthn.WebAuthnUser{User: existingUser} - credentialOpts, err := wa.webauthn.BeginRegistration(ctx.Request().Context(), webauthnUser) - if err != nil { - // If we encounter an error here, we need to do the following: - // 1. Rollback the session data (since this session data is irrelevant from this point onwards) - // 2. Rollback the webauthn user store txn - if werr := wa.webauthn.RemoveSessionData(ctx.Request().Context(), existingUser.Id); werr != nil { - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": werr.Error(), - "message": "failed to rollback stale session data", - }) - wa.logger.Log(ctx, err) - return echoErr - } + webauthnUser := &webauthn.WebAuthnUser{User: &user} + credentialOpts, err := wa.webauthn.BeginRegistration(ctx.Request().Context(), webauthnUser) + if err != nil { + // If we encounter an error here, we need to do the following: + // 1. Rollback the session data (since this session data is irrelevant from this point onwards) + // 2. Rollback the webauthn user store txn + if werr := wa.webauthn.RemoveSessionData(ctx.Request().Context(), user.Id); werr != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": werr.Error(), + "message": "failed to rollback stale session data", + }) + wa.logger.Log(ctx, err) + return echoErr + } + + if rollbackErr := txn.Rollback(ctx.Request().Context()); rollbackErr != nil { + echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ + "error": rollbackErr.Error(), + "message": "failed to rollback webauthn user txn", + }) + wa.logger.Log(ctx, err) + return echoErr + } - if rollbackErr := txn.Rollback(ctx.Request().Context()); rollbackErr != nil { echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": rollbackErr.Error(), - "message": "failed to rollback webauthn user txn", + "error": err.Error(), + "message": "failed to add webauthn session data for existing user", }) wa.logger.Log(ctx, err) return echoErr } - echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), - "message": "failed to add webauthn session data for existing user", + echoErr := ctx.JSON(http.StatusOK, echo.Map{ + "message": "registration successful", + "options": credentialOpts, }) - wa.logger.Log(ctx, err) + + wa.logger.Log(ctx, echoErr) return echoErr } - echoErr := ctx.JSON(http.StatusOK, echo.Map{ - "message": "registration successful", - "options": credentialOpts, + err = fmt.Errorf("username/email already exists") + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "username/email already exists", }) - - wa.logger.Log(ctx, echoErr) + wa.logger.Log(ctx, err) return echoErr } @@ -445,3 +437,30 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { wa.logger.Log(ctx, echoErr) return echoErr } + +func (wa *webauthn_server) storeWebauthnUserIfDoesntExist(ctx context.Context, pgErr error, user *types.User) error { + if errors.Unwrap(pgErr) == pgx.ErrNoRows { + id, err := uuid.NewRandom() + if err != nil { + return err + } + user.Id = id.String() + if err = user.Validate(false); err != nil { + return err + } + + user.WebauthnConnected = true + if err = wa.store.AddUser(ctx, user, nil); err != nil { + var pgErr *pgconn.PgError + // this would mean that the user email is already registered + // so we return an error in this case + if errors.As(err, &pgErr) && pgErr.Code == pgerrcode.UniqueViolation { + return fmt.Errorf("username/email already exists") + } + return err + } + return nil + } + + return pgErr +} diff --git a/auth/webauthn/types.go b/auth/webauthn/types.go index 1e9f0c3c..91272699 100644 --- a/auth/webauthn/types.go +++ b/auth/webauthn/types.go @@ -47,6 +47,10 @@ func (u *WebAuthnUser) WebAuthnCredentials() []webauthn.Credential { } func (u *WebAuthnUser) AddWebAuthNCredential(creds *webauthn.Credential) { + // initialised to non-nil value in case of first attempt + if u.credentials == nil { + u.credentials = make([]webauthn.Credential, 0) + } u.credentials = append(u.credentials, *creds) } diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index ca07914f..e5e2f96f 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -137,7 +137,7 @@ func New(cfg *config.WebAuthnConfig, store postgres.WebAuthN) WebAuthnService { AuthenticatorSelection: protocol.AuthenticatorSelection{ RequireResidentKey: protocol.ResidentKeyNotRequired(), ResidentKey: protocol.ResidentKeyRequirementDiscouraged, - UserVerification: protocol.VerificationRequired, + UserVerification: protocol.VerificationDiscouraged, }, Timeout: int(cfg.Timeout.Milliseconds()), Debug: false, @@ -165,15 +165,20 @@ func (wa *webAuthnService) BeginRegistration( return nil, err } + // if there are any existing credentials, add them here + if creds != nil { + user.AddWebAuthNCredential(creds) + } + // User might already have few credentials. They shouldn't be considered when creating a new credential for them. // A user can have multiple credentials excludeList := user.GetWebauthnCredentialDescriptors() - // authSelect := &protocol.AuthenticatorSelection{ - // RequireResidentKey: protocol.ResidentKeyRequired(), - // ResidentKey: protocol.ResidentKeyRequirementRequired, - // UserVerification: protocol.VerificationRequired, - // } + authSelect := &protocol.AuthenticatorSelection{ + RequireResidentKey: protocol.ResidentKeyRequired(), + ResidentKey: protocol.ResidentKeyRequirementRequired, + UserVerification: protocol.VerificationDiscouraged, + } conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) @@ -181,7 +186,7 @@ func (wa *webAuthnService) BeginRegistration( credentialCreation, sessionData, err := wa.core.BeginRegistration( user, webauthn.WithExclusions(excludeList), - // webauthn.WithAuthenticatorSelection(*authSelect), + webauthn.WithAuthenticatorSelection(*authSelect), webauthn.WithConveyancePreference(conveyancePref), ) if err != nil { @@ -298,42 +303,3 @@ func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpt return nil } - -func (wa *webAuthnService) doWebAuthnRegisteration( - ctx context.Context, - user *WebAuthnUser, -) (*protocol.CredentialCreation, error) { - creds, err := wa.store.GetWebAuthNCredentials(ctx, user.Id) - if err != nil && errors.Unwrap(err) != pgx.ErrNoRows { - return nil, err - } - - // User might already have few credentials. They shouldn't be considered when creating a new credential for them. - // A user can have multiple credentials - excludeList := user.GetWebauthnCredentialDescriptors() - - authSelect := &protocol.AuthenticatorSelection{ - AuthenticatorAttachment: protocol.Platform, - RequireResidentKey: protocol.ResidentKeyRequired(), - UserVerification: protocol.VerificationRequired, - } - - conveyancePref := protocol.ConveyancePreference(protocol.PreferNoAttestation) - - user.AddWebAuthNCredentials(creds) - credentialCreation, sessionData, err := wa.core.BeginRegistration( - user, - webauthn.WithExclusions(excludeList), - webauthn.WithAuthenticatorSelection(*authSelect), - webauthn.WithConveyancePreference(conveyancePref), - ) - if err != nil { - return nil, fmt.Errorf("ERR_WEB_AUTHN_BEGIN_REGISTRATION: %w", err) - } - // store session data in DB - if err = wa.store.AddWebAuthSessionData(ctx, user.Id, sessionData, "registration"); err != nil { - return nil, err - } - - return credentialCreation, err -} diff --git a/config/config.go b/config/config.go index b900ac6b..ae239466 100644 --- a/config/config.go +++ b/config/config.go @@ -16,19 +16,24 @@ import ( type ( OpenRegistryConfig struct { - DFS DFS `yaml:"dfs" mapstructure:"dfs"` - OAuth *OAuth `yaml:"oauth" mapstructure:"oauth"` - WebAppEndpoint string `yaml:"web_app_url" mapstructure:"web_app_url" validate:"required"` - //nolint - WebAppRedirectURL string `yaml:"web_app_redirect_url" mapstructure:"web_app_redirect_url" validate:"required"` - WebAppErrorRedirectPath string `yaml:"web_app_error_redirect_path" mapstructure:"web_app_error_redirect_path"` - StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` - LogConfig Log `yaml:"log_service" mapstructure:"log_service"` - Email Email `yaml:"email" mapstructure:"email" validate:"-"` - WebAuthnConfig WebAuthnConfig `yaml:"web_authn_config" mapstructure:"web_authn_config"` - Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` - Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` - Debug bool `yaml:"debug" mapstructure:"debug"` + SkynetConfig Skynet `yaml:"skynet" mapstructure:"skynet" validate:"-"` + OAuth OAuth `yaml:"oauth" mapstructure:"oauth" validate:"-"` + WebAppConfig WebAppConfig `yaml:"web_app" mapstructure:"web_app"` + DFS DFS `yaml:"dfs" mapstructure:"dfs"` + StoreConfig Store `yaml:"database" mapstructure:"database" validate:"required"` + LogConfig Log `yaml:"log_service" mapstructure:"log_service"` + Email Email `yaml:"email" mapstructure:"email" validate:"-"` + Registry Registry `yaml:"registry" mapstructure:"registry" validate:"required"` + WebAuthnConfig WebAuthnConfig `yaml:"web_authn_config" mapstructure:"web_authn_config"` + Environment Environment `yaml:"environment" mapstructure:"environment" validate:"required"` + Debug bool `yaml:"debug" mapstructure:"debug"` + } + + WebAppConfig struct { + Endpoint string `yaml:"endpoint" mapstructure:"endpoint" validate:"required"` + RedirectURL string `yaml:"redirect_url" mapstructure:"redirect_url" validate:"required"` + ErrorRedirectPath string `yaml:"error_redirect_path" mapstructure:"error_redirect_path"` + CallbackURL string `yaml:"callback_url" mapstructure:"callback_url"` } DFS struct { diff --git a/db/migrations/000001_create_users_table.up.sql b/db/migrations/000001_create_users_table.up.sql index f4998134..8d9783af 100644 --- a/db/migrations/000001_create_users_table.up.sql +++ b/db/migrations/000001_create_users_table.up.sql @@ -21,5 +21,7 @@ CREATE TABLE "users" ( "avatar_url" varchar, "oauth_id" int, "is_active" boolean, - "hireable" boolean + "hireable" boolean, + "webauthn_connected" boolean default false, + "github_connected" boolean default false ); diff --git a/go.mod b/go.mod index ad85f857..735868bd 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,8 @@ require ( github.com/google/go-github/v42 v42.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-multierror v1.1.1 + github.com/jackc/pgconn v1.14.0 + github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa github.com/jackc/pgx/v4 v4.18.1 github.com/labstack/echo-contrib v0.14.1 github.com/labstack/echo/v4 v4.10.2 @@ -57,7 +59,6 @@ require ( github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.0 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgproto3/v2 v2.3.2 // indirect diff --git a/go.sum b/go.sum index e1beb6e9..73029568 100644 --- a/go.sum +++ b/go.sum @@ -299,6 +299,8 @@ github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa h1:s+4MhCQ6YrzisK6hFJUX53drDT4UsSW3DEhKn0ifuHw= +github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= diff --git a/router/helpers.go b/router/helpers.go index 0c6351ae..4e8cbe0e 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -10,10 +10,10 @@ import ( // These are helper functions to Register depending on the usability // RegisterAuthRoutes includes all the auth related endpoints func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { - authRouter.Add(http.MethodPost, "/signup", authSvc.SignUp) + // authRouter.Add(http.MethodPost, "/signup", authSvc.SignUp) authRouter.Add(http.MethodPost, "/send-email/welcome", authSvc.Invites) - authRouter.Add(http.MethodGet, "/signup/verify", authSvc.VerifyEmail) - authRouter.Add(http.MethodPost, "/signin", authSvc.SignIn) + // authRouter.Add(http.MethodGet, "/signup/verify", authSvc.VerifyEmail) + // authRouter.Add(http.MethodPost, "/signin", authSvc.SignIn) authRouter.Add(http.MethodPost, "/token", authSvc.SignIn) authRouter.Add(http.MethodDelete, "/signout", authSvc.SignOut) authRouter.Add(http.MethodGet, "/sessions/me", authSvc.ReadUserWithSession) diff --git a/router/router.go b/router/router.go index 2201761b..85ffb35e 100644 --- a/router/router.go +++ b/router/router.go @@ -28,7 +28,7 @@ func Register( ) { e.Use(middleware.Recover()) e.Use(middleware.CORSWithConfig(middleware.CORSConfig{ - AllowOrigins: strings.Split(cfg.WebAppEndpoint, ","), + AllowOrigins: strings.Split(cfg.WebAppConfig.Endpoint, ","), AllowMethods: middleware.DefaultCORSConfig.AllowMethods, AllowHeaders: middleware.DefaultCORSConfig.AllowHeaders, AllowCredentials: true, @@ -72,7 +72,7 @@ func Register( //catch-all will redirect user back to web interface e.Add(http.MethodGet, "/", func(ctx echo.Context) error { - return ctx.Redirect(http.StatusTemporaryRedirect, cfg.WebAppEndpoint) + return ctx.Redirect(http.StatusTemporaryRedirect, cfg.WebAppConfig.Endpoint) }) } diff --git a/store/postgres/postgres.go b/store/postgres/postgres.go index 2a0de68e..644c22f6 100644 --- a/store/postgres/postgres.go +++ b/store/postgres/postgres.go @@ -27,7 +27,10 @@ type UserReader interface { GetUserWithSession(ctx context.Context, sessionId string) (*types.User, error) IsActive(ctx context.Context, identifier string) bool GetVerifyEmail(ctx context.Context, userId string) (string, error) - UserExists(ctx context.Context, id string) bool + // ID can be either a username, oauth login (GitHub username) or the user id (uuid) + UserExists(ctx context.Context, username, email string) (bool, bool) + GetOAuthUser(ctx context.Context, identifier string, txn pgx.Tx) (*types.User, error) + UpdateOAuthUser(ctx context.Context, email, login, nodeId string, txn pgx.Tx) error } type UserWriter interface { @@ -102,6 +105,7 @@ type WebAuthN interface { AddWebAuthSessionData(ctx context.Context, userId string, sessionData *webauthn.SessionData, sessionType string) error AddWebAuthNCredentials(ctx context.Context, userId string, credential *webauthn.Credential) error RemoveWebAuthSessionData(ctx context.Context, credentialOwnerID string) error + WebauthnUserExists(ctx context.Context, email, username string) bool } type pg struct { diff --git a/store/postgres/queries/users.go b/store/postgres/queries/users.go index 4d5587cb..ed341ed5 100644 --- a/store/postgres/queries/users.go +++ b/store/postgres/queries/users.go @@ -1,11 +1,11 @@ -//nolint +// nolint package queries var ( - AddUser = `insert into users (id, is_active, username, name, email, password, hireable, html_url, created_at, updated_at) -values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);` - GetUser = `select id, is_active, username, email, created_at, updated_at from users where email=$1 or username=$1;` - GetUserWithPassword = `select id, is_active, username, email, password, created_at, updated_at from users where email=$1 or username=$1;` + AddUser = `insert into users (id, is_active, username, name, email, password, webauthn_connected, github_connected, hireable, html_url, created_at, updated_at) +values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);` + GetUser = `select id, is_active, username, email, created_at, updated_at, webauthn_connected, github_connected from users where email=$1 or username=$1;` + GetUserWithPassword = `select id, is_active, username, email, password, created_at, updated_at from, webauthn_connected, github_connected users where email=$1 or username=$1;` GetUserById = `select id, is_active, username, email, created_at, updated_at from users where id=$1;` GetUserByIdWithPassword = `select id, is_active, username, email, password, created_at, updated_at from users where id=$1;` GetUserWithSession = `select id, is_active, name, username, email, hireable, html_url, created_at, updated_at from users where id=(select owner from session where id=$1);` @@ -14,9 +14,12 @@ values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);` DeleteUser = `delete from users where username = $1;` UpdateUserPwd = `update users set password=$1 where id=$2;` GetAllEmails = `select email from users;` - AddOAuthUser = `insert into users (id, username, email, html_url, created_at, updated_at, + AddOAuthUser = `insert into users (id, username, email, github_connected, html_url, created_at, updated_at, bio, type, gravatar_id, login, name, node_id, avatar_url, oauth_id, is_active, hireable) -values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) on conflict (email) do update set username=$2, email=$3` +values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)` + UserExists = `select exists (select username from users where username=$1 or id=$id or login=$1 or email=$1)` + GetOAuthUser = `select id, username, email, github_connected, webauthn_connected from users where email=$1 or username=$1;` + UpdateOAuthUser = `update users set email=$1, login=$2,node_id=$3` ) var ( diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index 3b913a1c..8ad62694 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -18,4 +18,6 @@ var ( where credential_owner_id=$1;` RemoveWebAuthNSessionData = `delete from web_authn_session where credential_owner_id = $1` RemoveWebAuthNCredentials = `delete from web_authn_creds where credential_owner_id = $1` + WebauthnUserExists = `select exists (select username, email from users where (username=$1 or email=$2) and webauthn_connected=true)` + GithubUserExists = `select exists (select username, email from users where (username=$1 or email=$2) and github_connected=true)` ) diff --git a/store/postgres/users.go b/store/postgres/users.go index 5c0613d2..ceb27547 100644 --- a/store/postgres/users.go +++ b/store/postgres/users.go @@ -34,6 +34,8 @@ func (p *pg) AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error { u.Name, u.Email, u.Password, + u.WebauthnConnected, + u.GithubConnected, u.Hireable, u.HTMLURL, t, @@ -72,17 +74,21 @@ func (p *pg) AddOAuthUser(ctx context.Context, u *types.User) error { defer cancel() t := time.Now() - id, err := uuid.NewRandom() - if err != nil { - return fmt.Errorf("error creating id for oauth user") + if u.Id == "" { + id, err := uuid.NewRandom() + if err != nil { + return fmt.Errorf("error creating id for oauth user") + } + u.Id = id.String() } - _, err = p.conn.Exec( + _, err := p.conn.Exec( childCtx, queries.AddOAuthUser, - id.String(), + u.Id, u.Username, u.Email, + u.GithubConnected, u.HTMLURL, t, t, @@ -130,6 +136,8 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, &user.Password, &user.CreatedAt, &user.UpdatedAt, + &user.WebauthnConnected, + &user.GithubConnected, ) if err != nil { return nil, fmt.Errorf("ERR_GET_USER_WITH_PASSWORD_FROM_DB: %w", err) @@ -146,6 +154,8 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, &user.Email, &user.CreatedAt, &user.UpdatedAt, + &user.WebauthnConnected, + &user.GithubConnected, ) if err != nil { return nil, fmt.Errorf("ERR_GET_USER_FROM_DB: %w", err) @@ -154,6 +164,49 @@ func (p *pg) GetUser(ctx context.Context, identifier string, withPassword bool, return &user, nil } +// GetUser returns a types.User. Any of the following parameters can be used to querying the user: +// - user id +// - user email +// - user's username +// It also takes an optional txn field, which can be helpful to query this information from uncommited txns +func (p *pg) GetOAuthUser(ctx context.Context, identifier string, txn pgx.Tx) (*types.User, error) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + + queryRow := p.conn.QueryRow + if txn != nil { + queryRow = txn.QueryRow + } + + // GetOAuthUser = `select id, is_active, username, login, email, node_id, created_at, updated_at from users where email=$1 or username=$1;` + var user types.User + row := queryRow(childCtx, queries.GetOAuthUser, identifier) + err := row.Scan( + &user.Id, + &user.Username, + &user.Email, + &user.GithubConnected, + &user.WebauthnConnected, + ) + if err != nil { + return nil, fmt.Errorf("ERR_GET_OAUTH_USER_FROM_DB: %w", err) + } + + return &user, nil +} + +func (p *pg) UpdateOAuthUser(ctx context.Context, email, login, nodeId string, txn pgx.Tx) error { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) + defer cancel() + + _, err := p.conn.Exec(childCtx, queries.UpdateOAuthUser, email, login, nodeId) + if err != nil { + return fmt.Errorf("ERR_UPDATE_OAUTH_USER_FROM_DB: %w", err) + } + + return nil +} + // GetUserById returns a types.User. The parameter used to query the user is userID. // It also takes an optional txn field, which can be helpful to query this information from uncommited txns func (p *pg) GetUserById(ctx context.Context, userId string, withPassword bool, txn pgx.Tx) (*types.User, error) { @@ -314,14 +367,35 @@ func (p *pg) IsActive(ctx context.Context, identifier string) bool { return row != nil } -func (p *pg) UserExists(ctx context.Context, id string) bool { - childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) - defer cancel() - - row, err := p.GetUserById(childCtx, id, false, nil) - if err != nil || row == nil { +// ID can be either a username or a uuid +// func (p *pg) UserExists(ctx context.Context, id string) bool { +// childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*100) +// defer cancel() +// +// var exists bool +// if err := p.conn.QueryRow(childCtx, queries.UserExists, id).Scan(&exists); err != nil { +// return false +// +// } +// +// return exists +// } + +func (p *pg) githubUserExists(ctx context.Context, username, email string) bool { + var exists bool + err := p.conn.QueryRow(ctx, queries.GithubUserExists, username, email).Scan((&exists)) + if err != nil { return false } - return true + return exists +} + +// returns github or webauthn user exists +func (p *pg) UserExists(ctx context.Context, username, email string) (bool, bool) { + childCtx, cancel := context.WithTimeout(ctx, time.Millisecond*500) + defer cancel() + + return p.githubUserExists(childCtx, email, username), p.WebauthnUserExists(childCtx, email, username) + } diff --git a/store/postgres/web_authn.go b/store/postgres/web_authn.go index 28f9c9cd..d943a55d 100644 --- a/store/postgres/web_authn.go +++ b/store/postgres/web_authn.go @@ -116,3 +116,13 @@ func (p *pg) GetWebAuthNCredentials(ctx context.Context, credentialOwnerID strin } return &creds, nil } + +func (p *pg) WebauthnUserExists(ctx context.Context, username, email string) bool { + var exists bool + err := p.conn.QueryRow(ctx, queries.WebauthnUserExists, username, email).Scan((&exists)) + if err != nil { + return false + } + + return exists +} diff --git a/types/users.go b/types/users.go index 4de21823..f0d71d4f 100644 --- a/types/users.go +++ b/types/users.go @@ -8,7 +8,6 @@ import ( "unicode" "github.com/go-playground/validator/v10" - "github.com/go-webauthn/webauthn/webauthn" ) type ( @@ -33,10 +32,11 @@ type ( Name string `json:"name,omitempty"` NodeID string `json:"node_id,omitempty"` OrganizationsURL string `json:"organizations_url,omitempty"` - credentials []webauthn.Credential - OAuthID int `json:"id,omitempty"` - Hireable bool `json:"hireable,omitempty"` - IsActive bool `json:"is_active,omitempty" validate:"-"` + OAuthID int `json:"id,omitempty"` + Hireable bool `json:"hireable,omitempty"` + IsActive bool `json:"is_active,omitempty" validate:"-"` + WebauthnConnected bool `json:"webauthn_connected"` + GithubConnected bool `json:"github_connected"` } OAuthUser struct { @@ -61,6 +61,7 @@ type ( ID int `json:"id"` Hireable bool `json:"hireable"` } + Session struct { Id string `json:"id"` RefreshToken string `json:"refresh_token"` From 78ada817673c55e711912a56a7198c3bbe04e6d9 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 11 Mar 2023 21:01:09 +0530 Subject: [PATCH 14/19] fix: Linting issues --- auth/server/webauthn_server.go | 29 ----------------------------- auth/webauthn/webauthn.go | 6 ------ store/postgres/users.go | 1 - 3 files changed, 36 deletions(-) diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go index 9f2412ea..726b6d94 100644 --- a/auth/server/webauthn_server.go +++ b/auth/server/webauthn_server.go @@ -15,8 +15,6 @@ import ( "github.com/containerish/OpenRegistry/telemetry" "github.com/containerish/OpenRegistry/types" "github.com/google/uuid" - "github.com/jackc/pgconn" - "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v4" "github.com/labstack/echo/v4" ) @@ -437,30 +435,3 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { wa.logger.Log(ctx, echoErr) return echoErr } - -func (wa *webauthn_server) storeWebauthnUserIfDoesntExist(ctx context.Context, pgErr error, user *types.User) error { - if errors.Unwrap(pgErr) == pgx.ErrNoRows { - id, err := uuid.NewRandom() - if err != nil { - return err - } - user.Id = id.String() - if err = user.Validate(false); err != nil { - return err - } - - user.WebauthnConnected = true - if err = wa.store.AddUser(ctx, user, nil); err != nil { - var pgErr *pgconn.PgError - // this would mean that the user email is already registered - // so we return an error in this case - if errors.As(err, &pgErr) && pgErr.Code == pgerrcode.UniqueViolation { - return fmt.Errorf("username/email already exists") - } - return err - } - return nil - } - - return pgErr -} diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index e5e2f96f..18f8707a 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -6,7 +6,6 @@ import ( "fmt" "io" "log" - "time" "github.com/containerish/OpenRegistry/config" "github.com/containerish/OpenRegistry/store/postgres" @@ -45,11 +44,6 @@ type ( store postgres.WebAuthN core *webauthn.WebAuthn } - - webAuthNMeta struct { - expiresAt time.Time - txn pgx.Tx - } ) // New returns a new Webauthn Service, which has simple wrappers for Signing up and registering a user diff --git a/store/postgres/users.go b/store/postgres/users.go index ceb27547..064c53b7 100644 --- a/store/postgres/users.go +++ b/store/postgres/users.go @@ -178,7 +178,6 @@ func (p *pg) GetOAuthUser(ctx context.Context, identifier string, txn pgx.Tx) (* queryRow = txn.QueryRow } - // GetOAuthUser = `select id, is_active, username, login, email, node_id, created_at, updated_at from users where email=$1 or username=$1;` var user types.User row := queryRow(childCtx, queries.GetOAuthUser, identifier) err := row.Scan( From e85c8d06b5e1b3af4d7a706c4791801ea14599b4 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 11 Mar 2023 21:17:43 +0530 Subject: [PATCH 15/19] fix(deps): JWT Middleware --- auth/jwt_middleware.go | 19 ++++++------------- go.mod | 3 ++- go.sum | 2 ++ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/auth/jwt_middleware.go b/auth/jwt_middleware.go index 5eb94145..ca5fd77c 100644 --- a/auth/jwt_middleware.go +++ b/auth/jwt_middleware.go @@ -8,7 +8,8 @@ import ( "time" "github.com/containerish/OpenRegistry/types" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" + echo_jwt "github.com/labstack/echo-jwt/v4" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" ) @@ -39,7 +40,7 @@ func (a *auth) JWT() echo.MiddlewareFunc { panic(err) } - return middleware.JWTWithConfig(middleware.JWTConfig{ + return echo_jwt.WithConfig(echo_jwt.Config{ Skipper: func(ctx echo.Context) bool { if strings.HasPrefix(ctx.Request().RequestURI, "/auth") { return false @@ -57,11 +58,7 @@ func (a *auth) JWT() echo.MiddlewareFunc { return true }, - BeforeFunc: middleware.DefaultJWTConfig.BeforeFunc, - SuccessHandler: middleware.DefaultJWTConfig.SuccessHandler, - ErrorHandler: nil, - ErrorHandlerWithContext: func(err error, ctx echo.Context) error { - // ErrorHandlerWithContext only logs the failing requtest + ErrorHandler: func(ctx echo.Context, err error) error { ctx.Set(types.HandlerStartTime, time.Now()) a.logger.Log(ctx, err) return ctx.JSON(http.StatusUnauthorized, echo.Map{ @@ -141,12 +138,8 @@ func (a *auth) JWTRest() echo.MiddlewareFunc { panic(err) } - return middleware.JWTWithConfig(middleware.JWTConfig{ - BeforeFunc: middleware.DefaultJWTConfig.BeforeFunc, - SuccessHandler: middleware.DefaultJWTConfig.SuccessHandler, - ErrorHandler: nil, - ErrorHandlerWithContext: func(err error, ctx echo.Context) error { - // ErrorHandlerWithContext only logs the failing requtest + return echo_jwt.WithConfig(echo_jwt.Config{ + ErrorHandler: func(ctx echo.Context, err error) error { ctx.Set(types.HandlerStartTime, time.Now()) a.logger.Log(ctx, err) return ctx.JSON(http.StatusUnauthorized, echo.Map{ diff --git a/go.mod b/go.mod index 735868bd..2248db18 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/go-playground/validator/v10 v10.12.0 github.com/go-webauthn/webauthn v0.7.0 github.com/golang-jwt/jwt v3.2.2+incompatible + github.com/golang-jwt/jwt/v4 v4.4.3 github.com/google/go-github/v42 v42.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-multierror v1.1.1 @@ -21,6 +22,7 @@ require ( github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa github.com/jackc/pgx/v4 v4.18.1 github.com/labstack/echo-contrib v0.14.1 + github.com/labstack/echo-jwt/v4 v4.1.0 github.com/labstack/echo/v4 v4.10.2 github.com/opencontainers/go-digest v1.0.0 github.com/rs/zerolog v1.29.0 @@ -52,7 +54,6 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect github.com/go-webauthn/revoke v0.1.6 // indirect - github.com/golang-jwt/jwt/v4 v4.4.3 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/go-tpm v0.3.3 // indirect diff --git a/go.sum b/go.sum index 73029568..b31c6a74 100644 --- a/go.sum +++ b/go.sum @@ -363,6 +363,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/labstack/echo-contrib v0.14.1 h1:oNUSCeXQOlCGt3eWafzu0mkXjIh3SINnYgE/UR2kYXQ= github.com/labstack/echo-contrib v0.14.1/go.mod h1:6jgpHPjGRk0qrysPCfv3SCau6kewjQtYzOk1fLZGMeQ= +github.com/labstack/echo-jwt/v4 v4.1.0 h1:eYGBxauPkyzBM78KJbR5OSz5uhKMDkhJZhTTIuoH6Pg= +github.com/labstack/echo-jwt/v4 v4.1.0/go.mod h1:DHSSaL6cTgczdPXjf8qrTHRbrau2flcddV7CPMs2U/Y= github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= From fef3339c546361d62747ae384509f629d533e96b Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Thu, 16 Mar 2023 20:04:48 +0530 Subject: [PATCH 16/19] add: Methods to rollback failed login/registration --- auth/server/webauthn_server.go | 59 ++++++++++++++++++++++++++++++---- router/webauthn_routes.go | 3 +- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/auth/server/webauthn_server.go b/auth/server/webauthn_server.go index 726b6d94..2a2d01db 100644 --- a/auth/server/webauthn_server.go +++ b/auth/server/webauthn_server.go @@ -35,10 +35,11 @@ type ( WebauthnServer interface { BeginRegistration(ctx echo.Context) error - RollbackRegistration(ctx echo.Context) error FinishRegistration(ctx echo.Context) error BeginLogin(ctx echo.Context) error FinishLogin(ctx echo.Context) error + RollbackRegistration(ctx echo.Context) error + RollbackSessionData(ctx echo.Context) error } ) @@ -97,6 +98,8 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { return echoErr } + wa.invalidateExistingRequests(ctx.Request().Context(), user.Username) + txn, err := wa.store.NewTxn(ctx.Request().Context()) if err != nil { echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ @@ -126,8 +129,8 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { } webauthnUser := &webauthn.WebAuthnUser{User: &user} - credentialOpts, err := wa.webauthn.BeginRegistration(ctx.Request().Context(), webauthnUser) - if err != nil { + credentialOpts, wErr := wa.webauthn.BeginRegistration(ctx.Request().Context(), webauthnUser) + if wErr != nil { // If we encounter an error here, we need to do the following: // 1. Rollback the session data (since this session data is irrelevant from this point onwards) // 2. Rollback the webauthn user store txn @@ -136,7 +139,7 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { "error": werr.Error(), "message": "failed to rollback stale session data", }) - wa.logger.Log(ctx, err) + wa.logger.Log(ctx, wErr) return echoErr } @@ -145,15 +148,15 @@ func (wa *webauthn_server) BeginRegistration(ctx echo.Context) error { "error": rollbackErr.Error(), "message": "failed to rollback webauthn user txn", }) - wa.logger.Log(ctx, err) + wa.logger.Log(ctx, wErr) return echoErr } echoErr := ctx.JSON(http.StatusInternalServerError, echo.Map{ - "error": err.Error(), + "error": wErr.Error(), "message": "failed to add webauthn session data for existing user", }) - wa.logger.Log(ctx, err) + wa.logger.Log(ctx, wErr) return echoErr } @@ -206,6 +209,41 @@ func (wa *webauthn_server) RollbackRegistration(ctx echo.Context) error { return nil } +func (wa *webauthn_server) RollbackSessionData(ctx echo.Context) error { + username := ctx.QueryParam("username") + if username == "" { + return ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": "invalid request, missing username", + }) + } + + user, err := wa.store.GetUser(ctx.Request().Context(), username, false, nil) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "no user found", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr + } + + err = wa.webauthn.RemoveSessionData(ctx.Request().Context(), user.Id) + if err != nil { + echoErr := ctx.JSON(http.StatusBadRequest, echo.Map{ + "error": err.Error(), + "message": "error rolling back session data for webauthn login", + }) + + wa.logger.Log(ctx, echoErr) + return echoErr + } + + echoErr := ctx.NoContent(http.StatusNoContent) + wa.logger.Log(ctx, echoErr) + return echoErr +} + func (wa *webauthn_server) FinishRegistration(ctx echo.Context) error { ctx.Set(types.HandlerStartTime, time.Now()) @@ -435,3 +473,10 @@ func (wa *webauthn_server) FinishLogin(ctx echo.Context) error { wa.logger.Log(ctx, echoErr) return echoErr } + +func (wa *webauthn_server) invalidateExistingRequests(ctx context.Context, username string) { + meta, ok := wa.txnStore[username] + if ok { + _ = meta.txn.Rollback(ctx) + } +} diff --git a/router/webauthn_routes.go b/router/webauthn_routes.go index ee84ba8b..4f15a389 100644 --- a/router/webauthn_routes.go +++ b/router/webauthn_routes.go @@ -12,8 +12,9 @@ func RegisterWebauthnRoutes( webauthnServer auth_server.WebauthnServer, ) { router.Add(http.MethodPost, "/registration/begin", webauthnServer.BeginRegistration) - router.Add(http.MethodDelete, "/registration/rollback", webauthnServer.RollbackRegistration) router.Add(http.MethodPost, "/registration/finish", webauthnServer.FinishRegistration) router.Add(http.MethodGet, "/login/begin", webauthnServer.BeginLogin) router.Add(http.MethodPost, "/login/finish", webauthnServer.FinishLogin) + router.Add(http.MethodDelete, "/registration/rollback", webauthnServer.RollbackRegistration) + router.Add(http.MethodDelete, "/login/rollback", webauthnServer.RollbackSessionData) } From db03e475e007dd4057bcbdf81e83c0aa5c51ba89 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 18 Mar 2023 20:34:08 +0530 Subject: [PATCH 17/19] fix(deps): Bump go-webauthn and added Timeout options --- auth/webauthn/webauthn.go | 18 ++++++++++++++---- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go index 18f8707a..3ca6bf84 100644 --- a/auth/webauthn/webauthn.go +++ b/auth/webauthn/webauthn.go @@ -133,8 +133,19 @@ func New(cfg *config.WebAuthnConfig, store postgres.WebAuthN) WebAuthnService { ResidentKey: protocol.ResidentKeyRequirementDiscouraged, UserVerification: protocol.VerificationDiscouraged, }, - Timeout: int(cfg.Timeout.Milliseconds()), - Debug: false, + Timeouts: webauthn.TimeoutsConfig{ + Login: webauthn.TimeoutConfig{ + Enforce: true, + Timeout: cfg.Timeout, + TimeoutUVD: cfg.Timeout, + }, + Registration: webauthn.TimeoutConfig{ + Enforce: true, + Timeout: cfg.Timeout, + TimeoutUVD: cfg.Timeout, + }, + }, + Debug: false, }) if err != nil { log.Fatalf("webauthn configuration is invalid: %s", err) @@ -169,8 +180,7 @@ func (wa *webAuthnService) BeginRegistration( excludeList := user.GetWebauthnCredentialDescriptors() authSelect := &protocol.AuthenticatorSelection{ - RequireResidentKey: protocol.ResidentKeyRequired(), - ResidentKey: protocol.ResidentKeyRequirementRequired, + RequireResidentKey: protocol.ResidentKeyNotRequired(), UserVerification: protocol.VerificationDiscouraged, } diff --git a/go.mod b/go.mod index 2248db18..6f8a0d48 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.12.0 - github.com/go-webauthn/webauthn v0.7.0 + github.com/go-webauthn/webauthn v0.8.2 github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang-jwt/jwt/v4 v4.4.3 + github.com/golang-jwt/jwt/v4 v4.5.0 github.com/google/go-github/v42 v42.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-multierror v1.1.1 @@ -53,7 +53,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect - github.com/go-webauthn/revoke v0.1.6 // indirect + github.com/go-webauthn/revoke v0.1.9 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/go-tpm v0.3.3 // indirect diff --git a/go.sum b/go.sum index b31c6a74..1763d6cc 100644 --- a/go.sum +++ b/go.sum @@ -160,10 +160,10 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91 github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI= github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-webauthn/revoke v0.1.6 h1:3tv+itza9WpX5tryRQx4GwxCCBrCIiJ8GIkOhxiAmmU= -github.com/go-webauthn/revoke v0.1.6/go.mod h1:TB4wuW4tPlwgF3znujA96F70/YSQXHPPWl7vgY09Iy8= -github.com/go-webauthn/webauthn v0.7.0 h1:Tk2evkiZGtmbgGoYUbNw2BbPyI8e65tfi8HY9mSluWA= -github.com/go-webauthn/webauthn v0.7.0/go.mod h1:FrFAvvr9oP+tXr1WeDpRz/rYJi5GRG0/EVFfpN7YhKA= +github.com/go-webauthn/revoke v0.1.9 h1:gSJ1ckA9VaKA2GN4Ukp+kiGTk1/EXtaDb1YE8RknbS0= +github.com/go-webauthn/revoke v0.1.9/go.mod h1:j6WKPnv0HovtEs++paan9g3ar46gm1NarktkXBaPR+w= +github.com/go-webauthn/webauthn v0.8.2 h1:8KLIbpldjz9KVGHfqEgJNbkhd7bbRXhNw4QWFJE15oA= +github.com/go-webauthn/webauthn v0.8.2/go.mod h1:d+ezx/jMCNDiqSMzOchuynKb9CVU1NM9BumOnokfcVQ= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -172,8 +172,8 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU= -github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= From 1f5ee90e3dd3d208907bdc50fcf2ce8721ef70c3 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 18 Mar 2023 20:44:05 +0530 Subject: [PATCH 18/19] fix: Re-enable Email/Password signin, signup flows --- .../oci-dist-spec-content-discovery.yml | 8 +++++- .../oci-dist-spec-content-management.yml | 8 +++++- .github/workflows/oci-dist-spec-pull.yml | 2 +- .github/workflows/oci-dist-spec-push.yml | 8 +++++- auth/jwt_middleware.go | 27 ++++++++++--------- config.example.yaml | 8 +++--- router/helpers.go | 6 ++--- store/postgres/queries/users.go | 2 +- store/postgres/users.go | 2 ++ 9 files changed, 48 insertions(+), 23 deletions(-) diff --git a/.github/workflows/oci-dist-spec-content-discovery.yml b/.github/workflows/oci-dist-spec-content-discovery.yml index da97e0be..0b0a7af8 100644 --- a/.github/workflows/oci-dist-spec-content-discovery.yml +++ b/.github/workflows/oci-dist-spec-content-discovery.yml @@ -2,6 +2,12 @@ name: OCI Distribution Spec on: workflow_call: + inputs: + debug_enabled: + type: boolean + description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' + required: false + default: false concurrency: group: content-discovery-${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -81,7 +87,7 @@ jobs: OCI_DEBUG: 0 - name: Setup tmate session if mode is debug and OpenRegistry or OCI Tests Fail uses: mxschmitt/action-tmate@v3 - if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} + if: ${{ always() && (github.event_name == 'workflow_dispatch') && inputs.debug_enabled }} - name: Set output report name id: vars run: echo "short_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/oci-dist-spec-content-management.yml b/.github/workflows/oci-dist-spec-content-management.yml index 07c5c4d3..7222cc62 100644 --- a/.github/workflows/oci-dist-spec-content-management.yml +++ b/.github/workflows/oci-dist-spec-content-management.yml @@ -2,6 +2,12 @@ name: OCI Distribution Spec on: workflow_call: + inputs: + debug_enabled: + type: boolean + description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' + required: false + default: false concurrency: group: content-management-${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -81,7 +87,7 @@ jobs: OCI_DEBUG: 0 - name: Setup tmate session if mode is debug and OpenRegistry or OCI Tests Fail uses: mxschmitt/action-tmate@v3 - if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} + if: ${{ always() && (github.event_name == 'workflow_dispatch') && inputs.debug_enabled }} - name: Set output report name id: vars run: echo "short_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/oci-dist-spec-pull.yml b/.github/workflows/oci-dist-spec-pull.yml index a401d256..17eb5a5c 100644 --- a/.github/workflows/oci-dist-spec-pull.yml +++ b/.github/workflows/oci-dist-spec-pull.yml @@ -87,7 +87,7 @@ jobs: OCI_DEBUG: 0 - name: Setup tmate session if mode is debug and OpenRegistry or OCI Tests Fail uses: mxschmitt/action-tmate@v3 - if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} + if: ${{ always() && (github.event_name == 'workflow_dispatch') && inputs.debug_enabled }} - name: Set output report name id: vars run: echo "short_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/oci-dist-spec-push.yml b/.github/workflows/oci-dist-spec-push.yml index e37788e9..d2112ace 100644 --- a/.github/workflows/oci-dist-spec-push.yml +++ b/.github/workflows/oci-dist-spec-push.yml @@ -2,6 +2,12 @@ name: OCI Distribution Spec on: workflow_call: + inputs: + debug_enabled: + type: boolean + description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' + required: false + default: false concurrency: group: push-${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -82,7 +88,7 @@ jobs: OCI_DEBUG: 0 - name: Setup tmate session if mode is debug and OpenRegistry or OCI Tests Fail uses: mxschmitt/action-tmate@v3 - if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} + if: ${{ always() && (github.event_name == 'workflow_dispatch') && inputs.debug_enabled }} - name: Set output report name id: vars run: echo "short_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT diff --git a/auth/jwt_middleware.go b/auth/jwt_middleware.go index ca5fd77c..abb0910e 100644 --- a/auth/jwt_middleware.go +++ b/auth/jwt_middleware.go @@ -11,7 +11,6 @@ import ( "github.com/golang-jwt/jwt/v4" echo_jwt "github.com/labstack/echo-jwt/v4" "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" ) const ( @@ -69,12 +68,14 @@ func (a *auth) JWT() echo.MiddlewareFunc { KeyFunc: func(t *jwt.Token) (interface{}, error) { return pubKey, nil }, - ParseTokenFunc: middleware.DefaultJWTConfig.ParseTokenFunc, - SigningKey: privkey, - SigningKeys: map[string]interface{}{}, - SigningMethod: jwt.SigningMethodRS256.Name, - Claims: &Claims{}, - TokenLookup: fmt.Sprintf("cookie:%s,header:%s:Bearer ", AccessCookieKey, echo.HeaderAuthorization), + SigningKey: privkey, + SigningKeys: map[string]interface{}{}, + SigningMethod: jwt.SigningMethodRS256.Name, + // Claims: &Claims{}, + NewClaimsFunc: func(c echo.Context) jwt.Claims { + return &Claims{} + }, + TokenLookup: fmt.Sprintf("cookie:%s,header:%s:Bearer ", AccessCookieKey, echo.HeaderAuthorization), }) } @@ -150,10 +151,12 @@ func (a *auth) JWTRest() echo.MiddlewareFunc { KeyFunc: func(t *jwt.Token) (interface{}, error) { return pubKey, nil }, - ParseTokenFunc: middleware.DefaultJWTConfig.ParseTokenFunc, - SigningKey: privkey, - SigningMethod: jwt.SigningMethodRS256.Name, - Claims: &Claims{}, - TokenLookup: fmt.Sprintf("cookie:%s,header:%s:Bearer ", AccessCookieKey, echo.HeaderAuthorization), + SigningKey: privkey, + SigningMethod: jwt.SigningMethodRS256.Name, + NewClaimsFunc: func(c echo.Context) jwt.Claims { + return &Claims{} + }, + // Claims: &Claims{}, + TokenLookup: fmt.Sprintf("cookie:%s,header:%s:Bearer ", AccessCookieKey, echo.HeaderAuthorization), }) } diff --git a/config.example.yaml b/config.example.yaml index b42e7a1a..c5b3bebd 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -1,8 +1,10 @@ environment: local debug: true -web_app_url: "http://localhost:3000" -web_app_redirect_url: "/" -web_app_error_redirect_path: "/auth/unhandled" +web_app: + endpoint: "http://localhost:3000" + error_redirect_path: "/auth/unhandled" + redirect_url: "http://localhost:3000/repositories" + callback_url: "/api/oauth/callback" registry: dns_address: localhost version: master diff --git a/router/helpers.go b/router/helpers.go index 4e8cbe0e..0c6351ae 100644 --- a/router/helpers.go +++ b/router/helpers.go @@ -10,10 +10,10 @@ import ( // These are helper functions to Register depending on the usability // RegisterAuthRoutes includes all the auth related endpoints func RegisterAuthRoutes(authRouter *echo.Group, authSvc auth.Authentication) { - // authRouter.Add(http.MethodPost, "/signup", authSvc.SignUp) + authRouter.Add(http.MethodPost, "/signup", authSvc.SignUp) authRouter.Add(http.MethodPost, "/send-email/welcome", authSvc.Invites) - // authRouter.Add(http.MethodGet, "/signup/verify", authSvc.VerifyEmail) - // authRouter.Add(http.MethodPost, "/signin", authSvc.SignIn) + authRouter.Add(http.MethodGet, "/signup/verify", authSvc.VerifyEmail) + authRouter.Add(http.MethodPost, "/signin", authSvc.SignIn) authRouter.Add(http.MethodPost, "/token", authSvc.SignIn) authRouter.Add(http.MethodDelete, "/signout", authSvc.SignOut) authRouter.Add(http.MethodGet, "/sessions/me", authSvc.ReadUserWithSession) diff --git a/store/postgres/queries/users.go b/store/postgres/queries/users.go index ed341ed5..65e65746 100644 --- a/store/postgres/queries/users.go +++ b/store/postgres/queries/users.go @@ -5,7 +5,7 @@ var ( AddUser = `insert into users (id, is_active, username, name, email, password, webauthn_connected, github_connected, hireable, html_url, created_at, updated_at) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);` GetUser = `select id, is_active, username, email, created_at, updated_at, webauthn_connected, github_connected from users where email=$1 or username=$1;` - GetUserWithPassword = `select id, is_active, username, email, password, created_at, updated_at from, webauthn_connected, github_connected users where email=$1 or username=$1;` + GetUserWithPassword = `select id, is_active, username, email, password, created_at, updated_at, webauthn_connected, github_connected from users where email=$1 or username=$1;` GetUserById = `select id, is_active, username, email, created_at, updated_at from users where id=$1;` GetUserByIdWithPassword = `select id, is_active, username, email, password, created_at, updated_at from users where id=$1;` GetUserWithSession = `select id, is_active, name, username, email, hireable, html_url, created_at, updated_at from users where id=(select owner from session where id=$1);` diff --git a/store/postgres/users.go b/store/postgres/users.go index 064c53b7..da518ee7 100644 --- a/store/postgres/users.go +++ b/store/postgres/users.go @@ -57,6 +57,8 @@ func (p *pg) AddUser(ctx context.Context, u *types.User, txn pgx.Tx) error { u.Name, u.Email, u.Password, + u.WebauthnConnected, + u.GithubConnected, u.Hireable, u.HTMLURL, t, From 6c81ed5191a29270546ebe5bab407c925ebd5299 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Sat, 25 Mar 2023 20:24:24 +0530 Subject: [PATCH 19/19] fix: YAML config example & webauthn queries formatting --- auth/auth.go | 2 +- config.example.yaml | 6 ++++ config.yaml.example | 44 ----------------------------- store/postgres/queries/web_authn.go | 25 +++++++++++----- 4 files changed, 25 insertions(+), 52 deletions(-) delete mode 100644 config.yaml.example diff --git a/auth/auth.go b/auth/auth.go index 556180b2..1881df71 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -80,7 +80,7 @@ type ( // @TODO (jay-dee7) maybe a better way to do it? func (a *auth) stateTokenCleanup() { - // tick every 10 minutes, delete ant oauth state tokens which are older than 10 mins + // tick every 10 seconds, delete any oauth state tokens which are older than 10 mins // duration = 10mins, because github short lived code is valid for 10 mins for range time.Tick(time.Second * 10) { for key, t := range a.oauthStateStore { diff --git a/config.example.yaml b/config.example.yaml index c5b3bebd..a7d679b5 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -48,3 +48,9 @@ database: username: postgres password: Qwerty@123 name: open_registry +web_authn_config: + rp_display_name: + rp_id: localhost + rp_origins: + - http://localhost:3000 + rp_icon: diff --git a/config.yaml.example b/config.yaml.example deleted file mode 100644 index 8bbc2d5a..00000000 --- a/config.yaml.example +++ /dev/null @@ -1,44 +0,0 @@ -environment: local -debug: true -web_app_url: "http://localhost:3000" -web_app_redirect_url: "/" -web_app_error_redirect_path: "/auth/unhandled" -registry: - dns_address: localhost - version: master - fqdn: localhost - jwt_signing_secret: super-secret - host: 0.0.0.0 - port: 5000 - tls: - enabled: true - priv_key: .certs/registry.local - pub_key: .certs/registry.local.crt - services: - - github - - token - - skynet_homescreen -oauth: - github: - client_id: dummy-gh-client-id - client_secret: dummy-gh-client-secret -dfs: - s3_any: - access_key: - secret_key: - endpoint: - bucket_name: - dfs_link_resolver: -database: - kind: postgres - host: 0.0.0.0 - port: 5432 - username: postgres - password: Qwerty@123 - name: open_registry -web_authn_config: - rp_display_name: - rp_id: localhost - rp_origins: - - http://localhost:3000 - rp_icon: diff --git a/store/postgres/queries/web_authn.go b/store/postgres/queries/web_authn.go index 8ad62694..08f26b86 100644 --- a/store/postgres/queries/web_authn.go +++ b/store/postgres/queries/web_authn.go @@ -9,15 +9,26 @@ var ( values ($1,$2,$3,$4,$5,$6,$7) on conflict (credential_owner_id) do update set user_id=$2,challenge=$3,allowed_credential_id=$4,user_verification=$5,extensions=$6,session_type=$7;` - GetWebAuthNSessionData = `select user_id,challenge,allowed_credential_id,user_verification,extensions from - web_authn_session where credential_owner_id=$1 and session_type=$2;` - AddWebAuthNCredentials = `insert into web_authn_creds (credential_owner_id,id,public_key,attestation_type,aaguid, - sign_count,clone_warning) values ($1,$2,$3,$4,$5,$6,$7);` - GetWebAuthNCredentials = `select id,public_key,attestation_type,aaguid,sign_count,clone_warning from web_authn_creds + GetWebAuthNSessionData = `select user_id,challenge,allowed_credential_id,user_verification,extensions + from web_authn_session + where credential_owner_id=$1 and session_type=$2;` + + AddWebAuthNCredentials = `insert into web_authn_creds + (credential_owner_id,id,public_key,attestation_type,aaguid,sign_count,clone_warning) + values ($1,$2,$3,$4,$5,$6,$7);` + + GetWebAuthNCredentials = `select id,public_key,attestation_type,aaguid,sign_count,clone_warning + from web_authn_creds where credential_owner_id=$1;` + RemoveWebAuthNSessionData = `delete from web_authn_session where credential_owner_id = $1` + RemoveWebAuthNCredentials = `delete from web_authn_creds where credential_owner_id = $1` - WebauthnUserExists = `select exists (select username, email from users where (username=$1 or email=$2) and webauthn_connected=true)` - GithubUserExists = `select exists (select username, email from users where (username=$1 or email=$2) and github_connected=true)` + + WebauthnUserExists = `select exists + (select username, email from users where (username=$1 or email=$2) and webauthn_connected=true)` + + GithubUserExists = `select exists + (select username, email from users where (username=$1 or email=$2) and github_connected=true)` )