f5227abd36
* uplink: Mark encryption key config field for setup Set the "setup" property to the `EncryptionConfig.EncrptionKey` for avoiding to save it in the configuration file. This field is only meant for using in the command line parameters which need to use a different encryption key than the one present in the key file or use it when there is not set any encryption key file path. * cmd/uplink: Setup non-interactive accept enc key Change the uplink CLI setup command non-interactive to save the encryption key into a file when it's passed through the flag --enc.encryption-key Previous to this change it wasn't possible to create an key file despite of that the flag was provided, so it was useless on the setup command. * cmd/uplink: Reuse logic to read pwd from terminal Reuse the logic which is already implemented in the pkg/cfgstruct for reading a password from the terminal on interactive mode, rather than duplicating it in the setup command. * cmd/gateway: Use encryption key file flags The cmd/gateway was still using the `enc.key` configuration field which doesn't exist anymore and its setup command wasn't using the `enc.key-filepath` with combination of the `enc.encryption-key` for generating a file with the encryption key. This commit update the cmd/gateway appropriately and move to the uplink package the function used by cmd/uplink to save the encryption key for allowing to also be used by the cmd/gateway without duplicating the logic. * cmd/storj-sim: Adapt gateway config cmd changes Adapt the cmd/storj-sim to correctly pass the parameters to the cmd/gateway setup and run command. * scripts: Don't pass the --enc.encryption-key flag uplink configuration has changed to only support the `--enc.encryption-key` flag for setup commands and consequently the cmd/uplink and cmd/gateway don't accept this flag over other commands, hence the test for the uplink had to be updated for no passing the flag on the multiples calls that the test do to cmd/uplink. * uplink: Remove func which aren't useful anymore Remove the function which allows to user or load an encryption key because it isn't needed anymore since the `--enc.encryption-key` flag is only available for the setup command. Consequently remove its usage from cmd/uplink and cmd/gateway, because such flag will always be empty because in case that's passed Cobra will return an error due to a "unknown flag".
362 lines
9.4 KiB
Go
362 lines
9.4 KiB
Go
// Copyright (C) 2019 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
base58 "github.com/jbenet/go-base58"
|
|
"github.com/minio/cli"
|
|
minio "github.com/minio/minio/cmd"
|
|
"github.com/spf13/cobra"
|
|
"github.com/zeebo/errs"
|
|
"go.uber.org/zap"
|
|
|
|
"storj.io/storj/internal/fpath"
|
|
libuplink "storj.io/storj/lib/uplink"
|
|
"storj.io/storj/pkg/cfgstruct"
|
|
"storj.io/storj/pkg/miniogw"
|
|
"storj.io/storj/pkg/process"
|
|
"storj.io/storj/pkg/storj"
|
|
"storj.io/storj/uplink"
|
|
)
|
|
|
|
// GatewayFlags configuration flags
|
|
type GatewayFlags struct {
|
|
NonInteractive bool `help:"disable interactive mode" default:"false" setup:"true"`
|
|
|
|
Server miniogw.ServerConfig
|
|
Minio miniogw.MinioConfig
|
|
|
|
uplink.Config
|
|
}
|
|
|
|
var (
|
|
// Error is the default gateway setup errs class
|
|
Error = errs.Class("gateway setup error")
|
|
// rootCmd represents the base gateway command when called without any subcommands
|
|
rootCmd = &cobra.Command{
|
|
Use: "gateway",
|
|
Short: "The Storj client-side S3 gateway",
|
|
Args: cobra.OnlyValidArgs,
|
|
}
|
|
setupCmd = &cobra.Command{
|
|
Use: "setup",
|
|
Short: "Create a gateway config file",
|
|
RunE: cmdSetup,
|
|
Annotations: map[string]string{"type": "setup"},
|
|
}
|
|
runCmd = &cobra.Command{
|
|
Use: "run",
|
|
Short: "Run the S3 gateway",
|
|
RunE: cmdRun,
|
|
}
|
|
|
|
setupCfg GatewayFlags
|
|
runCfg GatewayFlags
|
|
|
|
confDir string
|
|
identityDir string
|
|
)
|
|
|
|
func init() {
|
|
defaultConfDir := fpath.ApplicationDir("storj", "gateway")
|
|
defaultIdentityDir := fpath.ApplicationDir("storj", "identity", "gateway")
|
|
cfgstruct.SetupFlag(zap.L(), rootCmd, &confDir, "config-dir", defaultConfDir, "main directory for gateway configuration")
|
|
cfgstruct.SetupFlag(zap.L(), rootCmd, &identityDir, "identity-dir", defaultIdentityDir, "main directory for gateway identity credentials")
|
|
defaults := cfgstruct.DefaultsFlag(rootCmd)
|
|
|
|
rootCmd.AddCommand(runCmd)
|
|
rootCmd.AddCommand(setupCmd)
|
|
process.Bind(runCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir))
|
|
process.Bind(setupCmd, &setupCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir), cfgstruct.SetupMode())
|
|
}
|
|
|
|
func cmdSetup(cmd *cobra.Command, args []string) (err error) {
|
|
setupDir, err := filepath.Abs(confDir)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
valid, _ := fpath.IsValidSetupDir(setupDir)
|
|
if !valid {
|
|
return Error.New("gateway configuration already exists (%v)", setupDir)
|
|
}
|
|
|
|
err = os.MkdirAll(setupDir, 0700)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
overrides := map[string]interface{}{}
|
|
|
|
accessKeyFlag := cmd.Flag("minio.access-key")
|
|
if !accessKeyFlag.Changed {
|
|
accessKey, err := generateKey()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
overrides[accessKeyFlag.Name] = accessKey
|
|
}
|
|
|
|
secretKeyFlag := cmd.Flag("minio.secret-key")
|
|
if !secretKeyFlag.Changed {
|
|
secretKey, err := generateKey()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
overrides[secretKeyFlag.Name] = secretKey
|
|
}
|
|
|
|
// override is required because the default value of Enc.KeyFilepath is ""
|
|
// and setting the value directly in setupCfg.Enc.KeyFiletpath will set the
|
|
// value in the config file but commented out.
|
|
encryptionKeyFilepath := setupCfg.Enc.KeyFilepath
|
|
if encryptionKeyFilepath == "" {
|
|
encryptionKeyFilepath = filepath.Join(setupDir, ".encryption.key")
|
|
overrides["enc.key-filepath"] = encryptionKeyFilepath
|
|
}
|
|
|
|
if setupCfg.NonInteractive {
|
|
return setupCfg.nonInteractive(cmd, setupDir, encryptionKeyFilepath, overrides)
|
|
}
|
|
|
|
return setupCfg.interactive(cmd, setupDir, encryptionKeyFilepath, overrides)
|
|
}
|
|
|
|
func cmdRun(cmd *cobra.Command, args []string) (err error) {
|
|
address := runCfg.Server.Address
|
|
host, port, err := net.SplitHostPort(address)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if host == "" {
|
|
address = net.JoinHostPort("127.0.0.1", port)
|
|
}
|
|
|
|
fmt.Printf("Starting Storj S3-compatible gateway!\n\n")
|
|
fmt.Printf("Endpoint: %s\n", address)
|
|
fmt.Printf("Access key: %s\n", runCfg.Minio.AccessKey)
|
|
fmt.Printf("Secret key: %s\n", runCfg.Minio.SecretKey)
|
|
|
|
ctx := process.Ctx(cmd)
|
|
|
|
if err := process.InitMetrics(ctx, nil, ""); err != nil {
|
|
zap.S().Error("Failed to initialize telemetry batcher: ", err)
|
|
}
|
|
|
|
err = checkCfg(ctx)
|
|
if err != nil {
|
|
return fmt.Errorf("Failed to contact Satellite.\n"+
|
|
"Perhaps your configuration is invalid?\n%s", err)
|
|
}
|
|
|
|
return runCfg.Run(ctx)
|
|
}
|
|
|
|
func generateKey() (key string, err error) {
|
|
var buf [20]byte
|
|
_, err = rand.Read(buf[:])
|
|
if err != nil {
|
|
return "", Error.Wrap(err)
|
|
}
|
|
return base58.Encode(buf[:]), nil
|
|
}
|
|
|
|
func checkCfg(ctx context.Context) (err error) {
|
|
proj, err := runCfg.openProject(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() { err = errs.Combine(err, proj.Close()) }()
|
|
|
|
_, err = proj.ListBuckets(ctx, &storj.BucketListOptions{Direction: storj.After})
|
|
return err
|
|
}
|
|
|
|
// Run starts a Minio Gateway given proper config
|
|
func (flags GatewayFlags) Run(ctx context.Context) (err error) {
|
|
err = minio.RegisterGatewayCommand(cli.Command{
|
|
Name: "storj",
|
|
Usage: "Storj",
|
|
Action: func(cliCtx *cli.Context) error {
|
|
return flags.action(ctx, cliCtx)
|
|
},
|
|
HideHelpCommand: true,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// TODO(jt): Surely there is a better way. This is so upsetting
|
|
err = os.Setenv("MINIO_ACCESS_KEY", flags.Minio.AccessKey)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = os.Setenv("MINIO_SECRET_KEY", flags.Minio.SecretKey)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
minio.Main([]string{"storj", "gateway", "storj",
|
|
"--address", flags.Server.Address, "--config-dir", flags.Minio.Dir, "--quiet"})
|
|
return errs.New("unexpected minio exit")
|
|
}
|
|
|
|
func (flags GatewayFlags) action(ctx context.Context, cliCtx *cli.Context) (err error) {
|
|
gw, err := flags.NewGateway(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
minio.StartGateway(cliCtx, miniogw.Logging(gw, zap.L()))
|
|
return errs.New("unexpected minio exit")
|
|
}
|
|
|
|
// NewGateway creates a new minio Gateway
|
|
func (flags GatewayFlags) NewGateway(ctx context.Context) (gw minio.Gateway, err error) {
|
|
encKey, err := uplink.LoadEncryptionKey(flags.Enc.KeyFilepath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
project, err := flags.openProject(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return miniogw.NewStorjGateway(
|
|
project,
|
|
encKey,
|
|
storj.Cipher(flags.Enc.PathType).ToCipherSuite(),
|
|
flags.GetEncryptionScheme().ToEncryptionParameters(),
|
|
flags.GetRedundancyScheme(),
|
|
flags.Client.SegmentSize,
|
|
), nil
|
|
}
|
|
|
|
func (flags GatewayFlags) openProject(ctx context.Context) (*libuplink.Project, error) {
|
|
cfg := libuplink.Config{}
|
|
cfg.Volatile.TLS = struct {
|
|
SkipPeerCAWhitelist bool
|
|
PeerCAWhitelistPath string
|
|
}{
|
|
SkipPeerCAWhitelist: !flags.TLS.UsePeerCAWhitelist,
|
|
PeerCAWhitelistPath: flags.TLS.PeerCAWhitelistPath,
|
|
}
|
|
cfg.Volatile.MaxInlineSize = flags.Client.MaxInlineSize
|
|
cfg.Volatile.MaxMemory = flags.RS.MaxBufferMem
|
|
|
|
apiKey, err := libuplink.ParseAPIKey(flags.Client.APIKey)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
encKey, err := uplink.LoadEncryptionKey(flags.Enc.KeyFilepath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var opts libuplink.ProjectOptions
|
|
opts.Volatile.EncryptionKey = encKey
|
|
|
|
uplk, err := libuplink.NewUplink(ctx, &cfg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return uplk.OpenProject(ctx, flags.Client.SatelliteAddr, apiKey, &opts)
|
|
}
|
|
|
|
// interactive creates the configuration of the gateway interactively.
|
|
//
|
|
// encryptionKeyFilepath should be set to the filepath indicated by the user or
|
|
// or to a default path whose directory tree exists.
|
|
func (flags GatewayFlags) interactive(
|
|
cmd *cobra.Command, setupDir string, encryptionKeyFilepath string, overrides map[string]interface{},
|
|
) error {
|
|
satelliteAddress, err := cfgstruct.PromptForSatelitte(cmd)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
apiKey, err := cfgstruct.PromptForAPIKey()
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
humanReadableKey, err := cfgstruct.PromptForEncryptionKey()
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
err = uplink.SaveEncryptionKey(humanReadableKey, encryptionKeyFilepath)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
overrides["satellite-addr"] = satelliteAddress
|
|
overrides["api-key"] = apiKey
|
|
|
|
err = process.SaveConfigWithAllDefaults(cmd.Flags(), filepath.Join(setupDir, "config.yaml"), overrides)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
_, err = fmt.Printf(`
|
|
Your encryption key is saved to: %s
|
|
|
|
Your S3 Gateway is configured and ready to use!
|
|
|
|
Some things to try next:
|
|
|
|
* Run 'gateway --help' to see the operations that can be performed
|
|
|
|
* See https://github.com/storj/docs/blob/master/S3-Gateway.md#using-the-aws-s3-commandline-interface for some example commands
|
|
`, encryptionKeyFilepath)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// nonInteractive creates the configuration of the gateway non-interactively.
|
|
//
|
|
// encryptionKeyFilepath should be set to the filepath indicated by the user or
|
|
// or to a default path whose directory tree exists.
|
|
func (flags GatewayFlags) nonInteractive(
|
|
cmd *cobra.Command, setupDir string, encryptionKeyFilepath string, overrides map[string]interface{},
|
|
) error {
|
|
if setupCfg.Enc.EncryptionKey != "" {
|
|
err := uplink.SaveEncryptionKey(setupCfg.Enc.EncryptionKey, encryptionKeyFilepath)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
}
|
|
|
|
err := process.SaveConfigWithAllDefaults(cmd.Flags(), filepath.Join(setupDir, "config.yaml"), overrides)
|
|
if err != nil {
|
|
return Error.Wrap(err)
|
|
}
|
|
|
|
if setupCfg.Enc.EncryptionKey != "" {
|
|
_, _ = fmt.Printf("Your encryption key is saved to: %s\n", encryptionKeyFilepath)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func main() {
|
|
process.Exec(rootCmd)
|
|
}
|