From 50e4eb3b4374e3e9a67be3fa0092a0cf0801f4c0 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Tue, 18 May 2021 21:49:09 +0300 Subject: [PATCH 1/8] [#46] authmate: Copy files from cdn-authmate repository to neofs-s3-gw Copy authmate main file and s3 agent Signed-off-by: Angira Kekteeva --- authmate/s3.go | 229 +++++++++++++++++++++++++ cmd/authmate/main.go | 392 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 621 insertions(+) create mode 100644 authmate/s3.go create mode 100644 cmd/authmate/main.go diff --git a/authmate/s3.go b/authmate/s3.go new file mode 100644 index 0000000..c36b4c4 --- /dev/null +++ b/authmate/s3.go @@ -0,0 +1,229 @@ +package s3 + +import ( + "context" + "crypto/ecdsa" + "encoding/json" + "io" + "math" + "strconv" + "time" + + sdk "github.com/nspcc-dev/cdn-sdk" + "github.com/nspcc-dev/cdn-sdk/creds/bearer" + "github.com/nspcc-dev/cdn-sdk/creds/hcs" + "github.com/nspcc-dev/cdn-sdk/creds/neofs" + "github.com/nspcc-dev/cdn-sdk/creds/s3" + "github.com/nspcc-dev/neofs-api-go/pkg/acl/eacl" + "github.com/nspcc-dev/neofs-api-go/pkg/container" + "github.com/nspcc-dev/neofs-api-go/pkg/netmap" + "github.com/nspcc-dev/neofs-api-go/pkg/object" + "github.com/nspcc-dev/neofs-api-go/pkg/owner" + "github.com/nspcc-dev/neofs-api-go/pkg/token" + "github.com/nspcc-dev/neofs-node/pkg/policy" + "github.com/pkg/errors" + "go.uber.org/zap" +) + +const defaultAuthContainerBasicACL uint32 = 0b00111100100011001000110011001100 + +type Agent struct { + cli sdk.Client + log *zap.Logger +} + +func New(log *zap.Logger, client sdk.Client) *Agent { + return &Agent{log: log, cli: client} +} + +type ( + IssueSecretOptions struct { + ContainerID *container.ID + ContainerFriendlyName string + NEOFSCreds neofs.Credentials + OwnerPrivateKey hcs.PrivateKey + GatesPublicKeys []hcs.PublicKey + EACLRules []byte + } + + ObtainSecretOptions struct { + SecretAddress string + GatePrivateKey hcs.PrivateKey + } +) + +type ( + issuingResult struct { + AccessKeyID string `json:"access_key_id"` + SecretAccessKey string `json:"secret_access_key"` + OwnerPrivateKey string `json:"owner_private_key"` + } + + obtainingResult struct { + BearerToken *token.BearerToken `json:"-"` + SecretAccessKey string `json:"secret_access_key"` + } +) + +func (a *Agent) checkContainer(ctx context.Context, cid *container.ID, friendlyName string) (*container.ID, error) { + if cid != nil { + // check that container exists + _, err := a.cli.Container().Get(ctx, cid) + return cid, err + } + + pp, err := buildPlacementPolicy("") + if err != nil { + return nil, errors.Wrap(err, "failed to build placement policy") + } + + cnr := container.New( + container.WithPolicy(pp), + container.WithCustomBasicACL(defaultAuthContainerBasicACL), + container.WithAttribute(container.AttributeName, friendlyName), + container.WithAttribute(container.AttributeTimestamp, strconv.FormatInt(time.Now().Unix(), 10))) + + return a.cli.Container().Put(ctx, cnr, + sdk.ContainerPutAndWait(), + sdk.ContainerPutWithTimeout(120*time.Second)) +} + +func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecretOptions) error { + var ( + err error + cid *container.ID + ) + + a.log.Info("check container", zap.Stringer("cid", options.ContainerID)) + if cid, err = a.checkContainer(ctx, options.ContainerID, options.ContainerFriendlyName); err != nil { + return err + } + + a.log.Info("prepare eACL table") + + table, err := buildEACLTable(cid, options.EACLRules) + if err != nil { + return errors.Wrap(err, "failed to build eacl table") + } + + tkn, err := buildBearerToken(options.NEOFSCreds.PrivateKey(), options.NEOFSCreds.Owner(), table) + if err != nil { + return errors.Wrap(err, "failed to build bearer token") + } + + a.log.Info("store bearer token into NeoFS", + zap.Stringer("owner_key", options.NEOFSCreds.Owner()), + zap.Stringer("owner_tkn", tkn.Issuer())) + + address, err := bearer. + New(a.cli.Object(), options.OwnerPrivateKey). + Put(ctx, cid, tkn, options.GatesPublicKeys...) + if err != nil { + return errors.Wrap(err, "failed to put bearer token") + } + + secret, err := s3.SecretAccessKey(tkn) + if err != nil { + return errors.Wrap(err, "failed to get bearer token secret key") + } + + ir := &issuingResult{ + AccessKeyID: address.String(), + SecretAccessKey: secret, + OwnerPrivateKey: options.OwnerPrivateKey.String(), + } + + enc := json.NewEncoder(w) + enc.SetIndent("", " ") + return enc.Encode(ir) +} + +func (a *Agent) ObtainSecret(ctx context.Context, w io.Writer, options *ObtainSecretOptions) error { + bearerCreds := bearer.New(a.cli.Object(), options.GatePrivateKey) + address := object.NewAddress() + if err := address.Parse(options.SecretAddress); err != nil { + return errors.Wrap(err, "failed to parse secret address") + } + + tkn, err := bearerCreds.Get(ctx, address) + if err != nil { + return errors.Wrap(err, "failed to get bearer token") + } + + secret, err := s3.SecretAccessKey(tkn) + if err != nil { + return errors.Wrap(err, "failed to get bearer token secret key") + } + + or := &obtainingResult{ + BearerToken: tkn, + SecretAccessKey: secret, + } + + enc := json.NewEncoder(w) + enc.SetIndent("", " ") + return enc.Encode(or) +} + +func buildPlacementPolicy(placementRules string) (*netmap.PlacementPolicy, error) { + if len(placementRules) != 0 { + return policy.Parse(placementRules) + } + + /* + REP 1 IN X // place one copy of object + CBF 1 + SELECT 2 From * AS X // in container of two nodes + */ + pp := new(netmap.PlacementPolicy) + pp.SetContainerBackupFactor(1) + pp.SetReplicas([]*netmap.Replica{newReplica("X", 1)}...) + pp.SetSelectors([]*netmap.Selector{newSimpleSelector("X", 2)}...) + + return pp, nil +} + +// selects nodes in container without any additional attributes +func newSimpleSelector(name string, count uint32) (s *netmap.Selector) { + s = new(netmap.Selector) + s.SetCount(count) + s.SetFilter("*") + s.SetName(name) + return +} + +func newReplica(name string, count uint32) (r *netmap.Replica) { + r = new(netmap.Replica) + r.SetCount(count) + r.SetSelector(name) + return +} + +func buildEACLTable(cid *container.ID, eaclTable []byte) (*eacl.Table, error) { + table := eacl.NewTable() + if len(eaclTable) != 0 { + return table, table.UnmarshalJSON(eaclTable) + } + + record := eacl.NewRecord() + record.SetOperation(eacl.OperationGet) + record.SetAction(eacl.ActionAllow) + // TODO: Change this later. + // from := eacl.HeaderFromObject + // matcher := eacl.MatchStringEqual + // record.AddFilter(from eacl.FilterHeaderType, matcher eacl.Match, name string, value string) + eacl.AddFormedTarget(record, eacl.RoleOthers) + table.SetCID(cid) + table.AddRecord(record) + + return table, nil +} + +func buildBearerToken(key *ecdsa.PrivateKey, oid *owner.ID, table *eacl.Table) (*token.BearerToken, error) { + bearerToken := token.NewBearerToken() + bearerToken.SetEACLTable(table) + bearerToken.SetOwner(oid) + bearerToken.SetLifetime(math.MaxUint64, 0, 0) + + return bearerToken, bearerToken.SignToken(key) +} diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go new file mode 100644 index 0000000..b87e966 --- /dev/null +++ b/cmd/authmate/main.go @@ -0,0 +1,392 @@ +package main + +import ( + "context" + "crypto/rand" + "encoding/json" + "fmt" + "os" + "time" + + "github.com/nspcc-dev/cdn-authmate/agents/s3" + sdk "github.com/nspcc-dev/cdn-sdk" + "github.com/nspcc-dev/cdn-sdk/creds/hcs" + "github.com/nspcc-dev/cdn-sdk/creds/neofs" + "github.com/nspcc-dev/cdn-sdk/grace" + "github.com/nspcc-dev/cdn-sdk/pool" + "github.com/nspcc-dev/neofs-api-go/pkg/container" + "github.com/pkg/errors" + "github.com/urfave/cli/v2" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" +) + +type gateKey struct { + PrivateKey string `json:"private_key"` + PublicKey string `json:"public_key"` +} + +const ( + poolConnectTimeout = 5 * time.Second + poolRequestTimeout = 5 * time.Second +) + +var ( + // Build = "now" + Version = "dev" +) + +var ( + neoFSKeyPathFlag string + peerAddressFlag string + eaclRulesFlag string + gatePrivateKeyFlag string + secretAddressFlag string + ownerPrivateKeyFlag string + containerIDFlag string + containerFriendlyName string + gatesPublicKeysFlag cli.StringSlice + gatesKeysCountFlag int + logEnabledFlag bool + logDebugEnabledFlag bool +) + +var zapConfig = zap.Config{ + Development: true, + Encoding: "console", + Level: zap.NewAtomicLevelAt(zapcore.FatalLevel), + OutputPaths: []string{"stdout"}, + EncoderConfig: zapcore.EncoderConfig{ + MessageKey: "message", + LevelKey: "level", + EncodeLevel: zapcore.CapitalLevelEncoder, + TimeKey: "time", + EncodeTime: zapcore.ISO8601TimeEncoder, + CallerKey: "caller", + EncodeCaller: zapcore.ShortCallerEncoder, + }, +} + +func prepare() (context.Context, *zap.Logger) { + var ( + err error + log = zap.NewNop() + ) + + if !logEnabledFlag { + return grace.Context(log), log + } else if logDebugEnabledFlag { + zapConfig.Level = zap.NewAtomicLevelAt(zapcore.DebugLevel) + } + + if log, err = zapConfig.Build(); err != nil { + panic(err) + } + + return grace.Context(log), log +} + +func main() { + app := &cli.App{ + Name: "NeoFS gate authentication manager", + Usage: "Helps manage delegated access via gates to data stored in NeoFS network", + Version: Version, + Flags: appFlags(), + Commands: appCommands(), + } + + if err := app.Run(os.Args); err != nil { + _, _ = fmt.Fprintf(os.Stderr, "error: %s\n", err) + os.Exit(100) + } +} + +func appFlags() []cli.Flag { + return []cli.Flag{ + &cli.BoolFlag{ + Name: "with-log", + Usage: "Enable logger", + Destination: &logEnabledFlag, + }, + &cli.BoolFlag{ + Name: "debug", + Usage: "Enable debug logger level", + Destination: &logDebugEnabledFlag, + }, + } +} + +func appCommands() []*cli.Command { + return []*cli.Command{ + issueSecret(), + obtainSecret(), + generateKeys(), + } +} + +func generateGatesKeys(count int) ([]hcs.Credentials, error) { + var ( + err error + res = make([]hcs.Credentials, count, count) + ) + + for i := 0; i < count; i++ { + if res[i], err = hcs.Generate(rand.Reader); err != nil { + return nil, err + } + } + + return res, nil +} + +func generateKeys() *cli.Command { + return &cli.Command{ + Name: "generate-keys", + Usage: "Generate key pairs for gates", + Flags: []cli.Flag{ + &cli.IntFlag{ + Name: "count", + Usage: "number of x25519 key pairs to generate", + Value: 1, + Destination: &gatesKeysCountFlag, + }, + }, + Action: func(c *cli.Context) error { + _, log := prepare() + + log.Info("start generating x25519 keys") + + csl, err := generateGatesKeys(gatesKeysCountFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to create key pairs of gates: %s", err), 1) + } + + log.Info("generated x25519 keys") + + gatesKeys := make([]gateKey, len(csl), len(csl)) + for i, cs := range csl { + privateKey, publicKey := cs.PrivateKey().String(), cs.PublicKey().String() + gatesKeys[i] = gateKey{PrivateKey: privateKey, PublicKey: publicKey} + } + + keys, err := json.MarshalIndent(gatesKeys, "", " ") + if err != nil { + return cli.Exit(fmt.Sprintf("failed to marshal key pairs of gates: %s", err), 2) + } + + fmt.Println(string(keys)) + return nil + }, + } +} + +func issueSecret() *cli.Command { + return &cli.Command{ + Name: "issue-secret", + Usage: "Issue a secret in NeoFS network", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "neofs-key", + Value: "", + Usage: "path to owner's neofs private ecdsa key", + Required: true, + Destination: &neoFSKeyPathFlag, + }, + &cli.StringFlag{ + Name: "peer", + Value: "", + Usage: "address of a neofs peer to connect to", + Required: true, + Destination: &peerAddressFlag, + }, + &cli.StringFlag{ + Name: "rules", + Usage: "eacl rules as plain json string", + Required: false, + Destination: &eaclRulesFlag, + }, + &cli.StringSliceFlag{ + Name: "gate-public-key", + Usage: "public x25519 key of a gate (use flags repeatedly for multiple gates)", + Required: true, + Destination: &gatesPublicKeysFlag, + }, + &cli.StringFlag{ + Name: "owner-private-key", + Usage: "owner's private x25519 key", + Required: false, + Destination: &ownerPrivateKeyFlag, + }, + &cli.StringFlag{ + Name: "container-id", + Usage: "auth container id to put the secret into", + Required: false, + Destination: &containerIDFlag, + }, + &cli.StringFlag{ + Name: "container-friendly-name", + Usage: "friendly name of auth container to put the secret into", + Required: false, + Destination: &containerFriendlyName, + Value: "auth-container", + }, + }, + Action: func(c *cli.Context) error { + ctx, log := prepare() + + neofsCreds, err := neofs.New(neoFSKeyPathFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to load neofs private key: %s", err), 1) + } + + ctx, cancel := context.WithCancel(ctx) + defer cancel() + + client, err := createSDKClient(ctx, log, neofsCreds, peerAddressFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) + } + + agent := s3.New(log, client) + var cid *container.ID + if len(containerIDFlag) > 0 { + cid = container.NewID() + if err := cid.Parse(containerIDFlag); err != nil { + return cli.Exit(fmt.Sprintf("failed to parse auth container id: %s", err), 3) + } + } + + var owner hcs.Credentials + if owner, err = fetchHCSCredentials(ownerPrivateKeyFlag); err != nil { + return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4) + } + + var gatesPublicKeys []hcs.PublicKey + for _, key := range gatesPublicKeysFlag.Value() { + gpk, err := hcs.LoadPublicKey(key) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to load gate's public key: %s", err), 5) + } + gatesPublicKeys = append(gatesPublicKeys, gpk) + } + + issueSecretOptions := &s3.IssueSecretOptions{ + ContainerID: cid, + ContainerFriendlyName: containerFriendlyName, + NEOFSCreds: neofsCreds, + OwnerPrivateKey: owner.PrivateKey(), + GatesPublicKeys: gatesPublicKeys, + EACLRules: []byte(eaclRulesFlag), + } + + if err = agent.IssueSecret(ctx, os.Stdout, issueSecretOptions); err != nil { + return cli.Exit(fmt.Sprintf("failed to issue secret: %s", err), 6) + } + + return nil + }, + } +} + +func obtainSecret() *cli.Command { + command := &cli.Command{ + Name: "obtain-secret", + Usage: "Obtain a secret from NeoFS network", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "neofs-key", + Value: "", + Usage: "path to owner's neofs private ecdsa key", + Required: true, + Destination: &neoFSKeyPathFlag, + }, + &cli.StringFlag{ + Name: "peer", + Value: "", + Usage: "address of neofs peer to connect to", + Required: true, + Destination: &peerAddressFlag, + }, + &cli.StringFlag{ + Name: "gate-private-key", + Usage: "gate's private x25519 key", + Required: true, + Destination: &gatePrivateKeyFlag, + }, + &cli.StringFlag{ + Name: "secret-address", + Usage: "address of a secret (i.e. access key id for s3)", + Required: true, + Destination: &secretAddressFlag, + }, + }, + Action: func(c *cli.Context) error { + ctx, log := prepare() + + neofsCreds, err := neofs.New(neoFSKeyPathFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to load neofs private key: %s", err), 1) + } + + ctx, cancel := context.WithCancel(ctx) + defer cancel() + + client, err := createSDKClient(ctx, log, neofsCreds, peerAddressFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) + } + + agent := s3.New(log, client) + + var _ = agent + + gateCreds, err := hcs.NewCredentials(gatePrivateKeyFlag) + if err != nil { + return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4) + } + + obtainSecretOptions := &s3.ObtainSecretOptions{ + SecretAddress: secretAddressFlag, + GatePrivateKey: gateCreds.PrivateKey(), + } + + if err = agent.ObtainSecret(ctx, os.Stdout, obtainSecretOptions); err != nil { + return cli.Exit(fmt.Sprintf("failed to obtain secret: %s", err), 5) + } + + return nil + }, + } + return command +} + +func fetchHCSCredentials(val string) (hcs.Credentials, error) { + if val == "" { + return hcs.Generate(rand.Reader) + } + + return hcs.NewCredentials(val) +} + +func createSDKClient(ctx context.Context, log *zap.Logger, neofsCreds neofs.Credentials, peerAddress string) (sdk.Client, error) { + log.Debug("prepare connection pool") + + p, err := pool.New(ctx, + pool.WithLogger(log), + pool.WithAddress(peerAddress), + pool.WithCredentials(neofsCreds), + pool.WithAPIPreparer(sdk.APIPreparer), + pool.WithConnectTimeout(poolConnectTimeout), + pool.WithRequestTimeout(poolRequestTimeout)) + if err != nil { + return nil, errors.Wrap(err, "failed to create connection pool") + } + + log.Debug("prepare sdk client") + + return sdk.New(ctx, + sdk.WithLogger(log), + sdk.WithCredentials(neofsCreds), + sdk.WithConnectionPool(p), + sdk.WithAPIPreparer(sdk.APIPreparer)) +} From 28474478133a9aff56190f5a10d689b588f3593d Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 12:18:20 +0300 Subject: [PATCH 2/8] [#46] Add buiding of authmate's binaries to makefile Signed-off-by: Angira Kekteeva --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5310c17..064fb54 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,15 @@ HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" BINDIR = bin BIN = "$(BINDIR)/$(BIN_NAME)" +AUTHMATE_BIN_NAME=authmate +AUTHMATE_HUB_IMAGE="nspccdev/$(AUTHMATE_BIN_NAME)" +AUTHMATE_HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" +AUTHMATE_BIN = "$(BINDIR)/$(AUTHMATE_BIN_NAME)" + .PHONY: help all dep clean format test cover lint docker/lint image-push image dirty-image # Make all binaries -all: $(BIN) +all: $(BIN) $(AUTHMATE_BIN) $(BIN): $(BINDIR) dep @echo "⇒ Build $@" @@ -21,6 +26,13 @@ $(BIN): $(BINDIR) dep -ldflags "-X main.Version=$(VERSION)" \ -o $@ ./cmd/gate +$(AUTHMATE_BIN): $(BINDIR) dep + @echo "⇒ Build $@" + CGO_ENABLED=0 \ + go build -v -trimpath \ + -ldflags "-X main.Version=$(VERSION)" \ + -o $@ ./cmd/authmate + $(BINDIR): @echo "⇒ Ensure dir: $@" @mkdir -p $@ From acc84a6464472975dce0e8b06b7c9b70940949a9 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 12:27:41 +0300 Subject: [PATCH 3/8] [#46] authmate: Add authmate'dependencies to go.mod Signed-off-by: Angira Kekteeva --- go.mod | 2 ++ go.sum | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 82ab100..2f13780 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,13 @@ require ( github.com/gorilla/mux v1.8.0 github.com/nspcc-dev/cdn-sdk v0.3.4 github.com/nspcc-dev/neofs-api-go v1.23.0 + github.com/nspcc-dev/neofs-node v1.22.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.9.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 + github.com/urfave/cli/v2 v2.3.0 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.35.0 ) diff --git a/go.sum b/go.sum index b5c9fca..d05cdf9 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,7 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 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/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -29,6 +30,9 @@ github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzg github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod h1:rB3B4rKii8V21ydCbIzH5hZiCQE7f5E9SzUb/ZZx530= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alecthomas/participle v0.6.0 h1:Pvo8XUCQKgIywVjz/+Ci3IsjGg+g/TdKkMcfgghKCEw= +github.com/alecthomas/participle v0.6.0/go.mod h1:HfdmEuwvr12HXQN44HPWXR0lHmVolVYe4dyL6lQ3duY= +github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= 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= @@ -90,8 +94,11 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= 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 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= 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/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -190,6 +197,7 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= 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/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= @@ -214,6 +222,8 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 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/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 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= @@ -236,6 +246,7 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT 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/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -245,6 +256,7 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= 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.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -272,6 +284,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= +github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -285,8 +299,15 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ 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/mr-tron/base58 v1.1.2 h1:ZEw4I2EgPKDJ2iEw0cNmLB3ROrEmkOtXIkaG7wZg+78= github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc= +github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= +github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y= +github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= +github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= +github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= +github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= 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/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= @@ -303,20 +324,26 @@ github.com/nspcc-dev/dbft v0.0.0-20191209120240-0d6b7568d9ae/go.mod h1:3FjXOoHmA github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk= github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1/go.mod h1:O0qtn62prQSqizzoagHmuuKoz8QMkU3SzBoKdEvm3aQ= github.com/nspcc-dev/dbft v0.0.0-20200711144034-c526ccc6f570/go.mod h1:1FYQXSbb6/9HQIkoF8XO7W/S8N7AZRkBsgwbcXRvk0E= +github.com/nspcc-dev/dbft v0.0.0-20201221101812-e13a1a1c3cb2/go.mod h1:I5D0W3tu3epdt2RMCTxS//HDr4S+OHRqajouQTOAHI8= github.com/nspcc-dev/hrw v1.0.9 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y= github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU= github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg= -github.com/nspcc-dev/neo-go v0.91.0 h1:KKOPMKs0fm8JIau1SuwxiLdrZ+1kDPBiVRlWwzfebWE= github.com/nspcc-dev/neo-go v0.91.0/go.mod h1:G6HdOWvzQ6tlvFdvFSN/PgCzLPN/X/X4d5hTjFRUDcc= +github.com/nspcc-dev/neo-go v0.92.0 h1:iKHpKLzpwE6RSXnQb0BoYWi+H1P/hNyQbMpPG0mY57Q= +github.com/nspcc-dev/neo-go v0.92.0/go.mod h1:L7PyTzjK1j/PCAxvbKiVFkCMZDvsv82JbXlPxaH1t0Q= +github.com/nspcc-dev/neofs-api-go v1.22.0/go.mod h1:G7dqincfdjBrAbL5nxVp82emF05fSVEqe59ICsoRDI8= github.com/nspcc-dev/neofs-api-go v1.23.0 h1:t4FB5uVY99UkYR0Hiyi1SHjZuqzf4qicw7tf7BBnkHk= github.com/nspcc-dev/neofs-api-go v1.23.0/go.mod h1:G7dqincfdjBrAbL5nxVp82emF05fSVEqe59ICsoRDI8= github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA= github.com/nspcc-dev/neofs-crypto v0.2.3/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= github.com/nspcc-dev/neofs-crypto v0.3.0 h1:zlr3pgoxuzrmGCxc5W8dGVfA9Rro8diFvVnBg0L4ifM= github.com/nspcc-dev/neofs-crypto v0.3.0/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= +github.com/nspcc-dev/neofs-node v1.22.0 h1:TJ4d5zopItYYWMEajegVWBgAw8HjZFe12IkNm3Tt+rk= +github.com/nspcc-dev/neofs-node v1.22.0/go.mod h1:ecpXrzIe1vcp5FBjPsIaHKVIVvxsv4GVBCw21WYcY3c= github.com/nspcc-dev/rfc6979 v0.1.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE= github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= +github.com/nspcc-dev/tzhash v1.4.0/go.mod h1:Z8gp/VZbyWgPhaMp/KTmeoW5UTynp/N60g0jTtSzBws= 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= @@ -337,6 +364,7 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ 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/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/panjf2000/ants/v2 v2.3.0/go.mod h1:LtwNaBX6OeF5qRtQlaeGndalVwJlS2ueur7uwoAHbPA= 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-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -359,6 +387,7 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= @@ -374,6 +403,7 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= @@ -383,6 +413,7 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -390,11 +421,14 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= 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/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= 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.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -414,6 +448,7 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= 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/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -421,6 +456,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn 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.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -440,9 +477,13 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/syndtr/goleveldb v0.0.0-20180307113352-169b1b37be73/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= 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/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/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= 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/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= @@ -450,6 +491,7 @@ github.com/yuin/gopher-lua v0.0.0-20191128022950-c6266f4fe8d7/go.mod h1:gqRgreBU 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.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +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.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -459,11 +501,13 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.5.1/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/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.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= @@ -479,8 +523,10 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 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-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/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 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -497,8 +543,9 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= 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= @@ -518,10 +565,12 @@ 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-20190620200207-3b0461eec859/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-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= @@ -562,12 +611,15 @@ golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/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-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -601,6 +653,7 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn 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-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200123022218-593de606220b h1:ztSlcncMErSAUzXwnVO1iTPxHwtvOHBB26SGiyYXIEE= golang.org/x/tools v0.0.0-20200123022218-593de606220b/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -674,8 +727,10 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN 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.7/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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 3c61c69f44746a3462af854e59eb0c2b3ef15772 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 12:28:17 +0300 Subject: [PATCH 4/8] [#46] authmate: Rename s3 package to authmate Signed-off-by: Angira Kekteeva --- authmate/s3.go | 2 +- cmd/authmate/main.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/authmate/s3.go b/authmate/s3.go index c36b4c4..b3c37f8 100644 --- a/authmate/s3.go +++ b/authmate/s3.go @@ -1,4 +1,4 @@ -package s3 +package authmate import ( "context" diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go index b87e966..982c3af 100644 --- a/cmd/authmate/main.go +++ b/cmd/authmate/main.go @@ -8,13 +8,13 @@ import ( "os" "time" - "github.com/nspcc-dev/cdn-authmate/agents/s3" sdk "github.com/nspcc-dev/cdn-sdk" "github.com/nspcc-dev/cdn-sdk/creds/hcs" "github.com/nspcc-dev/cdn-sdk/creds/neofs" "github.com/nspcc-dev/cdn-sdk/grace" "github.com/nspcc-dev/cdn-sdk/pool" "github.com/nspcc-dev/neofs-api-go/pkg/container" + "github.com/nspcc-dev/neofs-s3-gw/authmate" "github.com/pkg/errors" "github.com/urfave/cli/v2" "go.uber.org/zap" @@ -247,7 +247,7 @@ func issueSecret() *cli.Command { return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) } - agent := s3.New(log, client) + agent := authmate.New(log, client) var cid *container.ID if len(containerIDFlag) > 0 { cid = container.NewID() @@ -270,7 +270,7 @@ func issueSecret() *cli.Command { gatesPublicKeys = append(gatesPublicKeys, gpk) } - issueSecretOptions := &s3.IssueSecretOptions{ + issueSecretOptions := &authmate.IssueSecretOptions{ ContainerID: cid, ContainerFriendlyName: containerFriendlyName, NEOFSCreds: neofsCreds, @@ -336,7 +336,7 @@ func obtainSecret() *cli.Command { return cli.Exit(fmt.Sprintf("failed to create sdk client: %s", err), 2) } - agent := s3.New(log, client) + agent := authmate.New(log, client) var _ = agent @@ -345,7 +345,7 @@ func obtainSecret() *cli.Command { return cli.Exit(fmt.Sprintf("failed to create owner's private key: %s", err), 4) } - obtainSecretOptions := &s3.ObtainSecretOptions{ + obtainSecretOptions := &authmate.ObtainSecretOptions{ SecretAddress: secretAddressFlag, GatePrivateKey: gateCreds.PrivateKey(), } From 5b275bad18d97e13ba5fe7521fc3cc01c2d14cb5 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 13:22:39 +0300 Subject: [PATCH 5/8] [#46] *: Reorganize variables and rename binary file in Makefile Fix variables for docker, sorted variables' blocks Rename binary from authmate to neofs-authmate Signed-off-by: Angira Kekteeva --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 064fb54..7fa7d64 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,20 @@ #!/usr/bin/make -f +# Common variables REPO ?= $(shell go list -m) VERSION ?= "$(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD | sed 's/^v//')" - -BIN_NAME=neofs-s3-gw -HUB_IMAGE="nspccdev/$(BIN_NAME)" -HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" BINDIR = bin + +# s3 gate variables +BIN_NAME=neofs-s3-gw BIN = "$(BINDIR)/$(BIN_NAME)" -AUTHMATE_BIN_NAME=authmate -AUTHMATE_HUB_IMAGE="nspccdev/$(AUTHMATE_BIN_NAME)" -AUTHMATE_HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" +# Variables for docker +HUB_IMAGE ?= "nspccdev/$(BIN_NAME)" +HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" + +#authmate variables +AUTHMATE_BIN_NAME=neofs-authmate AUTHMATE_BIN = "$(BINDIR)/$(AUTHMATE_BIN_NAME)" .PHONY: help all dep clean format test cover lint docker/lint image-push image dirty-image From 036d4c9ceabd56921b45680461845f3e1ba5c833 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 14:37:26 +0300 Subject: [PATCH 6/8] [#46] authmate: Rename s3.go to authmate.go Signed-off-by: Angira Kekteeva --- authmate/{s3.go => authmate.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename authmate/{s3.go => authmate.go} (100%) diff --git a/authmate/s3.go b/authmate/authmate.go similarity index 100% rename from authmate/s3.go rename to authmate/authmate.go From d46578ce0bc0e39d9e8faa8683b99e0875e15b9a Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 19:25:06 +0300 Subject: [PATCH 7/8] [#46] authmate: Remove excessive definitions of capacities from slice creations Signed-off-by: Angira Kekteeva --- cmd/authmate/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go index 982c3af..ec38e06 100644 --- a/cmd/authmate/main.go +++ b/cmd/authmate/main.go @@ -127,7 +127,7 @@ func appCommands() []*cli.Command { func generateGatesKeys(count int) ([]hcs.Credentials, error) { var ( err error - res = make([]hcs.Credentials, count, count) + res = make([]hcs.Credentials, count) ) for i := 0; i < count; i++ { @@ -163,7 +163,7 @@ func generateKeys() *cli.Command { log.Info("generated x25519 keys") - gatesKeys := make([]gateKey, len(csl), len(csl)) + gatesKeys := make([]gateKey, len(csl)) for i, cs := range csl { privateKey, publicKey := cs.PrivateKey().String(), cs.PublicKey().String() gatesKeys[i] = gateKey{PrivateKey: privateKey, PublicKey: publicKey} From 1302c7ae787a7c049f4673ae3babb2ca44fe0002 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 19 May 2021 19:27:02 +0300 Subject: [PATCH 8/8] [#46] *: Add comments, fix typos Signed-off-by: Angira Kekteeva --- Makefile | 4 ++-- authmate/authmate.go | 9 ++++++++- cmd/authmate/main.go | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7fa7d64..1c8b863 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ REPO ?= $(shell go list -m) VERSION ?= "$(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD | sed 's/^v//')" BINDIR = bin -# s3 gate variables +# s3 gw variables BIN_NAME=neofs-s3-gw BIN = "$(BINDIR)/$(BIN_NAME)" @@ -13,7 +13,7 @@ BIN = "$(BINDIR)/$(BIN_NAME)" HUB_IMAGE ?= "nspccdev/$(BIN_NAME)" HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" -#authmate variables +# Authmate variables AUTHMATE_BIN_NAME=neofs-authmate AUTHMATE_BIN = "$(BINDIR)/$(AUTHMATE_BIN_NAME)" diff --git a/authmate/authmate.go b/authmate/authmate.go index b3c37f8..b27dd45 100644 --- a/authmate/authmate.go +++ b/authmate/authmate.go @@ -27,16 +27,19 @@ import ( const defaultAuthContainerBasicACL uint32 = 0b00111100100011001000110011001100 +// Agent contains client communicating with NeoFS and logger. type Agent struct { cli sdk.Client log *zap.Logger } +// New creates an object of type Agent that consists of Client and logger. func New(log *zap.Logger, client sdk.Client) *Agent { return &Agent{log: log, cli: client} } type ( + // IssueSecretOptions contains options for passing to Agent.IssueSecret method. IssueSecretOptions struct { ContainerID *container.ID ContainerFriendlyName string @@ -46,6 +49,7 @@ type ( EACLRules []byte } + // ObtainSecretOptions contains options for passing to Agent.ObtainSecret method. ObtainSecretOptions struct { SecretAddress string GatePrivateKey hcs.PrivateKey @@ -88,6 +92,7 @@ func (a *Agent) checkContainer(ctx context.Context, cid *container.ID, friendlyN sdk.ContainerPutWithTimeout(120*time.Second)) } +// IssueSecret creates an auth token, puts it in the NeoFS network and writes to io.Writer a new secret access key. func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecretOptions) error { var ( err error @@ -138,6 +143,8 @@ func (a *Agent) IssueSecret(ctx context.Context, w io.Writer, options *IssueSecr return enc.Encode(ir) } +// ObtainSecret receives an existing secret access key from NeoFS and +// writes to io.Writer the secret access key. func (a *Agent) ObtainSecret(ctx context.Context, w io.Writer, options *ObtainSecretOptions) error { bearerCreds := bearer.New(a.cli.Object(), options.GatePrivateKey) address := object.NewAddress() @@ -183,7 +190,7 @@ func buildPlacementPolicy(placementRules string) (*netmap.PlacementPolicy, error return pp, nil } -// selects nodes in container without any additional attributes +// selects nodes in container without any additional attributes. func newSimpleSelector(name string, count uint32) (s *netmap.Selector) { s = new(netmap.Selector) s.SetCount(count) diff --git a/cmd/authmate/main.go b/cmd/authmate/main.go index ec38e06..8ec1ddb 100644 --- a/cmd/authmate/main.go +++ b/cmd/authmate/main.go @@ -32,7 +32,7 @@ const ( ) var ( - // Build = "now" + // Version of the program. Version = "dev" )