9de485f949
This implements --auth-proxy for serve s3. In addition it: * add listbuckets tests with and without authProxy * use auth proxy test framework * servetest: implement workaround for #7454 * update github.com/rclone/gofakes3 to fix race condition
97 lines
2.8 KiB
Go
97 lines
2.8 KiB
Go
package s3
|
|
|
|
import (
|
|
"context"
|
|
_ "embed"
|
|
"strings"
|
|
|
|
"github.com/rclone/rclone/cmd"
|
|
"github.com/rclone/rclone/cmd/serve/proxy/proxyflags"
|
|
"github.com/rclone/rclone/fs"
|
|
"github.com/rclone/rclone/fs/config/flags"
|
|
"github.com/rclone/rclone/fs/hash"
|
|
httplib "github.com/rclone/rclone/lib/http"
|
|
"github.com/rclone/rclone/vfs"
|
|
"github.com/rclone/rclone/vfs/vfsflags"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// DefaultOpt is the default values used for Options
|
|
var DefaultOpt = Options{
|
|
pathBucketMode: true,
|
|
hashName: "MD5",
|
|
hashType: hash.MD5,
|
|
noCleanup: false,
|
|
Auth: httplib.DefaultAuthCfg(),
|
|
HTTP: httplib.DefaultCfg(),
|
|
}
|
|
|
|
// Opt is options set by command line flags
|
|
var Opt = DefaultOpt
|
|
|
|
const flagPrefix = ""
|
|
|
|
func init() {
|
|
flagSet := Command.Flags()
|
|
httplib.AddAuthFlagsPrefix(flagSet, flagPrefix, &Opt.Auth)
|
|
httplib.AddHTTPFlagsPrefix(flagSet, flagPrefix, &Opt.HTTP)
|
|
vfsflags.AddFlags(flagSet)
|
|
proxyflags.AddFlags(flagSet)
|
|
flags.BoolVarP(flagSet, &Opt.pathBucketMode, "force-path-style", "", Opt.pathBucketMode, "If true use path style access if false use virtual hosted style (default true)", "")
|
|
flags.StringVarP(flagSet, &Opt.hashName, "etag-hash", "", Opt.hashName, "Which hash to use for the ETag, or auto or blank for off", "")
|
|
flags.StringArrayVarP(flagSet, &Opt.authPair, "auth-key", "", Opt.authPair, "Set key pair for v4 authorization: access_key_id,secret_access_key", "")
|
|
flags.BoolVarP(flagSet, &Opt.noCleanup, "no-cleanup", "", Opt.noCleanup, "Not to cleanup empty folder after object is deleted", "")
|
|
}
|
|
|
|
//go:embed serve_s3.md
|
|
var serveS3Help string
|
|
|
|
// help returns the help string cleaned up to simplify appending
|
|
func help() string {
|
|
return strings.TrimSpace(serveS3Help) + "\n\n"
|
|
}
|
|
|
|
// Command definition for cobra
|
|
var Command = &cobra.Command{
|
|
Annotations: map[string]string{
|
|
"versionIntroduced": "v1.65",
|
|
"groups": "Filter",
|
|
"status": "Experimental",
|
|
},
|
|
Use: "s3 remote:path",
|
|
Short: `Serve remote:path over s3.`,
|
|
Long: help() + httplib.AuthHelp(flagPrefix) + httplib.Help(flagPrefix) + vfs.Help(),
|
|
RunE: func(command *cobra.Command, args []string) error {
|
|
var f fs.Fs
|
|
if proxyflags.Opt.AuthProxy == "" {
|
|
cmd.CheckArgs(1, 1, command, args)
|
|
f = cmd.NewFsSrc(args)
|
|
} else {
|
|
cmd.CheckArgs(0, 0, command, args)
|
|
}
|
|
|
|
if Opt.hashName == "auto" {
|
|
Opt.hashType = f.Hashes().GetOne()
|
|
} else if Opt.hashName != "" {
|
|
err := Opt.hashType.Set(Opt.hashName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
cmd.Run(false, false, command, func() error {
|
|
s, err := newServer(context.Background(), f, &Opt)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
router := s.server.Router()
|
|
s.Bind(router)
|
|
err = s.Serve()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.server.Wait()
|
|
return nil
|
|
})
|
|
return nil
|
|
},
|
|
}
|