Detailed changes
@@ -0,0 +1,60 @@
+package main
+
+import (
+ "errors"
+ "strings"
+
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
+ "github.com/spf13/cobra"
+)
+
+var (
+ password string
+ publicKey string
+)
+
+var authCmd = &cobra.Command{
+ Use: "auth [username]",
+ Aliases: []string{"authenticate"},
+ Short: "Authenticate user",
+ RunE: func(cmd *cobra.Command, args []string) error {
+ ctx := cmd.Context()
+ be := backend.FromContext(ctx)
+
+ // TODO: add password support
+ // if password == "" && publicKey == "" {
+ // return errors.New("must specify either a password or public key")
+ // }
+
+ publicKey = strings.TrimSpace(publicKey)
+ if publicKey == "" {
+ return errors.New("must specify a public key")
+ }
+
+ pk, _, err := sshutils.ParseAuthorizedKey(publicKey)
+ if err != nil {
+ return err
+ }
+
+ user, err := be.Authenticate(ctx, auth.NewPublicKey(pk))
+ if err != nil {
+ return err
+ }
+
+ out := cmd.OutOrStdout()
+ if ojson {
+ return writeJSON(out, user)
+ } else {
+ cmd.Printf("User %s authenticated successfully\n", user.Username())
+ }
+
+ return nil
+ },
+}
+
+func init() {
+ authCmd.Flags().StringVarP(&password, "password", "p", "", "password")
+ authCmd.Flags().StringVarP(&publicKey, "public-key", "k", "", "public key")
+}
@@ -13,15 +13,12 @@ import (
"github.com/charmbracelet/log"
"github.com/charmbracelet/soft-serve/server/backend"
- "github.com/charmbracelet/soft-serve/server/backend/sqlite"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/hooks"
"github.com/spf13/cobra"
)
var (
- configPath string
-
logFileCtxKey = struct{}{}
hookCmd = &cobra.Command{
@@ -31,13 +28,7 @@ var (
Hidden: true,
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
- cfg, err := config.NewConfig(configPath)
- if err != nil {
- return fmt.Errorf("could not parse config: %w", err)
- }
-
- ctx = config.WithContext(ctx, cfg)
-
+ cfg := config.FromContext(ctx)
logPath := filepath.Join(cfg.DataPath, "log", "hooks.log")
f, err := os.OpenFile(logPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
@@ -50,15 +41,6 @@ var (
ctx = log.WithContext(ctx, logger)
cmd.SetContext(ctx)
- // Set up the backend
- // TODO: support other backends
- sb, err := sqlite.NewSqliteBackend(ctx)
- if err != nil {
- return fmt.Errorf("failed to create sqlite backend: %w", err)
- }
-
- cfg = cfg.WithBackend(sb)
-
return nil
},
PersistentPostRunE: func(cmd *cobra.Command, _ []string) error {
@@ -69,8 +51,7 @@ var (
hooksRunE = func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
- cfg := config.FromContext(ctx)
- hks := cfg.Backend.(backend.Hooks)
+ be := backend.FromContext(ctx)
// This is set in the server before invoking git-receive-pack/git-upload-pack
repoName := os.Getenv("SOFT_SERVE_REPO_NAME")
@@ -103,22 +84,22 @@ var (
switch cmdName {
case hooks.PreReceiveHook:
- hks.PreReceive(stdout, stderr, repoName, opts)
+ be.PreReceive(ctx, stdout, stderr, repoName, opts)
case hooks.PostReceiveHook:
- hks.PostReceive(stdout, stderr, repoName, opts)
+ be.PostReceive(ctx, stdout, stderr, repoName, opts)
}
case hooks.UpdateHook:
if len(args) != 3 {
return fmt.Errorf("invalid update hook input: %s", args)
}
- hks.Update(stdout, stderr, repoName, backend.HookArg{
+ be.Update(ctx, stdout, stderr, repoName, backend.HookArg{
OldSha: args[0],
NewSha: args[1],
RefName: args[2],
})
case hooks.PostUpdateHook:
- hks.PostUpdate(stdout, stderr, repoName, args...)
+ be.PostUpdate(ctx, stdout, stderr, repoName, args...)
}
// Custom hooks
@@ -159,7 +140,6 @@ var (
)
func init() {
- hookCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "path to config file")
hookCmd.AddCommand(
preReceiveCmd,
updateCmd,
@@ -15,6 +15,7 @@ import (
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/backend/sqlite"
"github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/charmbracelet/soft-serve/server/utils"
gitm "github.com/gogs/git-module"
"github.com/spf13/cobra"
@@ -30,7 +31,7 @@ var (
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
- logger := log.FromContext(ctx)
+ logger := log.FromContext(ctx).With()
// Disable logging timestamp
logger.SetReportTimestamp(false)
@@ -38,15 +39,6 @@ var (
reposPath := os.Getenv("SOFT_SERVE_REPO_PATH")
bindAddr := os.Getenv("SOFT_SERVE_BIND_ADDRESS")
- // Set up config
- cfg := config.DefaultConfig()
- if !cfg.Exist() {
- if err := cfg.WriteConfig(); err != nil {
- return fmt.Errorf("failed to write default config: %w", err)
- }
- }
-
- ctx = config.WithContext(ctx, cfg)
sb, err := sqlite.NewSqliteBackend(ctx)
if err != nil {
return fmt.Errorf("failed to create sqlite backend: %w", err)
@@ -55,7 +47,7 @@ var (
// FIXME: Admin user gets created when the database is created.
sb.DeleteUser("admin") // nolint: errcheck
- cfg = cfg.WithBackend(sb)
+ cfg := config.FromContext(ctx)
// Set SSH listen address
logger.Info("Setting SSH listen address...")
@@ -135,7 +127,7 @@ var (
// Set server settings
logger.Info("Setting server settings...")
- if cfg.Backend.SetAllowKeyless(ocfg.AllowKeyless) != nil {
+ if sb.SetAllowKeyless(ocfg.AllowKeyless) != nil {
fmt.Fprintf(os.Stderr, "failed to set allow keyless\n")
}
anon := backend.ParseAccessLevel(ocfg.AnonAccess)
@@ -284,11 +276,11 @@ var (
for _, user := range ocfg.Users {
keys := make(map[string]ssh.PublicKey)
for _, key := range user.PublicKeys {
- pk, _, err := backend.ParseAuthorizedKey(key)
+ pk, _, err := sshutils.ParseAuthorizedKey(key)
if err != nil {
continue
}
- ak := backend.MarshalAuthorizedKey(pk)
+ ak := sshutils.MarshalAuthorizedKey(pk)
keys[ak] = pk
}
@@ -316,7 +308,7 @@ var (
logger.Info("Writing config...")
defer logger.Info("Done!")
- return cfg.WriteConfig()
+ return config.WriteConfig(config.DefaultConfig())
},
}
)
@@ -0,0 +1,83 @@
+package main
+
+import "github.com/spf13/cobra"
+
+func repoCommand() *cobra.Command {
+ cmd := &cobra.Command{
+ Use: "repo",
+ Aliases: []string{"repos", "repository", "repositories"},
+ Short: "Manage repositories",
+ }
+
+ cmd.AddCommand(
+ // blobCommand(),
+ // branchCommand(),
+ // collabCommand(),
+ // createCommand(),
+ // deleteCommand(),
+ // descriptionCommand(),
+ // hiddenCommand(),
+ // importCommand(),
+ // listCommand(),
+ // mirrorCommand(),
+ // privateCommand(),
+ // projectName(),
+ // renameCommand(),
+ // tagCommand(),
+ // treeCommand(),
+ )
+ //
+ // cmd.AddCommand(
+ // &cobra.Command{
+ // Use: "info REPOSITORY",
+ // Short: "Get information about a repository",
+ // Args: cobra.ExactArgs(1),
+ // PersistentPreRunE: checkIfReadable,
+ // RunE: func(cmd *cobra.Command, args []string) error {
+ // ctx := cmd.Context()
+ // be, _ := fromContext(cmd)
+ // rn := args[0]
+ // rr, err := be.Repository(ctx, rn)
+ // if err != nil {
+ // return err
+ // }
+ //
+ // r, err := rr.Open()
+ // if err != nil {
+ // return err
+ // }
+ //
+ // head, err := r.HEAD()
+ // if err != nil {
+ // return err
+ // }
+ //
+ // branches, _ := r.Branches()
+ // tags, _ := r.Tags()
+ // cmd.Println("Project Name:", rr.ProjectName())
+ // cmd.Println("Repository:", rr.Name())
+ // cmd.Println("Description:", rr.Description())
+ // cmd.Println("Private:", rr.IsPrivate())
+ // cmd.Println("Hidden:", rr.IsHidden())
+ // cmd.Println("Mirror:", rr.IsMirror())
+ // cmd.Println("Default Branch:", head.Name().Short())
+ // if len(branches) > 0 {
+ // cmd.Println("Branches:")
+ // for _, b := range branches {
+ // cmd.Println(" -", b)
+ // }
+ // }
+ // if len(tags) > 0 {
+ // cmd.Println("Tags:")
+ // for _, t := range tags {
+ // cmd.Println(" -", t)
+ // }
+ // }
+ //
+ // return nil
+ // },
+ // },
+ // )
+
+ return cmd
+}
@@ -2,12 +2,31 @@ package main
import (
"context"
+ "encoding/json"
+ "io"
"os"
+ "path/filepath"
"runtime/debug"
"github.com/charmbracelet/log"
- _ "github.com/charmbracelet/soft-serve/internal/init" // initialize registry
- . "github.com/charmbracelet/soft-serve/internal/log"
+ "github.com/charmbracelet/soft-serve/internal/logger"
+ "github.com/charmbracelet/soft-serve/server/access"
+ _ "github.com/charmbracelet/soft-serve/server/access/sqlite" // access driver
+ "github.com/charmbracelet/soft-serve/server/auth"
+ _ "github.com/charmbracelet/soft-serve/server/auth/sqlite" // auth driver
+ "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/cache"
+ "github.com/charmbracelet/soft-serve/server/cache/lru"
+ _ "github.com/charmbracelet/soft-serve/server/cache/lru" // cache driver
+ _ "github.com/charmbracelet/soft-serve/server/cache/noop" // cache driver
+ "github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/db"
+ _ "github.com/charmbracelet/soft-serve/server/db/sqlite" // db driver
+ "github.com/charmbracelet/soft-serve/server/settings"
+ _ "github.com/charmbracelet/soft-serve/server/settings/sqlite" // settings driver
+ "github.com/charmbracelet/soft-serve/server/store"
+ _ "github.com/charmbracelet/soft-serve/server/store/sqlite" // store driver
+ "github.com/go-git/go-billy/v5/osfs"
"github.com/spf13/cobra"
"go.uber.org/automaxprocs/maxprocs"
)
@@ -21,6 +40,10 @@ var (
// against. It's set via ldflags when building.
CommitSHA = ""
+ configPath string
+
+ ojson bool
+
rootCmd = &cobra.Command{
Use: "soft",
Short: "A self-hostable Git server for the command line",
@@ -30,12 +53,22 @@ var (
)
func init() {
+ rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "path to config file")
rootCmd.AddCommand(
serveCmd,
manCmd,
hookCmd,
migrateConfig,
+ authCmd,
+ uiCmd,
)
+
+ for _, cmd := range []*cobra.Command{
+ authCmd,
+ } {
+ cmd.PersistentFlags().BoolVar(&ojson, "json", false, "output as JSON")
+ }
+
rootCmd.CompletionOptions.HiddenDefaultCmd = true
if len(CommitSHA) >= 7 {
@@ -53,19 +86,116 @@ func init() {
}
func main() {
- logger := NewDefaultLogger()
+ ctx := context.Background()
+
+ cfg := config.DefaultConfig()
+ if configPath != "" {
+ var err error
+ if err = config.ParseConfig(cfg, configPath); err != nil {
+ log.Fatal(err)
+ }
+ } else if !cfg.Exist() {
+ // Write config to disk.
+ if err := cfg.WriteConfig(); err != nil {
+ log.Fatalf("write default config: %w", err)
+ }
+ } else {
+ if err := cfg.ReadConfig(); err != nil {
+ log.Fatalf("read config: %w", err)
+ }
+ }
+
+ ctx = config.WithContext(ctx, cfg)
+ logger := logger.NewDefaultLogger(ctx)
// Set global logger
log.SetDefault(logger)
// Set the max number of processes to the number of CPUs
// This is useful when running soft serve in a container
- if _, err := maxprocs.Set(maxprocs.Logger(logger.Debugf)); err != nil {
- logger.Warn("couldn't set automaxprocs", "error", err)
+ if _, err := maxprocs.Set(maxprocs.Logger(log.Debugf)); err != nil {
+ log.Warn("couldn't set automaxprocs", "error", err)
+ }
+
+ ctx = log.WithContext(ctx, logger)
+
+ // Set up cache
+ var cacheOpts []cache.Option
+ cacheBackend := "noop"
+ switch cfg.Cache.Backend {
+ case "lru":
+ // TODO: make this configurable
+ cacheOpts = append(cacheOpts, lru.WithSize(1000))
+ cacheBackend = "lru"
+ }
+
+ ca, err := cache.New(ctx, cacheBackend, cacheOpts...)
+ if err != nil {
+ log.Fatalf("create default cache: %w", err)
+ }
+
+ ctx = cache.WithContext(ctx, ca)
+
+ // FIXME: move this somewhere and make order not required
+ // Set up database
+ sdb, err := db.New(ctx, cfg.Database.Driver, cfg.Database.DataSource)
+ if err != nil {
+ log.Fatalf("create sqlite database: %w", err)
}
- ctx := log.WithContext(context.Background(), logger)
- if err := rootCmd.ExecuteContext(ctx); err != nil {
+ ctx = db.WithContext(ctx, sdb)
+
+ // Set up auth backend.
+ a, err := auth.New(ctx, cfg.Backend.Auth)
+ if err != nil {
+ log.Fatalf("create auth backend: %w", err)
+ }
+
+ ctx = auth.WithContext(ctx, a)
+
+ // Set up store backend
+ fs := osfs.New(filepath.Join(cfg.DataPath, "repos"))
+ st, err := store.New(ctx, fs, cfg.Backend.Store)
+ if err != nil {
+ log.Fatalf("create store backend: %w", err)
+ }
+
+ ctx = store.WithContext(ctx, st)
+
+ // Set up settings backend.
+ s, err := settings.New(ctx, cfg.Backend.Settings)
+ if err != nil {
+ log.Fatalf("create settings backend: %w", err)
+ }
+
+ ctx = settings.WithContext(ctx, s)
+
+ // Set up access backend.
+ ac, err := access.New(ctx, cfg.Backend.Access)
+ if err != nil {
+ log.Fatalf("create access backend: %w", err)
+ }
+
+ ctx = access.WithContext(ctx, ac)
+
+ // Set up backend
+ be, err := backend.NewBackend(ctx, s, st, a, ac)
+ if err != nil {
+ log.Fatalf("create sqlite backend: %w", err)
+ }
+
+ ctx = backend.WithContext(ctx, be)
+
+ if rootCmd.ExecuteContext(ctx) != nil {
os.Exit(1)
}
}
+
+func writeJSON(w io.Writer, t any) error {
+ bts, err := json.Marshal(t)
+ if err != nil {
+ return err
+ }
+ _, err = w.Write(bts)
+ return err
+}
@@ -11,10 +11,13 @@ import (
"github.com/charmbracelet/soft-serve/server"
"github.com/charmbracelet/soft-serve/server/config"
+ _ "github.com/charmbracelet/soft-serve/server/config" // init config
"github.com/spf13/cobra"
)
var (
+ migrate bool
+
serveCmd = &cobra.Command{
Use: "serve",
Short: "Start the server",
@@ -22,15 +25,7 @@ var (
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
-
- // Set up config
- cfg, err := config.NewConfig("")
- if err != nil {
- return err
- }
-
- ctx = config.WithContext(ctx, cfg)
- cmd.SetContext(ctx)
+ cfg := config.FromContext(ctx)
// Create custom hooks directory if it doesn't exist
customHooksPath := filepath.Join(cfg.DataPath, "hooks")
@@ -77,3 +72,7 @@ var (
},
}
)
+
+func init() {
+ serveCmd.Flags().BoolVar(&migrate, "migrate", false, "run database migrations")
+}
@@ -0,0 +1,103 @@
+package main
+
+import (
+ "os"
+ "path/filepath"
+
+ tea "github.com/charmbracelet/bubbletea"
+ "github.com/charmbracelet/lipgloss"
+ "github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/errors"
+ "github.com/charmbracelet/soft-serve/server/ui"
+ "github.com/charmbracelet/soft-serve/server/ui/common"
+ "github.com/mattn/go-tty"
+ "github.com/muesli/termenv"
+ "github.com/spf13/cobra"
+)
+
+var uiCmd = &cobra.Command{
+ Use: "ui",
+ RunE: func(cmd *cobra.Command, args []string) error {
+ ctx := cmd.Context()
+ be := backend.FromContext(ctx)
+ cfg := config.FromContext(ctx)
+
+ logPath := filepath.Join(cfg.DataPath, "log", "ui.log")
+ f, err := os.OpenFile(logPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+ if err != nil {
+ return err
+ }
+
+ defer f.Close() // nolint:errcheck
+
+ logger := log.FromContext(ctx).WithPrefix("ui")
+ logger.SetOutput(f)
+ ctx = log.WithContext(ctx, logger)
+
+ lipgloss.SetColorProfile(termenv.Ascii)
+
+ logger.Infof("SSH_TTY %s", os.Getenv("SSH_TTY"))
+ tty, err := tty.OpenDevice(os.Getenv("SSH_TTY"))
+ // tty, err := tty.Open()
+ if err != nil {
+ return err
+ }
+
+ // stdin := tty.Input()
+ // stdout := cmd.OutOrStdout()
+ stdin := tty.Input()
+ stdout := tty.Output()
+ // if tty := os.Getenv("SSH_TTY"); tty != "" {
+ // logger.Infof("SSH_TTY %s", tty)
+ // f, err := os.OpenFile(tty, os.O_RDWR, 0)
+ // if err != nil {
+ // return err
+ // }
+ // defer f.Close() // nolint:errcheck
+ //
+ // logger.Infof("using %s", tty)
+ // stdin = f
+ // stdout = f
+ // }
+
+ // if !isatty.IsTerminal(stdout.(interface {
+ // Fd() uintptr
+ // }).Fd()) {
+ // return fmt.Errorf("stdout is not a terminal")
+ // }
+
+ var initialRepo string
+ if len(args) == 1 {
+ user, _ := be.Authenticate(ctx, nil)
+ initialRepo = args[0]
+ auth, _ := be.AccessLevel(ctx, initialRepo, user)
+ if auth < access.ReadOnlyAccess {
+ return errors.ErrUnauthorized
+ }
+ }
+
+ re := lipgloss.NewRenderer(stdout, termenv.WithColorCache(true), termenv.WithUnsafe(), termenv.WithTTY(true))
+ // FIXME: detect color profile and dark background
+ re.SetColorProfile(termenv.Ascii)
+ re.SetHasDarkBackground(false)
+ termenv.SetDefaultOutput(re.Output())
+ c := common.NewCommon(ctx, re, 0, 0)
+ m := ui.New(c, initialRepo)
+ p := tea.NewProgram(m,
+ tea.WithInput(stdin),
+ tea.WithOutput(re.Output()),
+ tea.WithAltScreen(),
+ tea.WithoutCatchPanics(),
+ tea.WithMouseCellMotion(),
+ )
+
+ if _, err := p.Run(); err != nil {
+ return err
+ }
+
+ return nil
+ },
+}
@@ -45,15 +45,7 @@ func main() {
log.Fatal("Setuid error", "err", err)
}
ctx := context.Background()
- // Set up config
- cfg := config.DefaultConfig()
- if !cfg.Exist() {
- if err := cfg.WriteConfig(); err != nil {
- log.Fatal("failed to write default config: %w", err)
- }
- }
- ctx = config.WithContext(ctx, cfg)
- cfg.SSH.ListenAddr = fmt.Sprintf(":%d", *port)
+ config.SSH.ListenAddr = fmt.Sprintf(":%d", *port)
s, err := server.NewServer(ctx)
if err != nil {
log.Fatal(err)
@@ -62,7 +54,7 @@ func main() {
done := make(chan os.Signal, 1)
signal.Notify(done, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
- log.Print("Starting SSH server", "addr", cfg.SSH.ListenAddr)
+ log.Print("Starting SSH server", "addr", config.SSH.ListenAddr)
go func() {
if err := s.SSHServer.Serve(ls); err != nil {
log.Fatal(err)
@@ -71,7 +63,7 @@ func main() {
<-done
- log.Print("Stopping SSH server", "addr", cfg.SSH.ListenAddr)
+ log.Print("Stopping SSH server", "addr", config.SSH.ListenAddr)
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer func() { cancel() }()
if err := s.Shutdown(ctx); err != nil {
@@ -22,11 +22,15 @@ require (
github.com/charmbracelet/keygen v0.4.2
github.com/charmbracelet/log v0.2.2
github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103
+ github.com/go-git/go-billy/v5 v5.4.1
github.com/gobwas/glob v0.2.3
github.com/gogs/git-module v1.8.2
+ github.com/golang-migrate/migrate/v4 v4.15.2
github.com/hashicorp/golang-lru/v2 v2.0.2
github.com/jmoiron/sqlx v1.3.5
+ github.com/kr/pty v1.1.8
github.com/lrstanley/bubblezone v0.0.0-20220716194435-3cb8c52f6a8f
+ github.com/mattn/go-tty v0.0.5
github.com/muesli/mango-cobra v1.2.0
github.com/muesli/roff v0.1.0
github.com/prometheus/client_golang v1.15.1
@@ -35,6 +39,7 @@ require (
go.uber.org/automaxprocs v1.5.2
goji.io v2.0.2+incompatible
golang.org/x/crypto v0.9.0
+ golang.org/x/net v0.10.0
golang.org/x/sync v0.2.0
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.22.1
@@ -49,11 +54,14 @@ require (
github.com/caarlos0/sshmarshal v0.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
+ github.com/creack/pty v1.1.11 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/css v1.0.0 // indirect
+ github.com/hashicorp/errwrap v1.1.0 // indirect
+ github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -78,8 +86,8 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/yuin/goldmark v1.5.2 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
+ go.uber.org/atomic v1.7.0 // indirect
golang.org/x/mod v0.8.0 // indirect
- golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
@@ -1,20 +1,202 @@
+bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
+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.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.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+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.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/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+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=
+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/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=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/spanner v1.28.0/go.mod h1:7m6mtQZn/hMbMfx62ct5EWrGND4DNqkXyrmBPRS+OJo=
+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=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
+github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
+github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
+github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
+github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
+github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
+github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
+github.com/Azure/go-autorest/autorest/adal v0.9.16/go.mod h1:tGMin8I49Yij6AQ+rvV+Xa/zwxYQB5hmsd6DkfAx2+A=
+github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
+github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
+github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
+github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
+github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
+github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+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/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
+github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
+github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
+github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
+github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
+github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
+github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
+github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
+github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
+github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
+github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
+github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
+github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
+github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
+github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
+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/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
+github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
+github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
+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/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
+github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
+github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0=
+github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
+github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU=
+github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
+github.com/aws/aws-sdk-go-v2/credentials v1.3.2/go.mod h1:PACKuTJdt6AlXvEq8rFI4eDmoqDFC5DpVKQbWysaDgM=
+github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.4.0/go.mod h1:Mj/U8OpDbcVcoctrYwA2bak8k/HFPdcLzI/vaiXMwuM=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0/go.mod h1:eHwXu2+uE/T6gpnYWwBwqoeqRf9IXyCcolyOWDRAErQ=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.4/go.mod h1:Ex7XQmbFmgFHrjUX6TN3mApKW5Hglyga+F7wZHTtYhA=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.2.0/go.mod h1:Q5jATQc+f1MfZp3PDMhn6ry18hGvE0i8yvbXoKbnZaE=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.2/go.mod h1:EASdTcM1lGhUe1/p4gkojHwlGJkeoRjjr1sRCzup3Is=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0/go.mod h1:v8ygadNyATSm6elwJ/4gzJwcFhri9RqS8skgHKiwXPU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.2/go.mod h1:NXmNI41bdEsJMrD0v9rUvbGCB5GwdBEpKvUvIY3vTFg=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.2/go.mod h1:QuL2Ym8BkrLmN4lUofXYq6000/i5jPjosCNK//t6gak=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.2/go.mod h1:np7TMuJNT83O0oDOSF8i4dF3dvGqA6hPYYo6YYkzgRA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.12.0/go.mod h1:6J++A5xpo7QDsIeSqPK4UHqMSyPOCopa+zKtqAMhqVQ=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.16.1/go.mod h1:CQe/KvWV1AqRc65KqeJjrLzr5X2ijnFTTVzJW0VBRCI=
+github.com/aws/aws-sdk-go-v2/service/sso v1.3.2/go.mod h1:J21I6kF+d/6XHVk7kp/cx9YVD2TMD2TbLwtRGVcinXo=
+github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.6.1/go.mod h1:hLZ/AnkIKHLuPGjEiyghNEdvJ2PP0MgOxcmv9EBJ4xs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
+github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
+github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
+github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+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/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
+github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
github.com/caarlos0/env/v8 v8.0.0 h1:POhxHhSpuxrLMIdvTGARuZqR4Jjm8AYmoi/JKlcScs0=
github.com/caarlos0/env/v8 v8.0.0/go.mod h1:7K4wMY9bH0esiXSSHlfHLX5xKGQMnkH5Fk4TDSSSzfo=
github.com/caarlos0/sshmarshal v0.1.0 h1:zTCZrDORFfWh526Tsb7vCm3+Yg/SfW/Ub8aQDeosk0I=
github.com/caarlos0/sshmarshal v0.1.0/go.mod h1:7Pd/0mmq9x/JCzKauogNjSQEhivBclCQHfr9dlpDIyA=
+github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+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/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
+github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/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.1.2/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/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI=
@@ -36,82 +218,713 @@ github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103 h1:wpHMERIN0pQZE
github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103/go.mod h1:0Vm2/8yBljiLDnGJHU8ehswfawrEybGk33j5ssqKQVM=
github.com/charmbracelet/wish v1.1.1 h1:KdICASKd2oh2JPvk1Z4CJtAi97cFErXF7NKienPICO4=
github.com/charmbracelet/wish v1.1.1/go.mod h1:xh4KZpSULw+Xqb9bcbhw92QAinVB75CVLWrFuyY6IVs=
+github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
+github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
+github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
+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/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
+github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
+github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
+github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
+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-20210930031921-04548b0d99d4/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-20211001041855-01bcc9b48dfe/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-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
+github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
+github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
+github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
+github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
+github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
+github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
+github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E=
+github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss=
+github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss=
+github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI=
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
+github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
+github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo=
+github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo=
+github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
+github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
+github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8=
+github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
+github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
+github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
+github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
+github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
+github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ=
+github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU=
+github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
+github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
+github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
+github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
+github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
+github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
+github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
+github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
+github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
+github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk=
+github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
+github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
+github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
+github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
+github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
+github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
+github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
+github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=
+github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
+github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
+github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
+github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
+github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
+github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
+github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
+github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0=
+github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA=
+github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow=
+github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms=
+github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4=
+github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
+github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
+github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
+github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
+github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
+github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
+github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
+github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
+github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
+github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
+github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
+github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
+github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
+github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
+github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw=
+github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y=
+github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
+github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
+github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY=
+github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y=
+github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
+github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
+github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE=
+github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc=
+github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4=
+github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
+github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
+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-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
+github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
+github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+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.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+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/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/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+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 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
+github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
+github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
+github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
+github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
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/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
+github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+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/dhui/dktest v0.3.10/go.mod h1:h5Enh0nG3Qbo9WjNFRrwmKUaePEBhXMOygbz3Ww7Sz0=
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
+github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+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.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
+github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+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/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
+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/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw=
+github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
+github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
+github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
+github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
+github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
+github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
+github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
+github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
+github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
github.com/go-git/go-git/v5 v5.7.0 h1:t9AudWVLmqzlo+4bqdf7GY+46SUuRsx59SboFxkq2aE=
github.com/go-git/go-git/v5 v5.7.0/go.mod h1:coJHKEOk5kUClpsNlXrUvPrDxY3w3gjHvhcZd8Fodw8=
+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/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
+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-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-sql-driver/mysql v1.4.0/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 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
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/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
+github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
+github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
+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/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
+github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+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/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/gogs/git-module v1.8.2 h1:fwvSMjc51d5bBG3Q2OyFF8HTZFDVbETQ+mSAvfXebQw=
github.com/gogs/git-module v1.8.2/go.mod h1:GUSSUH+RM7fZOtjhS6Obh4B9aAvs3EeROpazfMNMF8g=
+github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-migrate/migrate/v4 v4.15.2 h1:vU+M05vs6jWHKDdmE1Ecwj0BznygFc4QsdRe2E/L7kc=
+github.com/golang-migrate/migrate/v4 v4.15.2/go.mod h1:f2toGLkYqD3JH+Todi4aZ2ZdbeUNx4sIwiOK96rE9Lw=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+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-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/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=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+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/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
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=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+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/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4/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/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+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=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+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.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
+github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+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/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+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-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+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/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/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
+github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
+github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
+github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
+github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.7.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/mux v1.7.4/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/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+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.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/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.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.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-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 v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
+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-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.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/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5twqnfBdU=
github.com/hashicorp/golang-lru/v2 v2.0.2/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+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/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.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
+github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
+github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
+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/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+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=
+github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
+github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
+github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=
+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=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.7/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
+github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
+github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
+github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
+github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
+github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
+github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
+github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA=
+github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/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/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
+github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
+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/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+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.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/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/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
+github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kevinburke/ssh_config v1.2.0/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/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+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.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+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.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
+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/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+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.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
+github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
github.com/lrstanley/bubblezone v0.0.0-20220716194435-3cb8c52f6a8f h1:FjWlbnOxKSZpFlNhsx6xFy/OnkdYTAYTuoulojPdZ9o=
github.com/lrstanley/bubblezone v0.0.0-20220716194435-3cb8c52f6a8f/go.mod h1:CxaUrg7Y6DmnquTpb1Rgxib+u+NcRxrDi8m/mR1poTM=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
+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/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
+github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
+github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
+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-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
+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.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+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.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+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.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
+github.com/mattn/go-tty v0.0.5 h1:s09uXI7yDbXzzTTfw3zonKFzwGkyYlgU3OMjqA0ddz4=
+github.com/mattn/go-tty v0.0.5/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
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/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 h1:Pijfgr7ZuvX7QIQiEwLdRVr3RoMG+i0SbBO1Qu+7yVk=
github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
+github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
+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=
+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 v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
+github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
+github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
+github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
+github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
+github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
+github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
+github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
+github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
+github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
+github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+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/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA=
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
@@ -132,19 +945,136 @@ github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ
github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs=
github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
+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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
+github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
+github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+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.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
+github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
+github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
+github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
+github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
+github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
+github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
+github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
+github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
+github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
+github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
+github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+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.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
+github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.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-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+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.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/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.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+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.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.7.3/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/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -1,12 +0,0 @@
-package init
-
-import (
- "github.com/charmbracelet/soft-serve/server/cache"
- "github.com/charmbracelet/soft-serve/server/cache/lru"
- "github.com/charmbracelet/soft-serve/server/cache/noop"
-)
-
-func init() {
- cache.Register("lru", lru.NewCache)
- cache.Register("noop", noop.NewCache)
-}
@@ -1,6 +1,7 @@
-package log
+package logger
import (
+ "context"
"os"
"strconv"
"strings"
@@ -10,17 +11,8 @@ import (
"github.com/charmbracelet/soft-serve/server/config"
)
-var contextKey = &struct{ string }{"logger"}
-
// NewDefaultLogger returns a new logger with default settings.
-func NewDefaultLogger() *log.Logger {
- cfg := config.DefaultConfig()
- if cfg.Exist() {
- if err := config.ParseConfig(cfg, cfg.FilePath()); err != nil {
- log.Errorf("failed to parse config: %v", err)
- }
- }
-
+func NewDefaultLogger(ctx context.Context) *log.Logger {
logger := log.NewWithOptions(os.Stderr, log.Options{
ReportTimestamp: true,
TimeFormat: time.DateOnly,
@@ -34,6 +26,7 @@ func NewDefaultLogger() *log.Logger {
}
}
+ cfg := config.FromContext(ctx)
logger.SetTimeFormat(cfg.Log.TimeFormat)
switch strings.ToLower(cfg.Log.Format) {
@@ -0,0 +1,13 @@
+package access
+
+import (
+ "context"
+
+ "github.com/charmbracelet/soft-serve/server/auth"
+)
+
+// Access is an interface that represents repository access.
+type Access interface {
+ // AccessLevel returns the access level for the given repo.
+ AccessLevel(ctx context.Context, repo string, user auth.User) (AccessLevel, error)
+}
@@ -0,0 +1,34 @@
+package access
+
+import "context"
+
+var (
+ contextKey = &struct{ string }{"access"}
+ ContextKeyAccessLevel = &struct{ string }{"access-level"}
+)
+
+// FromContext returns the access from the context.
+func FromContext(ctx context.Context) Access {
+ if access, ok := ctx.Value(contextKey).(Access); ok {
+ return access
+ }
+ return nil
+}
+
+// WithContext returns a new context with the access attached.
+func WithContext(ctx context.Context, access Access) context.Context {
+ return context.WithValue(ctx, contextKey, access)
+}
+
+// AccessLevelFromContext returns the access level from the context.
+func AccessLevelFromContext(ctx context.Context) AccessLevel {
+ if al, ok := ctx.Value(ContextKeyAccessLevel).(AccessLevel); ok {
+ return al
+ }
+ return NoAccess
+}
+
+// WithAccessLevelContext returns a new context with the access level attached.
+func WithAccessLevelContext(ctx context.Context, al AccessLevel) context.Context {
+ return context.WithValue(ctx, ContextKeyAccessLevel, al)
+}
@@ -0,0 +1,50 @@
+package access
+
+// AccessLevel is the level of access allowed to a repo.
+type AccessLevel int
+
+const (
+ // NoAccess does not allow access to the repo.
+ NoAccess AccessLevel = iota
+
+ // ReadOnlyAccess allows read-only access to the repo.
+ ReadOnlyAccess
+
+ // ReadWriteAccess allows read and write access to the repo.
+ ReadWriteAccess
+
+ // AdminAccess allows read, write, and admin access to the repo.
+ AdminAccess
+)
+
+// String returns the string representation of the access level.
+func (a AccessLevel) String() string {
+ switch a {
+ case NoAccess:
+ return "no-access"
+ case ReadOnlyAccess:
+ return "read-only"
+ case ReadWriteAccess:
+ return "read-write"
+ case AdminAccess:
+ return "admin-access"
+ default:
+ return "unknown"
+ }
+}
+
+// ParseAccessLevel parses an access level string.
+func ParseAccessLevel(s string) AccessLevel {
+ switch s {
+ case "no-access":
+ return NoAccess
+ case "read-only":
+ return ReadOnlyAccess
+ case "read-write":
+ return ReadWriteAccess
+ case "admin-access":
+ return AdminAccess
+ default:
+ return AccessLevel(-1)
+ }
+}
@@ -0,0 +1,49 @@
+package access
+
+import (
+ "context"
+ "errors"
+ "sync"
+)
+
+var (
+ registry = make(map[string]Constructor)
+ mtx sync.RWMutex
+
+ // ErrNotFound is returned when an access provider is not found.
+ ErrNotFound = errors.New("access provider not found")
+)
+
+// Constructor is a function that returns an access provider.
+type Constructor func(ctx context.Context) (Access, error)
+
+// Register registers an access provider.
+func Register(name string, fn Constructor) {
+ mtx.Lock()
+ defer mtx.Unlock()
+ registry[name] = fn
+}
+
+// New returns a new access provider.
+func New(ctx context.Context, name string) (Access, error) {
+ mtx.RLock()
+ fn, ok := registry[name]
+ mtx.RUnlock()
+
+ if !ok {
+ return nil, ErrNotFound
+ }
+
+ return fn(ctx)
+}
+
+// List returns a list of registered access providers.
+func List() []string {
+ mtx.Lock()
+ defer mtx.Unlock()
+ providers := make([]string, 0)
+ for name := range registry {
+ providers = append(providers, name)
+ }
+ return providers
+}
@@ -0,0 +1,162 @@
+package sqlite
+
+import (
+ "context"
+ "strings"
+
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/db"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/charmbracelet/soft-serve/server/settings"
+ "github.com/charmbracelet/soft-serve/server/store"
+ "github.com/charmbracelet/soft-serve/server/utils"
+ "github.com/jmoiron/sqlx"
+)
+
+// SqliteAccess is an access backend implementation that uses SQLite.
+type SqliteAccess struct {
+ ctx context.Context
+ db db.Database
+}
+
+var _ access.Access = (*SqliteAccess)(nil)
+
+func init() {
+ access.Register("sqlite", newSqliteAccess)
+}
+
+func newSqliteAccess(ctx context.Context) (access.Access, error) {
+ sdb := db.FromContext(ctx)
+ if sdb == nil {
+ return nil, db.ErrNoDatabase
+ }
+
+ return &SqliteAccess{
+ ctx: ctx,
+ db: sdb,
+ }, nil
+}
+
+// AccessLevel implements access.Access.
+func (d *SqliteAccess) AccessLevel(ctx context.Context, repo string, user auth.User) (access.AccessLevel, error) {
+ settings := settings.FromContext(d.ctx)
+ store := store.FromContext(d.ctx)
+
+ anon := settings.AnonAccess(ctx)
+
+ // TODO: add admin access to user repositories
+
+ // If the user is an admin, they have admin access.
+ if user != nil && user.IsAdmin() {
+ return access.AdminAccess, nil
+ }
+
+ // If the repository exists, check if the user is a collaborator.
+ r, _ := store.Repository(ctx, repo)
+ if r != nil {
+ // If the user is a collaborator, they have read/write access.
+ if user != nil {
+ isCollab, _ := d.IsCollaborator(ctx, repo, user.Username())
+ if isCollab {
+ if anon > access.ReadWriteAccess {
+ return anon, nil
+ }
+ return access.ReadWriteAccess, nil
+ }
+ }
+
+ // If the repository is private, the user has no access.
+ if r.IsPrivate() {
+ return access.NoAccess, nil
+ }
+
+ // Otherwise, the user has read-only access.
+ return access.ReadOnlyAccess, nil
+ }
+
+ if user != nil {
+ // If the repository doesn't exist, the user has read/write access.
+ if anon > access.ReadWriteAccess {
+ return anon, nil
+ }
+
+ return access.ReadWriteAccess, nil
+ }
+
+ // If the user doesn't exist, give them the anonymous access level.
+ return anon, nil
+}
+
+// AddCollaborator adds a collaborator to a repository.
+//
+// It implements backend.Backend.
+func (d *SqliteAccess) AddCollaborator(ctx context.Context, repo string, username string) error {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return err
+ }
+
+ repo = utils.SanitizeRepo(repo)
+ return sqlite.WrapDbErr(sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec(`INSERT INTO collab (user_id, repo_id, updated_at)
+ VALUES (
+ (SELECT id FROM user WHERE username = ?),
+ (SELECT id FROM repo WHERE name = ?),
+ CURRENT_TIMESTAMP
+ );`, username, repo)
+ return err
+ }),
+ )
+}
+
+// Collaborators returns a list of collaborators for a repository.
+//
+// It implements backend.Backend.
+func (d *SqliteAccess) Collaborators(ctx context.Context, repo string) ([]string, error) {
+ repo = utils.SanitizeRepo(repo)
+ var users []string
+ if err := sqlite.WrapTx(d.db.DBx(), d.ctx, func(tx *sqlx.Tx) error {
+ return tx.Select(&users, `SELECT user.username FROM user
+ INNER JOIN collab ON user.id = collab.user_id
+ INNER JOIN repo ON repo.id = collab.repo_id
+ WHERE repo.name = ?`, repo)
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return users, nil
+}
+
+// IsCollaborator returns true if the user is a collaborator of the repository.
+//
+// It implements backend.Backend.
+func (d *SqliteAccess) IsCollaborator(ctx context.Context, repo string, username string) (bool, error) {
+ repo = utils.SanitizeRepo(repo)
+ var count int
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.Get(&count, `SELECT COUNT(*) FROM user
+ INNER JOIN collab ON user.id = collab.user_id
+ INNER JOIN repo ON repo.id = collab.repo_id
+ WHERE repo.name = ? AND user.username = ?`, repo, username)
+ }); err != nil {
+ return false, sqlite.WrapDbErr(err)
+ }
+
+ return count > 0, nil
+}
+
+// RemoveCollaborator removes a collaborator from a repository.
+//
+// It implements backend.Backend.
+func (d *SqliteAccess) RemoveCollaborator(ctx context.Context, repo string, username string) error {
+ repo = utils.SanitizeRepo(repo)
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec(`DELETE FROM collab
+ WHERE user_id = (SELECT id FROM user WHERE username = ?)
+ AND repo_id = (SELECT id FROM repo WHERE name = ?)`, username, repo)
+ return err
+ }),
+ )
+}
@@ -0,0 +1,45 @@
+package auth
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/charmbracelet/soft-serve/server/sshutils"
+ "golang.org/x/crypto/ssh"
+)
+
+// Auth is an interface that represents a auth store.
+type Auth interface {
+ // Authenticate returns the user for the given auth method.
+ Authenticate(ctx context.Context, method AuthMethod) (User, error)
+}
+
+// AuthMethod is an interface that represents a auth method.
+type AuthMethod interface {
+ fmt.Stringer
+
+ // Name returns the name of the auth method.
+ Name() string
+}
+
+// PublicKey is a public-key auth method.
+type PublicKey struct {
+ ssh.PublicKey
+}
+
+// NewPublicKey returns a new PublicKey auth method from ssh.PublicKey.
+func NewPublicKey(pk ssh.PublicKey) PublicKey {
+ return PublicKey{PublicKey: pk}
+}
+
+var _ AuthMethod = PublicKey{}
+
+// String implements AuthMethod.
+func (pk PublicKey) String() string {
+ return sshutils.MarshalAuthorizedKey(pk.PublicKey)
+}
+
+// Name implements AuthMethod.
+func (PublicKey) Name() string {
+ return "ssh-public-key"
+}
@@ -0,0 +1,34 @@
+package auth
+
+import "context"
+
+var (
+ contextKey = &struct{ string }{"auth"}
+ ContextKeyUser = &struct{ string }{"user"}
+)
+
+// FromContext returns the auth from the context.
+func FromContext(ctx context.Context) Auth {
+ if auth, ok := ctx.Value(contextKey).(Auth); ok {
+ return auth
+ }
+ return nil
+}
+
+// WithContext returns a new context with the auth attached.
+func WithContext(ctx context.Context, auth Auth) context.Context {
+ return context.WithValue(ctx, contextKey, auth)
+}
+
+// UserFromContext returns the user from the context.
+func UserFromContext(ctx context.Context) User {
+ if u, ok := ctx.Value(ContextKeyUser).(User); ok {
+ return u
+ }
+ return nil
+}
+
+// WithUserContext returns a new context with the user attached.
+func WithUserContext(ctx context.Context, u User) context.Context {
+ return context.WithValue(ctx, ContextKeyUser, u)
+}
@@ -0,0 +1,9 @@
+package auth
+
+import "errors"
+
+var (
+ // ErrUnsupportedAuthMethod is returned when an unsupported auth method is
+ // used.
+ ErrUnsupportedAuthMethod = errors.New("unsupported auth method")
+)
@@ -0,0 +1,50 @@
+package auth
+
+import (
+ "context"
+ "errors"
+ "sync"
+)
+
+var (
+ registry = map[string]Constructor{}
+ mtx sync.RWMutex
+
+ // ErrNotFound is returned when a store is not found.
+ ErrNotFound = errors.New("auth store not found")
+)
+
+// Constructor is a function that returns a new store.
+type Constructor func(ctx context.Context) (Auth, error)
+
+// Register registers a store.
+func Register(name string, fn Constructor) {
+ mtx.Lock()
+ defer mtx.Unlock()
+
+ registry[name] = fn
+}
+
+// New returns a new store.
+func New(ctx context.Context, name string) (Auth, error) {
+ mtx.RLock()
+ fn, ok := registry[name]
+ mtx.RUnlock()
+
+ if !ok {
+ return nil, ErrNotFound
+ }
+
+ return fn(ctx)
+}
+
+// List returns a list of registered stores.
+func List() []string {
+ mtx.Lock()
+ defer mtx.Unlock()
+ stores := make([]string, 0)
+ for name := range registry {
+ stores = append(stores, name)
+ }
+ return stores
+}
@@ -0,0 +1,306 @@
+package sqlite
+
+import (
+ "context"
+ "errors"
+ "strings"
+
+ "github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/db"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
+ "github.com/charmbracelet/soft-serve/server/utils"
+ "github.com/jmoiron/sqlx"
+ "golang.org/x/crypto/ssh"
+)
+
+// SqliteAuthStore is a sqlite auth store.
+type SqliteAuthStore struct {
+ db db.Database
+ ctx context.Context
+ logger *log.Logger
+}
+
+func init() {
+ auth.Register("sqlite", newAuthStore)
+}
+
+func newAuthStore(ctx context.Context) (auth.Auth, error) {
+ sdb := db.FromContext(ctx)
+ if sdb == nil {
+ return nil, db.ErrNoDatabase
+ }
+
+ if _, ok := sdb.(*sqlite.Sqlite); !ok {
+ return nil, errors.New("database is not a SQLite database")
+ }
+
+ return &SqliteAuthStore{
+ db: sdb,
+ ctx: ctx,
+ logger: log.FromContext(ctx).WithPrefix("sqlite"),
+ }, nil
+}
+
+// Authenticate implements auth.Auth.
+func (d *SqliteAuthStore) Authenticate(ctx context.Context, method auth.AuthMethod) (auth.User, error) {
+ switch m := method.(type) {
+ case auth.PublicKey:
+ u, err := d.UserByPublicKey(ctx, m)
+ if err != nil {
+ return nil, err
+ }
+
+ return u, nil
+ default:
+ return nil, auth.ErrUnsupportedAuthMethod
+ }
+}
+
+// CreateUser creates a new user.
+func (d *SqliteAuthStore) CreateUser(ctx context.Context, username string, opts UserOptions) (auth.User, error) {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return nil, err
+ }
+
+ var user *User
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ stmt, err := tx.Prepare("INSERT INTO user (username, admin, updated_at) VALUES (?, ?, CURRENT_TIMESTAMP);")
+ if err != nil {
+ return err
+ }
+
+ defer stmt.Close() // nolint: errcheck
+ r, err := stmt.Exec(username, opts.Admin)
+ if err != nil {
+ return err
+ }
+
+ if len(opts.PublicKeys) > 0 {
+ userID, err := r.LastInsertId()
+ if err != nil {
+ d.logger.Error("error getting last insert id")
+ return err
+ }
+
+ for _, pk := range opts.PublicKeys {
+ stmt, err := tx.Prepare(`INSERT INTO public_key (user_id, public_key, updated_at)
+ VALUES (?, ?, CURRENT_TIMESTAMP);`)
+ if err != nil {
+ return err
+ }
+
+ defer stmt.Close() // nolint: errcheck
+ if _, err := stmt.Exec(userID, sshutils.MarshalAuthorizedKey(pk)); err != nil {
+ return err
+ }
+ }
+ }
+
+ user = &User{
+ username: username,
+ isAdmin: opts.Admin,
+ publicKeys: opts.PublicKeys,
+ }
+ return nil
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return user, nil
+}
+
+// DeleteUser deletes a user.
+func (d *SqliteAuthStore) DeleteUser(ctx context.Context, username string) error {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return err
+ }
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("DELETE FROM user WHERE username = ?", username)
+ return err
+ }),
+ )
+}
+
+// SetUsername sets the username of a user.
+func (d *SqliteAuthStore) SetUsername(ctx context.Context, username string, newUsername string) error {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return err
+ }
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("UPDATE user SET username = ? WHERE username = ?", newUsername, username)
+ return err
+ }),
+ )
+}
+
+// SetAdmin sets the admin flag of a user.
+func (d *SqliteAuthStore) SetAdmin(ctx context.Context, username string, admin bool) error {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return err
+ }
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("UPDATE user SET admin = ? WHERE username = ?", admin, username)
+ return err
+ }),
+ )
+}
+
+// User finds a user by username.
+func (d *SqliteAuthStore) User(ctx context.Context, username string) (auth.User, error) {
+ return d.user(ctx, username, nil)
+}
+
+// UserByPublicKey finds a user by public key.
+func (d *SqliteAuthStore) UserByPublicKey(ctx context.Context, pk ssh.PublicKey) (auth.User, error) {
+ return d.user(ctx, "", pk)
+}
+
+func (d *SqliteAuthStore) user(ctx context.Context, username string, pk ssh.PublicKey) (*User, error) {
+ if username == "" && pk == nil {
+ return nil, errors.New("username or public key must be provided")
+ }
+
+ user := &User{
+ username: username,
+ publicKeys: make([]ssh.PublicKey, 0),
+ }
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ if username == "" {
+ row := tx.QueryRow(`SELECT user.username, user.admin
+ FROM public_key
+ INNER JOIN user ON user.id = public_key.user_id
+ WHERE public_key.public_key = ?;`, sshutils.MarshalAuthorizedKey(pk))
+ if err := row.Scan(&user.username, &user.isAdmin); err != nil {
+ return err
+ }
+ } else {
+ row := tx.QueryRow(`SELECT user.admin
+ FROM user
+ WHERE user.username = ?;`, username)
+ if err := row.Scan(&user.isAdmin); err != nil {
+ return err
+ }
+ }
+
+ rows, err := tx.Query(`SELECT public_key.public_key
+ FROM public_key
+ INNER JOIN user ON user.id = public_key.user_id
+ WHERE user.username = ?;`, user.username)
+ if err != nil {
+ return err
+ }
+
+ for rows.Next() {
+ var ak string
+ if err := rows.Scan(&ak); err != nil {
+ return err
+ }
+
+ if pk, _, err := sshutils.ParseAuthorizedKey(ak); err == nil {
+ user.publicKeys = append(user.publicKeys, pk)
+ }
+ }
+
+ return nil
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return user, nil
+}
+
+// Users returns all users.
+//
+// TODO: pagination
+func (d *SqliteAuthStore) Users(ctx context.Context) ([]string, error) {
+ var users []string
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.Select(&users, "SELECT username FROM user")
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return users, nil
+}
+
+// AddPublicKey adds a public key to a user.
+//
+// It implements backend.Backend.
+func (d *SqliteAuthStore) AddPublicKey(ctx context.Context, username string, pk ssh.PublicKey) error {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return err
+ }
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var userID int
+ if err := tx.Get(&userID, "SELECT id FROM user WHERE username = ?", username); err != nil {
+ return err
+ }
+
+ _, err := tx.Exec(`INSERT INTO public_key (user_id, public_key, updated_at)
+ VALUES (?, ?, CURRENT_TIMESTAMP);`, userID, sshutils.MarshalAuthorizedKey(pk))
+ return err
+ }),
+ )
+}
+
+// RemovePublicKey removes a public key from a user.
+//
+// It implements backend.Backend.
+func (d *SqliteAuthStore) RemovePublicKey(ctx context.Context, username string, pk ssh.PublicKey) error {
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec(`DELETE FROM public_key
+ WHERE user_id = (SELECT id FROM user WHERE username = ?)
+ AND public_key = ?;`, username, sshutils.MarshalAuthorizedKey(pk))
+ return err
+ }),
+ )
+}
+
+// ListPublicKeys lists the public keys of a user.
+func (d *SqliteAuthStore) ListPublicKeys(ctx context.Context, username string) ([]ssh.PublicKey, error) {
+ username = strings.ToLower(username)
+ if err := utils.ValidateUsername(username); err != nil {
+ return nil, err
+ }
+
+ keys := make([]ssh.PublicKey, 0)
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var keyStrings []string
+ if err := tx.Select(&keyStrings, `SELECT public_key
+ FROM public_key
+ INNER JOIN user ON user.id = public_key.user_id
+ WHERE user.username = ?;`, username); err != nil {
+ return err
+ }
+
+ for _, keyString := range keyStrings {
+ key, _, _, _, err := ssh.ParseAuthorizedKey([]byte(keyString))
+ if err != nil {
+ return err
+ }
+ keys = append(keys, key)
+ }
+
+ return nil
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return keys, nil
+}
@@ -0,0 +1,42 @@
+package sqlite
+
+import (
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "golang.org/x/crypto/ssh"
+)
+
+// UserOptions are options for creating a user.
+type UserOptions struct {
+ // Admin is whether the user is an admin.
+ Admin bool
+ // PublicKeys are the user's public keys.
+ PublicKeys []ssh.PublicKey
+}
+
+// User represents a user.
+type User struct {
+ username string
+ isAdmin bool
+ publicKeys []ssh.PublicKey
+}
+
+var _ auth.User = (*User)(nil)
+
+// IsAdmin implements auth.User.
+func (u *User) IsAdmin() bool {
+ return u.isAdmin
+}
+
+// PublicKeys implements auth.User.
+func (u *User) PublicKeys() []ssh.PublicKey {
+ if u.publicKeys == nil {
+ return []ssh.PublicKey{}
+ }
+
+ return u.publicKeys
+}
+
+// Username implements auth.User.
+func (u *User) Username() string {
+ return u.username
+}
@@ -0,0 +1,13 @@
+package auth
+
+import "golang.org/x/crypto/ssh"
+
+// User is an interface representing a user.
+type User interface {
+ // Username returns the user's username.
+ Username() string
+ // IsAdmin returns whether the user is an admin.
+ IsAdmin() bool
+ // PublicKeys returns the user's public keys.
+ PublicKeys() []ssh.PublicKey
+}
@@ -1,47 +1,63 @@
package backend
import (
- "bytes"
"context"
+ "github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/settings"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/charmbracelet/ssh"
gossh "golang.org/x/crypto/ssh"
)
-// Backend is an interface that handles repositories management and any
-// non-Git related operations.
-type Backend interface {
- SettingsBackend
- RepositoryStore
- RepositoryMetadata
- RepositoryAccess
- UserStore
- UserAccess
- Hooks
-
- // WithContext returns a copy Backend with the given context.
- WithContext(ctx context.Context) Backend
-}
+// Backend handles repository management, server settings, authentication, and
+// authorization.
+type Backend struct {
+ settings.Settings
+ store.Store
+ auth.Auth
+ access.Access
-// ParseAuthorizedKey parses an authorized key string into a public key.
-func ParseAuthorizedKey(ak string) (gossh.PublicKey, string, error) {
- pk, c, _, _, err := gossh.ParseAuthorizedKey([]byte(ak))
- return pk, c, err
+ ctx context.Context
+ logger *log.Logger
}
-// MarshalAuthorizedKey marshals a public key into an authorized key string.
-//
-// This is the inverse of ParseAuthorizedKey.
-// This function is a copy of ssh.MarshalAuthorizedKey, but without the trailing newline.
-// It returns an empty string if pk is nil.
-func MarshalAuthorizedKey(pk gossh.PublicKey) string {
- if pk == nil {
- return ""
+// NewBackendStore returns a new BackendStore.
+func NewBackend(ctx context.Context, s settings.Settings, st store.Store, a auth.Auth, ac access.Access) (*Backend, error) {
+ ba := &Backend{
+ Settings: s,
+ Store: st,
+ Auth: a,
+ Access: ac,
+ ctx: ctx,
+ logger: log.FromContext(ctx).WithPrefix("backend"),
}
- return string(bytes.TrimSuffix(gossh.MarshalAuthorizedKey(pk), []byte("\n")))
+
+ return ba, nil
}
-// KeysEqual returns whether the two public keys are equal.
-func KeysEqual(a, b gossh.PublicKey) bool {
- return ssh.KeysEqual(a, b)
+// AccessLevel returns the access level for the given user and repository.
+// It will also check if the SSH connection is using an admin key.
+func (b *Backend) AccessLevel(ctx context.Context, repo string, user auth.User) (access.AccessLevel, error) {
+ cfg := config.FromContext(ctx)
+ if cfg != nil {
+ log.Printf("found cfg")
+ if pk, ok := ctx.Value(ssh.ContextKeyPublicKey).(gossh.PublicKey); ok {
+ log.Printf("pk: %v", sshutils.MarshalAuthorizedKey(pk))
+ for _, k := range cfg.AdminKeys() {
+ if sshutils.KeysEqual(pk, k) {
+ return access.AdminAccess, nil
+ }
+ }
+ }
+ log.Printf("no pk")
+ }
+
+ log.Printf("no cfg")
+
+ return b.Access.AccessLevel(ctx, repo, user)
}
@@ -1,12 +1,19 @@
package backend
-import "context"
+import (
+ "context"
+
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/settings"
+ "github.com/charmbracelet/soft-serve/server/store"
+)
var contextKey = &struct{ string }{"backend"}
// FromContext returns the backend from a context.
-func FromContext(ctx context.Context) Backend {
- if b, ok := ctx.Value(contextKey).(Backend); ok {
+func FromContext(ctx context.Context) *Backend {
+ if b, ok := ctx.Value(contextKey).(*Backend); ok {
return b
}
@@ -14,6 +21,11 @@ func FromContext(ctx context.Context) Backend {
}
// WithContext returns a new context with the backend attached.
-func WithContext(ctx context.Context, b Backend) context.Context {
- return context.WithValue(ctx, contextKey, b)
+func WithContext(ctx context.Context, b *Backend) context.Context {
+ ctx = settings.WithContext(ctx, b.Settings)
+ ctx = store.WithContext(ctx, b.Store)
+ ctx = access.WithContext(ctx, b.Access)
+ ctx = auth.WithContext(ctx, b.Auth)
+ ctx = context.WithValue(ctx, contextKey, b)
+ return ctx
}
@@ -1,6 +1,7 @@
package backend
import (
+ "context"
"io"
)
@@ -13,8 +14,40 @@ type HookArg struct {
// Hooks provides an interface for git server-side hooks.
type Hooks interface {
- PreReceive(stdout io.Writer, stderr io.Writer, repo string, args []HookArg)
- Update(stdout io.Writer, stderr io.Writer, repo string, arg HookArg)
- PostReceive(stdout io.Writer, stderr io.Writer, repo string, args []HookArg)
- PostUpdate(stdout io.Writer, stderr io.Writer, repo string, args ...string)
+ PreReceive(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args []HookArg)
+ Update(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, arg HookArg)
+ PostReceive(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args []HookArg)
+ PostUpdate(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args ...string)
+}
+
+// PostReceive is called by the git post-receive hook.
+//
+// It implements Hooks.
+func (d *Backend) PostReceive(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args []HookArg) {
+ d.logger.Debug("post-receive hook called", "repo", repo, "args", args)
+}
+
+// PreReceive is called by the git pre-receive hook.
+//
+// It implements Hooks.
+func (d *Backend) PreReceive(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args []HookArg) {
+ d.logger.Debug("pre-receive hook called", "repo", repo, "args", args)
+}
+
+// Update is called by the git update hook.
+//
+// It implements Hooks.
+func (d *Backend) Update(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, arg HookArg) {
+ d.logger.Debug("update hook called", "repo", repo, "arg", arg)
+}
+
+// PostUpdate is called by the git post-update hook.
+//
+// It implements Hooks.
+func (d *Backend) PostUpdate(ctx context.Context, stdout io.Writer, stderr io.Writer, repo string, args ...string) {
+ d.logger.Debug("post-update hook called", "repo", repo, "args", args)
+
+ if err := d.Touch(ctx, repo); err != nil {
+ d.logger.Error("failed to touch repo", "repo", repo, "err", err)
+ }
}
@@ -7,6 +7,7 @@ import (
"fmt"
"github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/jmoiron/sqlx"
"modernc.org/sqlite"
sqlite3 "modernc.org/sqlite/lib"
@@ -64,7 +65,7 @@ func (d *SqliteBackend) init() error {
// Don't use cfg.AdminKeys since it also includes the internal key
// used for internal api access.
for _, k := range d.cfg.InitialAdminKeys {
- pk, _, err := backend.ParseAuthorizedKey(k)
+ pk, _, err := sshutils.ParseAuthorizedKey(k)
if err != nil {
d.logger.Error("error parsing initial admin key, skipping", "key", k, "err", err)
continue
@@ -77,7 +78,7 @@ func (d *SqliteBackend) init() error {
}
defer stmt.Close() // nolint: errcheck
- if _, err := stmt.Exec(userID, backend.MarshalAuthorizedKey(pk)); err != nil {
+ if _, err := stmt.Exec(userID, sshutils.MarshalAuthorizedKey(pk)); err != nil {
return err
}
}
@@ -32,8 +32,6 @@ type SqliteBackend struct { //nolint: revive
cache cache.Cache
}
-var _ backend.Backend = (*SqliteBackend)(nil)
-
func (d *SqliteBackend) reposPath() string {
return filepath.Join(d.dp, "repos")
}
@@ -73,7 +71,7 @@ func NewSqliteBackend(ctx context.Context) (*SqliteBackend, error) {
}
// WithContext returns a shallow copy of SqliteBackend with the given context.
-func (d SqliteBackend) WithContext(ctx context.Context) backend.Backend {
+func (d SqliteBackend) WithContext(ctx context.Context) *SqliteBackend {
d.ctx = ctx
return &d
}
@@ -5,6 +5,7 @@ import (
"strings"
"github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/charmbracelet/soft-serve/server/utils"
"github.com/jmoiron/sqlx"
"golang.org/x/crypto/ssh"
@@ -119,7 +120,7 @@ func (d *SqliteBackend) AccessLevel(repo string, username string) backend.Access
// It implements backend.Backend.
func (d *SqliteBackend) AccessLevelByPublicKey(repo string, pk ssh.PublicKey) backend.AccessLevel {
for _, k := range d.cfg.AdminKeys() {
- if backend.KeysEqual(pk, k) {
+ if sshutils.KeysEqual(pk, k) {
return backend.AdminAccess
}
}
@@ -149,7 +150,7 @@ func (d *SqliteBackend) AddPublicKey(username string, pk ssh.PublicKey) error {
}
_, err := tx.Exec(`INSERT INTO public_key (user_id, public_key, updated_at)
- VALUES (?, ?, CURRENT_TIMESTAMP);`, userID, backend.MarshalAuthorizedKey(pk))
+ VALUES (?, ?, CURRENT_TIMESTAMP);`, userID, sshutils.MarshalAuthorizedKey(pk))
return err
}),
)
@@ -192,7 +193,7 @@ func (d *SqliteBackend) CreateUser(username string, opts backend.UserOptions) (b
}
defer stmt.Close() // nolint: errcheck
- if _, err := stmt.Exec(userID, backend.MarshalAuthorizedKey(pk)); err != nil {
+ if _, err := stmt.Exec(userID, sshutils.MarshalAuthorizedKey(pk)); err != nil {
return err
}
}
@@ -235,7 +236,7 @@ func (d *SqliteBackend) RemovePublicKey(username string, pk ssh.PublicKey) error
wrapTx(d.db, context.Background(), func(tx *sqlx.Tx) error {
_, err := tx.Exec(`DELETE FROM public_key
WHERE user_id = (SELECT id FROM user WHERE username = ?)
- AND public_key = ?;`, username, backend.MarshalAuthorizedKey(pk))
+ AND public_key = ?;`, username, sshutils.MarshalAuthorizedKey(pk))
return err
}),
)
@@ -338,7 +339,7 @@ func (d *SqliteBackend) UserByPublicKey(pk ssh.PublicKey) (backend.User, error)
return tx.Get(&username, `SELECT user.username
FROM public_key
INNER JOIN user ON user.id = public_key.user_id
- WHERE public_key.public_key = ?;`, backend.MarshalAuthorizedKey(pk))
+ WHERE public_key.public_key = ?;`, sshutils.MarshalAuthorizedKey(pk))
}); err != nil {
return nil, wrapDbErr(err)
}
@@ -2,6 +2,12 @@ package cache
import (
"context"
+ "fmt"
+)
+
+var (
+ // ErrNotFound is returned when a cache is not found.
+ ErrNotFound = fmt.Errorf("cache not found")
)
// ItemOption is an option for setting cache items.
@@ -7,6 +7,10 @@ import (
lru "github.com/hashicorp/golang-lru/v2"
)
+func init() {
+ cache.Register("lru", newCache)
+}
+
// Cache is a memory cache that uses a LRU cache policy.
type Cache struct {
cache *lru.Cache[string, any]
@@ -32,8 +36,8 @@ func WithEvictCallback(cb func(key string, value any)) cache.Option {
}
}
-// NewCache returns a new Cache.
-func NewCache(_ context.Context, opts ...cache.Option) (cache.Cache, error) {
+// newCache returns a new Cache.
+func newCache(_ context.Context, opts ...cache.Option) (cache.Cache, error) {
c := &Cache{}
for _, opt := range opts {
opt(c)
@@ -6,10 +6,14 @@ import (
"github.com/charmbracelet/soft-serve/server/cache"
)
+func init() {
+ cache.Register("noop", newCache)
+}
+
type noopCache struct{}
-// NewCache returns a new Cache.
-func NewCache(_ context.Context, _ ...cache.Option) (cache.Cache, error) {
+// newCache returns a new Cache.
+func newCache(_ context.Context, _ ...cache.Option) (cache.Cache, error) {
return &noopCache{}, nil
}
@@ -14,7 +14,7 @@ var (
mtx sync.RWMutex
// ErrCacheNotFound is returned when a cache is not found.
- ErrCacheNotFound = fmt.Errorf("cache not found")
+ ErrCacheNotFound = fmt.Errorf("cache driver not found")
)
// Register registers a cache.
@@ -26,13 +26,13 @@ func Register(name string, fn Constructor) {
}
// New returns a new cache.
-func New(name string, ctx context.Context, opts ...Option) (Cache, error) {
+func New(ctx context.Context, name string, opts ...Option) (Cache, error) {
mtx.RLock()
fn, ok := registry[name]
mtx.RUnlock()
if !ok {
- return nil, ErrCacheNotFound
+ return nil, ErrNotFound
}
return fn(ctx, opts...)
@@ -8,7 +8,7 @@ import (
gansi "github.com/charmbracelet/glamour/ansi"
"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/soft-serve/git"
- "github.com/charmbracelet/soft-serve/server/ui/common"
+ "github.com/charmbracelet/soft-serve/server/uiutils"
"github.com/muesli/termenv"
"github.com/spf13/cobra"
)
@@ -34,7 +34,7 @@ func blobCommand() *cobra.Command {
Args: cobra.RangeArgs(1, 3),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ be, _ := fromContext(cmd)
rn := args[0]
ref := ""
fp := ""
@@ -46,7 +46,8 @@ func blobCommand() *cobra.Command {
fp = args[2]
}
- repo, err := cfg.Backend.Repository(rn)
+ ctx := cmd.Context()
+ repo, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -150,7 +151,7 @@ func withFormatting(p, c string) (string, error) {
Language: lang,
}
r := strings.Builder{}
- styles := common.StyleConfig()
+ styles := uiutils.StyleConfig()
styles.CodeBlock.Margin = &zero
rctx := gansi.NewRenderContext(gansi.Options{
Styles: styles,
@@ -31,9 +31,10 @@ func branchListCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
- rr, err := cfg.Backend.Repository(rn)
+ ctx := cmd.Context()
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -61,14 +62,16 @@ func branchDefaultCommand() *cobra.Command {
Short: "Set or get the default branch",
Args: cobra.RangeArgs(1, 2),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
switch len(args) {
case 1:
if err := checkIfReadable(cmd, args); err != nil {
return err
}
- rr, err := cfg.Backend.Repository(rn)
+
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -89,7 +92,7 @@ func branchDefaultCommand() *cobra.Command {
return err
}
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -132,9 +135,10 @@ func branchDeleteCommand() *cobra.Command {
Short: "Delete a branch",
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -9,9 +9,13 @@ import (
"unicode"
"github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/auth/sqlite"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/errors"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/charmbracelet/soft-serve/server/utils"
"github.com/charmbracelet/ssh"
"github.com/charmbracelet/wish"
@@ -19,8 +23,8 @@ import (
)
var (
- // sessionCtxKey is the key for the session in the context.
- sessionCtxKey = &struct{ string }{"session"}
+ // contextKeySession is the key for the session in the context.
+ contextKeySession = &struct{ string }{"session"}
)
var templateFuncs = template.FuncMap{
@@ -76,7 +80,8 @@ func rpad(s string, padding int) string {
}
// rootCommand is the root command for the server.
-func rootCommand(cfg *config.Config, s ssh.Session) *cobra.Command {
+func rootCommand(ctx context.Context, s ssh.Session) *cobra.Command {
+ cfg := config.FromContext(ctx)
rootCmd := &cobra.Command{
Short: "Soft Serve is a self-hostable Git server for the command line.",
SilenceUsage: true,
@@ -110,18 +115,25 @@ func rootCommand(cfg *config.Config, s ssh.Session) *cobra.Command {
})
})
rootCmd.CompletionOptions.DisableDefaultCmd = true
+ rootCmd.SetContext(ctx)
rootCmd.AddCommand(
repoCommand(),
)
- user, _ := cfg.Backend.UserByPublicKey(s.PublicKey())
- isAdmin := isPublicKeyAdmin(cfg, s.PublicKey()) || (user != nil && user.IsAdmin())
+ be := backend.FromContext(ctx)
+ pka := auth.NewPublicKey(s.PublicKey())
+ user, _ := be.Authenticate(ctx, pka)
+ isAdmin := isPublicKeyAdmin(ctx, s.PublicKey()) || (user != nil && user.IsAdmin())
if user != nil || isAdmin {
if isAdmin {
rootCmd.AddCommand(
settingsCommand(),
- userCommand(),
)
+ if sb, ok := be.Auth.(*sqlite.SqliteAuthStore); ok {
+ rootCmd.AddCommand(
+ userCommand(sb),
+ )
+ }
}
rootCmd.AddCommand(
@@ -134,11 +146,11 @@ func rootCommand(cfg *config.Config, s ssh.Session) *cobra.Command {
return rootCmd
}
-func fromContext(cmd *cobra.Command) (*config.Config, ssh.Session) {
+func fromContext(cmd *cobra.Command) (*backend.Backend, ssh.Session) {
ctx := cmd.Context()
- cfg := config.FromContext(ctx)
- s := ctx.Value(sessionCtxKey).(ssh.Session)
- return cfg, s
+ s := ctx.Value(contextKeySession).(ssh.Session)
+ be := backend.FromContext(ctx)
+ return be, s
}
func checkIfReadable(cmd *cobra.Command, args []string) error {
@@ -146,18 +158,33 @@ func checkIfReadable(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
repo = args[0]
}
- cfg, s := fromContext(cmd)
+
+ be, s := fromContext(cmd)
rn := utils.SanitizeRepo(repo)
- auth := cfg.Backend.AccessLevelByPublicKey(rn, s.PublicKey())
- if auth < backend.ReadOnlyAccess {
+ ctx := cmd.Context()
+ pka := auth.NewPublicKey(s.PublicKey())
+
+ user, err := be.Authenticate(ctx, pka)
+ if err != nil {
+ return errors.ErrUnauthorized
+ }
+
+ auth, err := be.AccessLevel(ctx, rn, user)
+ if err != nil {
return errors.ErrUnauthorized
}
+
+ if auth < access.ReadOnlyAccess {
+ return errors.ErrUnauthorized
+ }
+
return nil
}
-func isPublicKeyAdmin(cfg *config.Config, pk ssh.PublicKey) bool {
+func isPublicKeyAdmin(ctx context.Context, pk ssh.PublicKey) bool {
+ cfg := config.FromContext(ctx)
for _, k := range cfg.AdminKeys() {
- if backend.KeysEqual(pk, k) {
+ if sshutils.KeysEqual(pk, k) {
return true
}
}
@@ -165,12 +192,14 @@ func isPublicKeyAdmin(cfg *config.Config, pk ssh.PublicKey) bool {
}
func checkIfAdmin(cmd *cobra.Command, _ []string) error {
- cfg, s := fromContext(cmd)
- if isPublicKeyAdmin(cfg, s.PublicKey()) {
+ ctx := cmd.Context()
+ be, s := fromContext(cmd)
+ if isPublicKeyAdmin(ctx, s.PublicKey()) {
return nil
}
- user, _ := cfg.Backend.UserByPublicKey(s.PublicKey())
+ pka := auth.NewPublicKey(s.PublicKey())
+ user, _ := be.Authenticate(ctx, pka)
if user == nil {
return errors.ErrUnauthorized
}
@@ -187,17 +216,36 @@ func checkIfCollab(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
repo = args[0]
}
- cfg, s := fromContext(cmd)
+
+ ctx := cmd.Context()
+ be, s := fromContext(cmd)
+
+ if isPublicKeyAdmin(ctx, s.PublicKey()) {
+ return nil
+ }
+
rn := utils.SanitizeRepo(repo)
- auth := cfg.Backend.AccessLevelByPublicKey(rn, s.PublicKey())
- if auth < backend.ReadWriteAccess {
+ pka := auth.NewPublicKey(s.PublicKey())
+ user, err := be.Authenticate(ctx, pka)
+ if err != nil {
+ return errors.ErrUnauthorized
+ }
+
+ auth, err := be.AccessLevel(ctx, rn, user)
+ if err != nil {
+ return errors.ErrUnauthorized
+ }
+
+ if auth < access.ReadWriteAccess {
return errors.ErrUnauthorized
}
return nil
}
// Middleware is the Soft Serve middleware that handles SSH commands.
-func Middleware(cfg *config.Config, logger *log.Logger) wish.Middleware {
+func Middleware(ctx context.Context, logger *log.Logger) wish.Middleware {
+ be := backend.FromContext(ctx)
+ cfg := config.FromContext(ctx)
return func(sh ssh.Handler) ssh.Handler {
return func(s ssh.Session) {
func() {
@@ -216,18 +264,12 @@ func Middleware(cfg *config.Config, logger *log.Logger) wish.Middleware {
}
}
- // Here we copy the server's config and replace the backend
- // with a new one that uses the session's context.
var ctx context.Context = s.Context()
- scfg := *cfg
- cfg = &scfg
- be := cfg.Backend.WithContext(ctx)
- cfg.Backend = be
- ctx = config.WithContext(ctx, cfg)
ctx = backend.WithContext(ctx, be)
- ctx = context.WithValue(ctx, sessionCtxKey, s)
+ ctx = context.WithValue(ctx, contextKeySession, s)
+ ctx = config.WithContext(ctx, cfg)
- rootCmd := rootCommand(cfg, s)
+ rootCmd := rootCommand(ctx, s)
rootCmd.SetArgs(args)
if len(args) == 0 {
// otherwise it'll default to os.Args, which is not what we want.
@@ -12,71 +12,72 @@ func collabCommand() *cobra.Command {
}
cmd.AddCommand(
- collabAddCommand(),
- collabRemoveCommand(),
- collabListCommand(),
+ // collabAddCommand(),
+ // collabRemoveCommand(),
+ // collabListCommand(),
)
return cmd
}
-func collabAddCommand() *cobra.Command {
- cmd := &cobra.Command{
- Use: "add REPOSITORY USERNAME",
- Short: "Add a collaborator to a repo",
- Args: cobra.ExactArgs(2),
- PersistentPreRunE: checkIfCollab,
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
- repo := args[0]
- username := args[1]
-
- return cfg.Backend.AddCollaborator(repo, username)
- },
- }
-
- return cmd
-}
-
-func collabRemoveCommand() *cobra.Command {
- cmd := &cobra.Command{
- Use: "remove REPOSITORY USERNAME",
- Args: cobra.ExactArgs(2),
- Short: "Remove a collaborator from a repo",
- PersistentPreRunE: checkIfCollab,
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
- repo := args[0]
- username := args[1]
-
- return cfg.Backend.RemoveCollaborator(repo, username)
- },
- }
-
- return cmd
-}
-
-func collabListCommand() *cobra.Command {
- cmd := &cobra.Command{
- Use: "list REPOSITORY",
- Short: "List collaborators for a repo",
- Args: cobra.ExactArgs(1),
- PersistentPreRunE: checkIfCollab,
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
- repo := args[0]
- collabs, err := cfg.Backend.Collaborators(repo)
- if err != nil {
- return err
- }
-
- for _, c := range collabs {
- cmd.Println(c)
- }
-
- return nil
- },
- }
-
- return cmd
-}
+//
+// func collabAddCommand() *cobra.Command {
+// cmd := &cobra.Command{
+// Use: "add REPOSITORY USERNAME",
+// Short: "Add a collaborator to a repo",
+// Args: cobra.ExactArgs(2),
+// PersistentPreRunE: checkIfCollab,
+// RunE: func(cmd *cobra.Command, args []string) error {
+// be, _ := fromContext(cmd)
+// repo := args[0]
+// username := args[1]
+//
+// return be.AddCollaborator(ctx, repo, username)
+// },
+// }
+//
+// return cmd
+// }
+//
+// func collabRemoveCommand() *cobra.Command {
+// cmd := &cobra.Command{
+// Use: "remove REPOSITORY USERNAME",
+// Args: cobra.ExactArgs(2),
+// Short: "Remove a collaborator from a repo",
+// PersistentPreRunE: checkIfCollab,
+// RunE: func(cmd *cobra.Command, args []string) error {
+// be, _ := fromContext(cmd)
+// repo := args[0]
+// username := args[1]
+//
+// return be.RemoveCollaborator(repo, username)
+// },
+// }
+//
+// return cmd
+// }
+//
+// func collabListCommand() *cobra.Command {
+// cmd := &cobra.Command{
+// Use: "list REPOSITORY",
+// Short: "List collaborators for a repo",
+// Args: cobra.ExactArgs(1),
+// PersistentPreRunE: checkIfCollab,
+// RunE: func(cmd *cobra.Command, args []string) error {
+// be, _ := fromContext(cmd)
+// repo := args[0]
+// collabs, err := be.Collaborators(repo)
+// if err != nil {
+// return err
+// }
+//
+// for _, c := range collabs {
+// cmd.Println(c)
+// }
+//
+// return nil
+// },
+// }
+//
+// return cmd
+// }
@@ -1,7 +1,7 @@
package cmd
import (
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/spf13/cobra"
)
@@ -18,9 +18,10 @@ func createCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
name := args[0]
- if _, err := cfg.Backend.CreateRepository(name, backend.RepositoryOptions{
+ if _, err := be.CreateRepository(ctx, name, store.RepositoryOptions{
Private: private,
Description: description,
ProjectName: projectName,
@@ -10,9 +10,10 @@ func deleteCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
name := args[0]
- if err := cfg.Backend.DeleteRepository(name); err != nil {
+ if err := be.DeleteRepository(ctx, name); err != nil {
return err
}
return nil
@@ -13,7 +13,8 @@ func descriptionCommand() *cobra.Command {
Short: "Set or get the description for a repository",
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
switch len(args) {
case 1:
@@ -21,7 +22,7 @@ func descriptionCommand() *cobra.Command {
return err
}
- desc, err := cfg.Backend.Description(rn)
+ desc, err := be.Description(ctx, rn)
if err != nil {
return err
}
@@ -31,7 +32,7 @@ func descriptionCommand() *cobra.Command {
if err := checkIfCollab(cmd, args); err != nil {
return err
}
- if err := cfg.Backend.SetDescription(rn, strings.Join(args[1:], " ")); err != nil {
+ if err := be.SetDescription(ctx, rn, strings.Join(args[1:], " ")); err != nil {
return err
}
}
@@ -9,7 +9,8 @@ func hiddenCommand() *cobra.Command {
Aliases: []string{"hide"},
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
repo := args[0]
switch len(args) {
case 1:
@@ -17,7 +18,7 @@ func hiddenCommand() *cobra.Command {
return err
}
- hidden, err := cfg.Backend.IsHidden(repo)
+ hidden, err := be.IsHidden(ctx, repo)
if err != nil {
return err
}
@@ -29,7 +30,7 @@ func hiddenCommand() *cobra.Command {
}
hidden := args[1] == "true"
- if err := cfg.Backend.SetHidden(repo, hidden); err != nil {
+ if err := be.SetHidden(ctx, repo, hidden); err != nil {
return err
}
}
@@ -1,7 +1,7 @@
package cmd
import (
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/spf13/cobra"
)
@@ -19,10 +19,11 @@ func importCommand() *cobra.Command {
Args: cobra.ExactArgs(2),
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
name := args[0]
remote := args[1]
- if _, err := cfg.Backend.ImportRepository(name, remote, backend.RepositoryOptions{
+ if _, err := be.ImportRepository(ctx, name, remote, store.RepositoryOptions{
Private: private,
Description: description,
ProjectName: projectName,
@@ -1,7 +1,8 @@
package cmd
import (
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/spf13/cobra"
)
@@ -11,8 +12,9 @@ func infoCommand() *cobra.Command {
Short: "Show your info",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- user, err := cfg.Backend.UserByPublicKey(s.PublicKey())
+ ctx := cmd.Context()
+ be, s := fromContext(cmd)
+ user, err := be.Authenticate(ctx, auth.NewPublicKey(s.PublicKey()))
if err != nil {
return err
}
@@ -21,7 +23,7 @@ func infoCommand() *cobra.Command {
cmd.Printf("Admin: %t\n", user.IsAdmin())
cmd.Printf("Public keys:\n")
for _, pk := range user.PublicKeys() {
- cmd.Printf(" %s\n", backend.MarshalAuthorizedKey(pk))
+ cmd.Printf(" %s\n", sshutils.MarshalAuthorizedKey(pk))
}
return nil
},
@@ -1,7 +1,8 @@
package cmd
import (
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
"github.com/spf13/cobra"
)
@@ -15,13 +16,25 @@ func listCommand() *cobra.Command {
Short: "List repositories",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- repos, err := cfg.Backend.Repositories()
+ ctx := cmd.Context()
+ be, s := fromContext(cmd)
+ repos, err := be.Repositories(ctx, 1, 10)
if err != nil {
return err
}
+
+ user, err := be.Authenticate(ctx, auth.NewPublicKey(s.PublicKey()))
+ if err != nil {
+ return err
+ }
+
for _, r := range repos {
- if cfg.Backend.AccessLevelByPublicKey(r.Name(), s.PublicKey()) >= backend.ReadOnlyAccess {
+ ac, err := be.AccessLevel(ctx, r.Name(), user)
+ if err != nil {
+ continue
+ }
+
+ if ac >= access.ReadOnlyAccess {
if !r.IsHidden() || all {
cmd.Println(r.Name())
}
@@ -11,9 +11,10 @@ func mirrorCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := args[0]
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -13,7 +13,8 @@ func privateCommand() *cobra.Command {
Short: "Set or get a repository private property",
Args: cobra.RangeArgs(1, 2),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
switch len(args) {
@@ -22,7 +23,7 @@ func privateCommand() *cobra.Command {
return err
}
- isPrivate, err := cfg.Backend.IsPrivate(rn)
+ isPrivate, err := be.IsPrivate(ctx, rn)
if err != nil {
return err
}
@@ -36,7 +37,7 @@ func privateCommand() *cobra.Command {
if err := checkIfCollab(cmd, args); err != nil {
return err
}
- if err := cfg.Backend.SetPrivate(rn, isPrivate); err != nil {
+ if err := be.SetPrivate(ctx, rn, isPrivate); err != nil {
return err
}
}
@@ -13,7 +13,8 @@ func projectName() *cobra.Command {
Short: "Set or get the project name for a repository",
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
switch len(args) {
case 1:
@@ -21,7 +22,7 @@ func projectName() *cobra.Command {
return err
}
- pn, err := cfg.Backend.ProjectName(rn)
+ pn, err := be.ProjectName(ctx, rn)
if err != nil {
return err
}
@@ -31,7 +32,7 @@ func projectName() *cobra.Command {
if err := checkIfCollab(cmd, args); err != nil {
return err
}
- if err := cfg.Backend.SetProjectName(rn, strings.Join(args[1:], " ")); err != nil {
+ if err := be.SetProjectName(ctx, rn, strings.Join(args[1:], " ")); err != nil {
return err
}
}
@@ -1,9 +1,6 @@
package cmd
import (
- "strings"
-
- "github.com/charmbracelet/soft-serve/server/backend"
"github.com/spf13/cobra"
)
@@ -13,73 +10,73 @@ func pubkeyCommand() *cobra.Command {
Aliases: []string{"pubkeys", "publickey", "publickeys"},
Short: "Manage your public keys",
}
-
- pubkeyAddCommand := &cobra.Command{
- Use: "add AUTHORIZED_KEY",
- Short: "Add a public key",
- Args: cobra.MinimumNArgs(1),
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- user, err := cfg.Backend.UserByPublicKey(s.PublicKey())
- if err != nil {
- return err
- }
-
- pk, _, err := backend.ParseAuthorizedKey(strings.Join(args, " "))
- if err != nil {
- return err
- }
-
- return cfg.Backend.AddPublicKey(user.Username(), pk)
- },
- }
-
- pubkeyRemoveCommand := &cobra.Command{
- Use: "remove AUTHORIZED_KEY",
- Args: cobra.MinimumNArgs(1),
- Short: "Remove a public key",
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- user, err := cfg.Backend.UserByPublicKey(s.PublicKey())
- if err != nil {
- return err
- }
-
- pk, _, err := backend.ParseAuthorizedKey(strings.Join(args, " "))
- if err != nil {
- return err
- }
-
- return cfg.Backend.RemovePublicKey(user.Username(), pk)
- },
- }
-
- pubkeyListCommand := &cobra.Command{
- Use: "list",
- Aliases: []string{"ls"},
- Short: "List public keys",
- Args: cobra.NoArgs,
- RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- user, err := cfg.Backend.UserByPublicKey(s.PublicKey())
- if err != nil {
- return err
- }
-
- pks := user.PublicKeys()
- for _, pk := range pks {
- cmd.Println(backend.MarshalAuthorizedKey(pk))
- }
-
- return nil
- },
- }
-
- cmd.AddCommand(
- pubkeyAddCommand,
- pubkeyRemoveCommand,
- pubkeyListCommand,
- )
+ //
+ // pubkeyAddCommand := &cobra.Command{
+ // Use: "add AUTHORIZED_KEY",
+ // Short: "Add a public key",
+ // Args: cobra.MinimumNArgs(1),
+ // RunE: func(cmd *cobra.Command, args []string) error {
+ // be, s := fromContext(cmd)
+ // user, err := be.UserByPublicKey(s.PublicKey())
+ // if err != nil {
+ // return err
+ // }
+ //
+ // pk, _, err := backend.ParseAuthorizedKey(strings.Join(args, " "))
+ // if err != nil {
+ // return err
+ // }
+ //
+ // return be.AddPublicKey(user.Username(), pk)
+ // },
+ // }
+ //
+ // pubkeyRemoveCommand := &cobra.Command{
+ // Use: "remove AUTHORIZED_KEY",
+ // Args: cobra.MinimumNArgs(1),
+ // Short: "Remove a public key",
+ // RunE: func(cmd *cobra.Command, args []string) error {
+ // be, s := fromContext(cmd)
+ // user, err := be.UserByPublicKey(s.PublicKey())
+ // if err != nil {
+ // return err
+ // }
+ //
+ // pk, _, err := backend.ParseAuthorizedKey(strings.Join(args, " "))
+ // if err != nil {
+ // return err
+ // }
+ //
+ // return be.RemovePublicKey(user.Username(), pk)
+ // },
+ // }
+ //
+ // pubkeyListCommand := &cobra.Command{
+ // Use: "list",
+ // Aliases: []string{"ls"},
+ // Short: "List public keys",
+ // Args: cobra.NoArgs,
+ // RunE: func(cmd *cobra.Command, args []string) error {
+ // be, s := fromContext(cmd)
+ // user, err := be.UserByPublicKey(s.PublicKey())
+ // if err != nil {
+ // return err
+ // }
+ //
+ // pks := user.PublicKeys()
+ // for _, pk := range pks {
+ // cmd.Println(backend.MarshalAuthorizedKey(pk))
+ // }
+ //
+ // return nil
+ // },
+ // }
+ //
+ // cmd.AddCommand(
+ // pubkeyAddCommand,
+ // pubkeyRemoveCommand,
+ // pubkeyListCommand,
+ // )
return cmd
}
@@ -10,10 +10,11 @@ func renameCommand() *cobra.Command {
Args: cobra.ExactArgs(2),
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
oldName := args[0]
newName := args[1]
- if err := cfg.Backend.RenameRepository(oldName, newName); err != nil {
+ if err := be.RenameRepository(ctx, oldName, newName); err != nil {
return err
}
return nil
@@ -34,9 +34,10 @@ func repoCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := args[0]
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -1,6 +1,9 @@
package cmd
-import "github.com/spf13/cobra"
+import (
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/spf13/cobra"
+)
func setUsernameCommand() *cobra.Command {
cmd := &cobra.Command{
@@ -8,13 +11,15 @@ func setUsernameCommand() *cobra.Command {
Short: "Set your username",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, s := fromContext(cmd)
- user, err := cfg.Backend.UserByPublicKey(s.PublicKey())
+ ctx := cmd.Context()
+ be, s := fromContext(cmd)
+ _, err := be.Authenticate(ctx, auth.NewPublicKey(s.PublicKey()))
if err != nil {
return err
}
- return cfg.Backend.SetUsername(user.Username(), args[0])
+ return nil
+ // return be.SetUsername(ctx, user.Username(), args[0])
},
}
@@ -4,6 +4,7 @@ import (
"fmt"
"strconv"
+ "github.com/charmbracelet/soft-serve/server/access"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/spf13/cobra"
)
@@ -21,13 +22,14 @@ func settingsCommand() *cobra.Command {
Args: cobra.RangeArgs(0, 1),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
switch len(args) {
case 0:
- cmd.Println(cfg.Backend.AllowKeyless())
+ cmd.Println(be.AllowKeyless(ctx))
case 1:
v, _ := strconv.ParseBool(args[0])
- if err := cfg.Backend.SetAllowKeyless(v); err != nil {
+ if err := be.SetAllowKeyless(ctx, v); err != nil {
return err
}
}
@@ -46,16 +48,17 @@ func settingsCommand() *cobra.Command {
ValidArgs: als,
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
switch len(args) {
case 0:
- cmd.Println(cfg.Backend.AnonAccess())
+ cmd.Println(be.AnonAccess(ctx))
case 1:
- al := backend.ParseAccessLevel(args[0])
+ al := access.ParseAccessLevel(args[0])
if al < 0 {
return fmt.Errorf("invalid access level: %s. Please choose one of the following: %s", args[0], als)
}
- if err := cfg.Backend.SetAnonAccess(al); err != nil {
+ if err := be.SetAnonAccess(ctx, al); err != nil {
return err
}
}
@@ -28,9 +28,10 @@ func tagListCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -60,9 +61,10 @@ func tagDeleteCommand() *cobra.Command {
Args: cobra.ExactArgs(2),
PersistentPreRunE: checkIfCollab,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := strings.TrimSuffix(args[0], ".git")
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -17,7 +17,8 @@ func treeCommand() *cobra.Command {
Args: cobra.RangeArgs(1, 3),
PersistentPreRunE: checkIfReadable,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
+ be, _ := fromContext(cmd)
rn := args[0]
path := ""
ref := ""
@@ -28,7 +29,7 @@ func treeCommand() *cobra.Command {
ref = args[1]
path = args[2]
}
- rr, err := cfg.Backend.Repository(rn)
+ rr, err := be.Repository(ctx, rn)
if err != nil {
return err
}
@@ -2,15 +2,17 @@ package cmd
import (
"sort"
+ "strconv"
"strings"
"github.com/charmbracelet/log"
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/auth/sqlite"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh"
)
-func userCommand() *cobra.Command {
+func userCommand(sb *sqlite.SqliteAuthStore) *cobra.Command {
cmd := &cobra.Command{
Use: "user",
Aliases: []string{"users"},
@@ -25,11 +27,11 @@ func userCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
+ ctx := cmd.Context()
var pubkeys []ssh.PublicKey
- cfg, _ := fromContext(cmd)
username := args[0]
if key != "" {
- pk, _, err := backend.ParseAuthorizedKey(key)
+ pk, _, err := sshutils.ParseAuthorizedKey(key)
if err != nil {
return err
}
@@ -37,12 +39,12 @@ func userCommand() *cobra.Command {
pubkeys = []ssh.PublicKey{pk}
}
- opts := backend.UserOptions{
+ opts := sqlite.UserOptions{
Admin: admin,
PublicKeys: pubkeys,
}
- _, err := cfg.Backend.CreateUser(username, opts)
+ _, err := sb.CreateUser(ctx, username, opts)
return err
},
}
@@ -56,10 +58,10 @@ func userCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
- return cfg.Backend.DeleteUser(username)
+ return sb.DeleteUser(ctx, username)
},
}
@@ -70,8 +72,8 @@ func userCommand() *cobra.Command {
Args: cobra.NoArgs,
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, _ []string) error {
- cfg, _ := fromContext(cmd)
- users, err := cfg.Backend.Users()
+ ctx := cmd.Context()
+ users, err := sb.Users(ctx)
if err != nil {
return err
}
@@ -91,15 +93,15 @@ func userCommand() *cobra.Command {
Args: cobra.MinimumNArgs(2),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
pubkey := strings.Join(args[1:], " ")
- pk, _, err := backend.ParseAuthorizedKey(pubkey)
+ pk, _, err := sshutils.ParseAuthorizedKey(pubkey)
if err != nil {
return err
}
- return cfg.Backend.AddPublicKey(username, pk)
+ return sb.AddPublicKey(ctx, username, pk)
},
}
@@ -109,16 +111,16 @@ func userCommand() *cobra.Command {
Args: cobra.MinimumNArgs(2),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
pubkey := strings.Join(args[1:], " ")
log.Debugf("key is %q", pubkey)
- pk, _, err := backend.ParseAuthorizedKey(pubkey)
+ pk, _, err := sshutils.ParseAuthorizedKey(pubkey)
if err != nil {
return err
}
- return cfg.Backend.RemovePublicKey(username, pk)
+ return sb.RemovePublicKey(ctx, username, pk)
},
}
@@ -128,10 +130,11 @@ func userCommand() *cobra.Command {
Args: cobra.ExactArgs(2),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
+ isAdmin, _ := strconv.ParseBool(args[1])
- return cfg.Backend.SetAdmin(username, args[1] == "true")
+ return sb.SetAdmin(ctx, username, isAdmin)
},
}
@@ -141,10 +144,10 @@ func userCommand() *cobra.Command {
Args: cobra.ExactArgs(1),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
- user, err := cfg.Backend.User(username)
+ user, err := sb.User(ctx, username)
if err != nil {
return err
}
@@ -155,7 +158,7 @@ func userCommand() *cobra.Command {
cmd.Printf("Admin: %t\n", isAdmin)
cmd.Printf("Public keys:\n")
for _, pk := range user.PublicKeys() {
- cmd.Printf(" %s\n", backend.MarshalAuthorizedKey(pk))
+ cmd.Printf(" %s\n", sshutils.MarshalAuthorizedKey(pk))
}
return nil
@@ -168,11 +171,11 @@ func userCommand() *cobra.Command {
Args: cobra.ExactArgs(2),
PersistentPreRunE: checkIfAdmin,
RunE: func(cmd *cobra.Command, args []string) error {
- cfg, _ := fromContext(cmd)
+ ctx := cmd.Context()
username := args[0]
newUsername := args[1]
- return cfg.Backend.SetUsername(username, newUsername)
+ return sb.SetUsername(ctx, username, newUsername)
},
}
@@ -0,0 +1,28 @@
+package config
+
+// BackendConfig is the backend configuration.
+type BackendConfig struct {
+ // Settings is the settings backend.
+ Settings string `env:"SETTINGS" yaml:"settings"`
+
+ // Access is the access backend.
+ Access string `env:"ACCESS" yaml:"access"`
+
+ // Store is the store backend.
+ Store string `env:"STORE" yaml:"store"`
+
+ // Auth is the auth backend.
+ Auth string `env:"AUTH" yaml:"auth"`
+}
+
+// Environ returns the environment variables for the backend configuration.
+func (b BackendConfig) Environ() []string {
+ envs := []string{
+ "SOFT_SERVE_BACKEND_SETTINGS=" + b.Settings,
+ "SOFT_SERVE_BACKEND_ACCESS=" + b.Access,
+ "SOFT_SERVE_BACKEND_STORE=" + b.Store,
+ "SOFT_SERVE_BACKEND_AUTH=" + b.Auth,
+ }
+
+ return envs
+}
@@ -0,0 +1,14 @@
+package config
+
+// CacheConfig is the configuration for the cache server.
+type CacheConfig struct {
+ // Backend is the cache backend.
+ Backend string `env:"CACHE_BACKEND" yaml:"backend"`
+}
+
+// Environ returns the environment variables for the cache configuration.
+func (c CacheConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_CACHE_BACKEND=" + c.Backend,
+ }
+}
@@ -1,88 +1,19 @@
package config
import (
- "context"
- "errors"
"fmt"
+ "log"
"os"
"path/filepath"
"strings"
"time"
"github.com/caarlos0/env/v8"
- "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"golang.org/x/crypto/ssh"
"gopkg.in/yaml.v3"
)
-// SSHConfig is the configuration for the SSH server.
-type SSHConfig struct {
- // ListenAddr is the address on which the SSH server will listen.
- ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
-
- // PublicURL is the public URL of the SSH server.
- PublicURL string `env:"PUBLIC_URL" yaml:"public_url"`
-
- // KeyPath is the path to the SSH server's private key.
- KeyPath string `env:"KEY_PATH" yaml:"key_path"`
-
- // ClientKeyPath is the path to the server's client private key.
- ClientKeyPath string `env:"CLIENT_KEY_PATH" yaml:"client_key_path"`
-
- // MaxTimeout is the maximum number of seconds a connection can take.
- MaxTimeout int `env:"MAX_TIMEOUT" yaml:"max_timeout"`
-
- // IdleTimeout is the number of seconds a connection can be idle before it is closed.
- IdleTimeout int `env:"IDLE_TIMEOUT" yaml:"idle_timeout"`
-}
-
-// GitConfig is the Git daemon configuration for the server.
-type GitConfig struct {
- // ListenAddr is the address on which the Git daemon will listen.
- ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
-
- // MaxTimeout is the maximum number of seconds a connection can take.
- MaxTimeout int `env:"MAX_TIMEOUT" yaml:"max_timeout"`
-
- // IdleTimeout is the number of seconds a connection can be idle before it is closed.
- IdleTimeout int `env:"IDLE_TIMEOUT" yaml:"idle_timeout"`
-
- // MaxConnections is the maximum number of concurrent connections.
- MaxConnections int `env:"MAX_CONNECTIONS" yaml:"max_connections"`
-}
-
-// HTTPConfig is the HTTP configuration for the server.
-type HTTPConfig struct {
- // ListenAddr is the address on which the HTTP server will listen.
- ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
-
- // TLSKeyPath is the path to the TLS private key.
- TLSKeyPath string `env:"TLS_KEY_PATH" yaml:"tls_key_path"`
-
- // TLSCertPath is the path to the TLS certificate.
- TLSCertPath string `env:"TLS_CERT_PATH" yaml:"tls_cert_path"`
-
- // PublicURL is the public URL of the HTTP server.
- PublicURL string `env:"PUBLIC_URL" yaml:"public_url"`
-}
-
-// StatsConfig is the configuration for the stats server.
-type StatsConfig struct {
- // ListenAddr is the address on which the stats server will listen.
- ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
-}
-
-// LogConfig is the logger configuration.
-type LogConfig struct {
- // Format is the format of the logs.
- // Valid values are "json", "logfmt", and "text".
- Format string `env:"FORMAT" yaml:"format"`
-
- // Time format for the log `ts` field.
- // Format must be described in Golang's time format.
- TimeFormat string `env:"TIME_FORMAT" yaml:"time_format"`
-}
-
// Config is the configuration for Soft Serve.
type Config struct {
// Name is the name of the server.
@@ -91,8 +22,8 @@ type Config struct {
// SSH is the configuration for the SSH server.
SSH SSHConfig `envPrefix:"SSH_" yaml:"ssh"`
- // Git is the configuration for the Git daemon.
- Git GitConfig `envPrefix:"GIT_" yaml:"git"`
+ // GitDaemon is the configuration for the GitDaemon daemon.
+ GitDaemon GitDaemonConfig `envPrefix:"GIT_DAEMON_" yaml:"git_daemon"`
// HTTP is the configuration for the HTTP server.
HTTP HTTPConfig `envPrefix:"HTTP_" yaml:"http"`
@@ -104,48 +35,38 @@ type Config struct {
Log LogConfig `envPrefix:"LOG_" yaml:"log"`
// Cache is the cache backend to use.
- Cache string `env:"CACHE" yaml:"cache"`
+ Cache CacheConfig `env:"CACHE" yaml:"cache"`
+
+ // Database is the database configuration.
+ Database DatabaseConfig `envPrefix:"DATABASE_" yaml:"database"`
+
+ // Backend is the backend to use.
+ Backend BackendConfig `envPrefix:"BACKEND_" yaml:"backend"`
// InitialAdminKeys is a list of public keys that will be added to the list of admins.
InitialAdminKeys []string `env:"INITIAL_ADMIN_KEYS" envSeparator:"\n" yaml:"initial_admin_keys"`
// DataPath is the path to the directory where Soft Serve will store its data.
DataPath string `env:"DATA_PATH" yaml:"-"`
-
- // Backend is the Git backend to use.
- Backend backend.Backend `yaml:"-"`
}
// Environ returns the config as a list of environment variables.
+// TODO: use pointer receiver
func (c *Config) Environ() []string {
- envs := []string{}
- if c == nil {
- return envs
- }
-
- // TODO: do this dynamically
- envs = append(envs, []string{
- fmt.Sprintf("SOFT_SERVE_NAME=%s", c.Name),
- fmt.Sprintf("SOFT_SERVE_DATA_PATH=%s", c.DataPath),
- fmt.Sprintf("SOFT_SERVE_INITIAL_ADMIN_KEYS=%s", strings.Join(c.InitialAdminKeys, "\n")),
- fmt.Sprintf("SOFT_SERVE_SSH_LISTEN_ADDR=%s", c.SSH.ListenAddr),
- fmt.Sprintf("SOFT_SERVE_SSH_PUBLIC_URL=%s", c.SSH.PublicURL),
- fmt.Sprintf("SOFT_SERVE_SSH_KEY_PATH=%s", c.SSH.KeyPath),
- fmt.Sprintf("SOFT_SERVE_SSH_CLIENT_KEY_PATH=%s", c.SSH.ClientKeyPath),
- fmt.Sprintf("SOFT_SERVE_SSH_MAX_TIMEOUT=%d", c.SSH.MaxTimeout),
- fmt.Sprintf("SOFT_SERVE_SSH_IDLE_TIMEOUT=%d", c.SSH.IdleTimeout),
- fmt.Sprintf("SOFT_SERVE_GIT_LISTEN_ADDR=%s", c.Git.ListenAddr),
- fmt.Sprintf("SOFT_SERVE_GIT_MAX_TIMEOUT=%d", c.Git.MaxTimeout),
- fmt.Sprintf("SOFT_SERVE_GIT_IDLE_TIMEOUT=%d", c.Git.IdleTimeout),
- fmt.Sprintf("SOFT_SERVE_GIT_MAX_CONNECTIONS=%d", c.Git.MaxConnections),
- fmt.Sprintf("SOFT_SERVE_HTTP_LISTEN_ADDR=%s", c.HTTP.ListenAddr),
- fmt.Sprintf("SOFT_SERVE_HTTP_TLS_KEY_PATH=%s", c.HTTP.TLSKeyPath),
- fmt.Sprintf("SOFT_SERVE_HTTP_TLS_CERT_PATH=%s", c.HTTP.TLSCertPath),
- fmt.Sprintf("SOFT_SERVE_HTTP_PUBLIC_URL=%s", c.HTTP.PublicURL),
- fmt.Sprintf("SOFT_SERVE_STATS_LISTEN_ADDR=%s", c.Stats.ListenAddr),
- fmt.Sprintf("SOFT_SERVE_LOG_FORMAT=%s", c.Log.Format),
- fmt.Sprintf("SOFT_SERVE_LOG_TIME_FORMAT=%s", c.Log.TimeFormat),
- }...)
+ envs := append([]string{},
+ "SOFT_SERVE_NAME="+c.Name,
+ "SOFT_SERVE_DATA_PATH="+c.DataPath,
+ "SOFT_SERVE_INITIAL_ADMIN_KEYS="+strings.Join(c.InitialAdminKeys, "\n"),
+ )
+
+ envs = append(envs, c.SSH.Environ()...)
+ envs = append(envs, c.GitDaemon.Environ()...)
+ envs = append(envs, c.HTTP.Environ()...)
+ envs = append(envs, c.Stats.Environ()...)
+ envs = append(envs, c.Log.Environ()...)
+ envs = append(envs, c.Cache.Environ()...)
+ envs = append(envs, c.Database.Environ()...)
+ envs = append(envs, c.Backend.Environ()...)
return envs
}
@@ -175,32 +96,25 @@ func parseEnv(v interface{}) error {
return nil
}
-// ParseConfig parses the configuration from environment variables the given
-// file.
-func ParseConfig(v interface{}, path string) error {
- return errors.Join(parseFile(v, path), parseEnv(v))
+// ParseConfig parses the configuration file to server configuration.
+func ParseConfig(c *Config, path string) error {
+ return parseConfig(c, path)
}
-// NewConfig retruns a new Config with values populated from environment
-// variables and config file.
-//
-// If the config file does not exist, it will be created with the default
-// values.
-//
-// Environment variables will override values in the config file except for the
-// initial_admin_keys.
-//
-// If path is empty, the default config file path will be used.
-func NewConfig(path string) (*Config, error) {
- cfg := DefaultConfig()
+func parseConfig(cfg *Config, path string) error {
+ if cfg == nil {
+ cfg = DefaultConfig()
+ }
+
if path != "" {
+ // TODO: make config aware of config.yaml path
cfg.DataPath = filepath.Dir(path)
}
- // Parse file
- if cfg.Exist() {
+ exist := cfg.Exist()
+ if exist {
if err := parseFile(cfg, cfg.FilePath()); err != nil {
- return cfg, err
+ return err
}
}
@@ -208,7 +122,7 @@ func NewConfig(path string) (*Config, error) {
initialAdminKeys := append([]string{}, cfg.InitialAdminKeys...)
if err := parseEnv(cfg); err != nil {
- return cfg, err
+ return err
}
// Merge initial admin keys from environment variables.
@@ -219,35 +133,30 @@ func NewConfig(path string) (*Config, error) {
// Validate keys
pks := make([]string, 0)
for _, key := range parseAuthKeys(cfg.InitialAdminKeys) {
- ak := backend.MarshalAuthorizedKey(key)
+ ak := sshutils.MarshalAuthorizedKey(key)
pks = append(pks, ak)
}
cfg.InitialAdminKeys = pks
- // Reset datapath to config dir.
- // This is necessary because the environment variable may be set to
- // a different directory.
- // cfg.DataPath = dataPath
-
if err := cfg.validate(); err != nil {
- return cfg, err
+ return err
}
- return cfg, cfg.WriteConfig()
+ return nil
}
-// DefaultConfig returns a Config with the default values.
+// DefaultConfig returns the default config.
func DefaultConfig() *Config {
dataPath := os.Getenv("SOFT_SERVE_DATA_PATH")
if dataPath == "" {
dataPath = "data"
}
- cfg := &Config{
- Name: "Soft Serve",
- DataPath: dataPath,
- Cache: "lru",
+ return &Config{
+ Name: "Soft Serve",
+ DataPath: dataPath,
+ InitialAdminKeys: []string{},
SSH: SSHConfig{
ListenAddr: ":23231",
PublicURL: "ssh://localhost:23231",
@@ -256,7 +165,7 @@ func DefaultConfig() *Config {
MaxTimeout: 0,
IdleTimeout: 0,
},
- Git: GitConfig{
+ GitDaemon: GitDaemonConfig{
ListenAddr: ":9418",
MaxTimeout: 0,
IdleTimeout: 3,
@@ -273,9 +182,20 @@ func DefaultConfig() *Config {
Format: "text",
TimeFormat: time.DateTime,
},
+ Cache: CacheConfig{
+ Backend: "lru",
+ },
+ Database: DatabaseConfig{
+ Driver: "sqlite",
+ DataSource: "soft-serve.db",
+ },
+ Backend: BackendConfig{
+ Settings: "sqlite",
+ Access: "sqlite",
+ Auth: "sqlite",
+ Store: "sqlite",
+ },
}
-
- return cfg
}
// FilePath returns the expected config file path.
@@ -289,20 +209,33 @@ func (c *Config) Exist() bool {
return err == nil
}
+// ReadConfig parses the configuration file.
+func (c *Config) ReadConfig() error {
+ return parseConfig(c, c.FilePath())
+}
+
// WriteConfig writes the configuration in the default path.
func (c *Config) WriteConfig() error {
+ return WriteConfig(c)
+}
+
+// ReposPath returns the expected repositories path.
+func (c *Config) ReposPath() string {
+ return filepath.Join(c.DataPath, "repos")
+}
+
+// WriteConfig writes the configuration in the default path.
+func WriteConfig(c *Config) error {
+ if c == nil {
+ return fmt.Errorf("nil config")
+ }
+
fp := c.FilePath()
if err := os.MkdirAll(filepath.Dir(fp), os.ModePerm); err != nil {
return err
}
- return os.WriteFile(fp, []byte(newConfigFile(c)), 0o644) // nolint: errcheck
-}
-// WithBackend sets the backend for the configuration.
-// TODO: remove in favor of backend.FromContext.
-func (c *Config) WithBackend(backend backend.Backend) *Config {
- c.Backend = backend
- return c
+ return os.WriteFile(fp, []byte(newConfigFile(c)), 0o644) // nolint: errcheck
}
func (c *Config) validate() error {
@@ -316,7 +249,6 @@ func (c *Config) validate() error {
}
c.SSH.PublicURL = strings.TrimSuffix(c.SSH.PublicURL, "/")
- c.HTTP.PublicURL = strings.TrimSuffix(c.HTTP.PublicURL, "/")
if c.SSH.KeyPath != "" && !filepath.IsAbs(c.SSH.KeyPath) {
c.SSH.KeyPath = filepath.Join(c.DataPath, c.SSH.KeyPath)
@@ -326,6 +258,8 @@ func (c *Config) validate() error {
c.SSH.ClientKeyPath = filepath.Join(c.DataPath, c.SSH.ClientKeyPath)
}
+ c.HTTP.PublicURL = strings.TrimSuffix(c.HTTP.PublicURL, "/")
+
if c.HTTP.TLSKeyPath != "" && !filepath.IsAbs(c.HTTP.TLSKeyPath) {
c.HTTP.TLSKeyPath = filepath.Join(c.DataPath, c.HTTP.TLSKeyPath)
}
@@ -334,6 +268,13 @@ func (c *Config) validate() error {
c.HTTP.TLSCertPath = filepath.Join(c.DataPath, c.HTTP.TLSCertPath)
}
+ switch c.Database.Driver {
+ case "sqlite":
+ if c.Database.DataSource != "" && !filepath.IsAbs(c.Database.DataSource) {
+ c.Database.DataSource = filepath.Join(c.DataPath, c.Database.DataSource)
+ }
+ }
+
return nil
}
@@ -345,7 +286,7 @@ func parseAuthKeys(aks []string) []ssh.PublicKey {
// key is a file
key = strings.TrimSpace(string(bts))
}
- if pk, _, err := backend.ParseAuthorizedKey(key); err == nil {
+ if pk, _, err := sshutils.ParseAuthorizedKey(key); err == nil {
pks = append(pks, pk)
}
}
@@ -354,21 +295,10 @@ func parseAuthKeys(aks []string) []ssh.PublicKey {
// AdminKeys returns the server admin keys.
func (c *Config) AdminKeys() []ssh.PublicKey {
- return parseAuthKeys(c.InitialAdminKeys)
-}
-
-var configCtxKey = struct{ string }{"config"}
-
-// WithContext returns a new context with the configuration attached.
-func WithContext(ctx context.Context, cfg *Config) context.Context {
- return context.WithValue(ctx, configCtxKey, cfg)
-}
-
-// FromContext returns the configuration from the context.
-func FromContext(ctx context.Context) *Config {
- if c, ok := ctx.Value(configCtxKey).(*Config); ok {
- return c
+ if c.InitialAdminKeys == nil {
+ return []ssh.PublicKey{}
}
- return DefaultConfig()
+ log.Print(c.InitialAdminKeys)
+ return parseAuthKeys(c.InitialAdminKeys)
}
@@ -18,8 +18,8 @@ func TestParseMultipleKeys(t *testing.T) {
is.NoErr(os.Unsetenv("SOFT_SERVE_INITIAL_ADMIN_KEYS"))
is.NoErr(os.Unsetenv("SOFT_SERVE_DATA_PATH"))
})
- cfg, err := NewConfig("")
- is.NoErr(err)
+ cfg := DefaultConfig()
+ is.NoErr(parseConfig(cfg, ""))
is.Equal(cfg.InitialAdminKeys, []string{
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
@@ -37,8 +37,8 @@ func TestMergeInitAdminKeys(t *testing.T) {
fp := filepath.Join(t.TempDir(), "config.yaml")
err = os.WriteFile(fp, bts, 0o644)
is.NoErr(err)
- cfg, err := NewConfig(fp)
- is.NoErr(err)
+ cfg := DefaultConfig()
+ is.NoErr(parseConfig(cfg, fp))
is.Equal(cfg.InitialAdminKeys, []string{
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
@@ -58,8 +58,8 @@ func TestValidateInitAdminKeys(t *testing.T) {
fp := filepath.Join(t.TempDir(), "config.yaml")
err = os.WriteFile(fp, bts, 0o644)
is.NoErr(err)
- cfg, err := NewConfig(fp)
- is.NoErr(err)
+ cfg := DefaultConfig()
+ is.NoErr(parseConfig(cfg, fp))
is.Equal(cfg.InitialAdminKeys, []string{
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
})
@@ -0,0 +1,19 @@
+package config
+
+import "context"
+
+var ContextKeyConfig = &struct{ string }{"config"}
+
+// WithContext returns a new context with the configuration attached.
+func WithContext(ctx context.Context, cfg *Config) context.Context {
+ return context.WithValue(ctx, ContextKeyConfig, cfg)
+}
+
+// FromContext returns the configuration from the context.
+func FromContext(ctx context.Context) *Config {
+ if c, ok := ctx.Value(ContextKeyConfig).(*Config); ok {
+ return c
+ }
+
+ return DefaultConfig()
+}
@@ -0,0 +1,20 @@
+package config
+
+// DatabaseConfig is the database configuration.
+type DatabaseConfig struct {
+ // Driver is the database driver.
+ Driver string `env:"DRIVER" yaml:"driver"`
+
+ // DataSource is the database data source.
+ DataSource string `env:"DATA_SOURCE" yaml:"data_source"`
+}
+
+// Environ returns the environment variables for the database configuration.
+func (d DatabaseConfig) Environ() []string {
+ envs := []string{
+ "SOFT_SERVE_DATABASE_DRIVER=" + d.Driver,
+ "SOFT_SERVE_DATABASE_DATA_SOURCE=" + d.DataSource,
+ }
+
+ return envs
+}
@@ -12,8 +12,37 @@ var configFileTmpl = template.Must(template.New("config").Parse(`# Soft Serve Se
name: "{{ .Name }}"
# Cache configuration.
-# The cache backend to use. The default backend is "lru" memory cache.
-cache: "{{ .Cache }}"
+cache:
+ # The cache backend to use. The default backend is "lru" memory cache.
+ backend: "{{ .Cache.Backend }}"
+
+# Database configuration.
+database:
+ # The database driver to use. The default driver is "sqlite".
+ driver: "{{ .Database.Driver }}"
+ # The data source to the database. For sqlite, this is the path to the
+ # database file.
+ data_source:"{{ .Database.DataSource }}"
+
+# Backend configuration defines the backend for server settings, repositories,
+# authentication, and authorization.
+backend:
+ # Settings is the server settings backend.
+ # The default is "sqlite" which stores server settings as a key-value pair in
+ # the database.
+ settings: "{{ .Backend.Settings }}"
+ # Access is the authorization backend.
+ # The default is "sqlite" which stores access rules in the database.
+ access: "{{ .Backend.Access }}"
+ # Auth is the authentication backend.
+ # The default is "sqlite" which stores and manages users in the database.
+ auth: "{{ .Backend.Auth }}"
+ # Store is the repository storage backend.
+ # The default is "filesqlite" which stores repositories in the filesystem and
+ # the sqlite database.
+ # Git repositories are stored in the filesystem and their metadata are stored
+ # in both the filesystem and database.
+ store: "{{ .Backend.Store }}"
# Logging configuration.
log:
@@ -48,19 +77,19 @@ ssh:
idle_timeout: {{ .SSH.IdleTimeout }}
# The Git daemon configuration.
-git:
+git_daemon:
# The address on which the Git daemon will listen.
- listen_addr: "{{ .Git.ListenAddr }}"
+ listen_addr: "{{ .GitDaemon.ListenAddr }}"
# The maximum number of seconds a connection can take.
# A value of 0 means no timeout.
- max_timeout: {{ .Git.MaxTimeout }}
+ max_timeout: {{ .GitDaemon.MaxTimeout }}
# The number of seconds a connection can be idle before it is closed.
- idle_timeout: {{ .Git.IdleTimeout }}
+ idle_timeout: {{ .GitDaemon.IdleTimeout }}
# The maximum number of concurrent connections.
- max_connections: {{ .Git.MaxConnections }}
+ max_connections: {{ .GitDaemon.MaxConnections }}
# The HTTP server configuration.
http:
@@ -81,6 +110,11 @@ http:
# The stats server configuration.
stats:
# The address on which the stats server will listen.
+ # Note that by default, the stats server binds to "localhost".
+ # This won't make it accessible from other networks.
+ # If you're running Soft Serve on a container, you probably want it to be
+ # accessible to other networks. To do so, change the listen address to
+ # ":PORT" or "0.0.0.0:PORT".
listen_addr: "{{ .Stats.ListenAddr }}"
# Additional admin keys.
@@ -0,0 +1,28 @@
+package config
+
+import "strconv"
+
+// GitDaemonConfig is the Git daemon configuration for the server.
+type GitDaemonConfig struct {
+ // ListenAddr is the address on which the Git daemon will listen.
+ ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
+
+ // MaxTimeout is the maximum number of seconds a connection can take.
+ MaxTimeout int `env:"MAX_TIMEOUT" yaml:"max_timeout"`
+
+ // IdleTimeout is the number of seconds a connection can be idle before it is closed.
+ IdleTimeout int `env:"IDLE_TIMEOUT" yaml:"idle_timeout"`
+
+ // MaxConnections is the maximum number of concurrent connections.
+ MaxConnections int `env:"MAX_CONNECTIONS" yaml:"max_connections"`
+}
+
+// Environ returns the environment variables for the config.
+func (g GitDaemonConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_GIT_DAEMON_LISTEN_ADDR=" + g.ListenAddr,
+ "SOFT_SERVE_GIT_DAEMON_MAX_TIMEOUT=" + strconv.Itoa(g.MaxTimeout),
+ "SOFT_SERVE_GIT_DAEMON_IDLE_TIMEOUT=" + strconv.Itoa(g.IdleTimeout),
+ "SOFT_SERVE_GIT_DAEMON_MAX_CONNECTIONS=" + strconv.Itoa(g.MaxConnections),
+ }
+}
@@ -0,0 +1,26 @@
+package config
+
+// HTTPConfig is the HTTP configuration for the server.
+type HTTPConfig struct {
+ // ListenAddr is the address on which the HTTP server will listen.
+ ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
+
+ // TLSKeyPath is the path to the TLS private key.
+ TLSKeyPath string `env:"TLS_KEY_PATH" yaml:"tls_key_path"`
+
+ // TLSCertPath is the path to the TLS certificate.
+ TLSCertPath string `env:"TLS_CERT_PATH" yaml:"tls_cert_path"`
+
+ // PublicURL is the public URL of the HTTP server.
+ PublicURL string `env:"PUBLIC_URL" yaml:"public_url"`
+}
+
+// Environ returns the environment variables for the config.
+func (h HTTPConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_HTTP_LISTEN_ADDR=" + h.ListenAddr,
+ "SOFT_SERVE_HTTP_TLS_KEY_PATH=" + h.TLSKeyPath,
+ "SOFT_SERVE_HTTP_TLS_CERT_PATH=" + h.TLSCertPath,
+ "SOFT_SERVE_HTTP_PUBLIC_URL=" + h.PublicURL,
+ }
+}
@@ -0,0 +1,28 @@
+package config
+
+import "time"
+
+// Log is the logger configuration.
+var Log = &LogConfig{
+ Format: "text",
+ TimeFormat: time.DateTime,
+}
+
+// LogConfig is the logger configuration.
+type LogConfig struct {
+ // Format is the format of the logs.
+ // Valid values are "json", "logfmt", and "text".
+ Format string `env:"FORMAT" yaml:"format"`
+
+ // Time format for the log `ts` field.
+ // Format must be described in Golang's time format.
+ TimeFormat string `env:"TIME_FORMAT" yaml:"time_format"`
+}
+
+// Environ returns the environment variables for the config.
+func (l LogConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_LOG_FORMAT=" + l.Format,
+ "SOFT_SERVE_LOG_TIME_FORMAT=" + l.TimeFormat,
+ }
+}
@@ -0,0 +1,38 @@
+package config
+
+import (
+ "strconv"
+)
+
+// SSHConfig is the configuration for the SSH server.
+type SSHConfig struct {
+ // ListenAddr is the address on which the SSH server will listen.
+ ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
+
+ // PublicURL is the public URL of the SSH server.
+ PublicURL string `env:"PUBLIC_URL" yaml:"public_url"`
+
+ // KeyPath is the path to the SSH server's private key.
+ KeyPath string `env:"KEY_PATH" yaml:"key_path"`
+
+ // ClientKeyPath is the path to the server's client private key.
+ ClientKeyPath string `env:"CLIENT_KEY_PATH" yaml:"client_key_path"`
+
+ // MaxTimeout is the maximum number of seconds a connection can take.
+ MaxTimeout int `env:"MAX_TIMEOUT" yaml:"max_timeout"`
+
+ // IdleTimeout is the number of seconds a connection can be idle before it is closed.
+ IdleTimeout int `env:"IDLE_TIMEOUT" yaml:"idle_timeout"`
+}
+
+// Environ returns the environment variables for the config.
+func (s SSHConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_SSH_LISTEN_ADDR=" + s.ListenAddr,
+ "SOFT_SERVE_SSH_PUBLIC_URL=" + s.PublicURL,
+ "SOFT_SERVE_SSH_KEY_PATH=" + s.KeyPath,
+ "SOFT_SERVE_SSH_CLIENT_KEY_PATH=" + s.ClientKeyPath,
+ "SOFT_SERVE_SSH_MAX_TIMEOUT=" + strconv.Itoa(s.MaxTimeout),
+ "SOFT_SERVE_SSH_IDLE_TIMEOUT=" + strconv.Itoa(s.IdleTimeout),
+ }
+}
@@ -0,0 +1,14 @@
+package config
+
+// StatsConfig is the configuration for the stats server.
+type StatsConfig struct {
+ // ListenAddr is the address on which the stats server will listen.
+ ListenAddr string `env:"LISTEN_ADDR" yaml:"listen_addr"`
+}
+
+// Environ returns the environment variables for the config.
+func (s StatsConfig) Environ() []string {
+ return []string{
+ "SOFT_SERVE_STATS_LISTEN_ADDR=" + s.ListenAddr,
+ }
+}
@@ -11,6 +11,7 @@ import (
"time"
"github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/access"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/git"
@@ -50,7 +51,7 @@ type GitDaemon struct {
finished chan struct{}
conns connections
cfg *config.Config
- be backend.Backend
+ be *backend.Backend
wg sync.WaitGroup
once sync.Once
logger *log.Logger
@@ -59,7 +60,7 @@ type GitDaemon struct {
// NewDaemon returns a new Git daemon.
func NewGitDaemon(ctx context.Context) (*GitDaemon, error) {
cfg := config.FromContext(ctx)
- addr := cfg.Git.ListenAddr
+ addr := cfg.GitDaemon.ListenAddr
d := &GitDaemon{
ctx: ctx,
addr: addr,
@@ -110,7 +111,7 @@ func (d *GitDaemon) Start() error {
}
// Close connection if there are too many open connections.
- if d.conns.Size()+1 >= d.cfg.Git.MaxConnections {
+ if d.conns.Size()+1 >= d.cfg.GitDaemon.MaxConnections {
d.logger.Debugf("git: max connections reached, closing %s", conn.RemoteAddr())
d.fatal(conn, git.ErrMaxConnections)
continue
@@ -134,14 +135,14 @@ func (d *GitDaemon) fatal(c net.Conn, err error) {
// handleClient handles a git protocol client.
func (d *GitDaemon) handleClient(conn net.Conn) {
ctx, cancel := context.WithCancel(context.Background())
- idleTimeout := time.Duration(d.cfg.Git.IdleTimeout) * time.Second
+ idleTimeout := time.Duration(d.cfg.GitDaemon.IdleTimeout) * time.Second
c := &serverConn{
Conn: conn,
idleTimeout: idleTimeout,
closeCanceler: cancel,
}
- if d.cfg.Git.MaxTimeout > 0 {
- dur := time.Duration(d.cfg.Git.MaxTimeout) * time.Second
+ if d.cfg.GitDaemon.MaxTimeout > 0 {
+ dur := time.Duration(d.cfg.GitDaemon.MaxTimeout) * time.Second
c.maxDeadline = time.Now().Add(dur)
}
d.conns.Add(c)
@@ -227,9 +228,9 @@ func (d *GitDaemon) handleClient(conn net.Conn) {
}
}
- be := d.be.WithContext(ctx)
- if !be.AllowKeyless() {
- d.fatal(c, git.ErrNotAuthed)
+ be := d.be
+ if !be.AllowKeyless(ctx) {
+ d.fatal(c, git.ErrUnauthorized)
return
}
@@ -243,18 +244,18 @@ func (d *GitDaemon) handleClient(conn net.Conn) {
reposDir := filepath.Join(d.cfg.DataPath, "repos")
if err := git.EnsureWithin(reposDir, repo); err != nil {
d.logger.Debugf("git: error ensuring repo path: %v", err)
- d.fatal(c, git.ErrInvalidRepo)
+ d.fatal(c, git.ErrNotExist)
return
}
- if _, err := d.be.Repository(repo); err != nil {
- d.fatal(c, git.ErrInvalidRepo)
+ if _, err := d.be.Repository(ctx, repo); err != nil {
+ d.fatal(c, git.ErrNotExist)
return
}
- auth := be.AccessLevel(name, "")
- if auth < backend.ReadOnlyAccess {
- d.fatal(c, git.ErrNotAuthed)
+ auth, err := be.AccessLevel(ctx, name, nil)
+ if err != nil || auth < access.ReadOnlyAccess {
+ d.fatal(c, git.ErrUnauthorized)
return
}
@@ -15,8 +15,7 @@ import (
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/backend/sqlite"
"github.com/charmbracelet/soft-serve/server/cache"
- "github.com/charmbracelet/soft-serve/server/cache/noop"
- "github.com/charmbracelet/soft-serve/server/config"
+ _ "github.com/charmbracelet/soft-serve/server/cache/noop" // noop driver
"github.com/charmbracelet/soft-serve/server/git"
"github.com/charmbracelet/soft-serve/server/test"
"github.com/go-git/go-git/v5/plumbing/format/pktline"
@@ -36,18 +35,12 @@ func TestMain(m *testing.M) {
os.Setenv("SOFT_SERVE_GIT_IDLE_TIMEOUT", "1")
os.Setenv("SOFT_SERVE_GIT_LISTEN_ADDR", fmt.Sprintf(":%d", test.RandomPort()))
ctx := context.TODO()
- ca, _ := noop.NewCache(ctx)
+ ca, _ := cache.New(ctx, "noop")
ctx = cache.WithContext(ctx, ca)
- cfg := config.DefaultConfig()
- if err := cfg.WriteConfig(); err != nil {
- log.Fatal("failed to write default config: %w", err)
- }
- ctx = config.WithContext(ctx, cfg)
fb, err := sqlite.NewSqliteBackend(ctx)
if err != nil {
log.Fatal(err)
}
- cfg = cfg.WithBackend(fb)
ctx = backend.WithContext(ctx, fb)
d, err := NewGitDaemon(ctx)
if err != nil {
@@ -96,8 +89,8 @@ func TestInvalidRepo(t *testing.T) {
if err != nil {
t.Fatalf("expected nil, got error: %v", err)
}
- if out != git.ErrInvalidRepo.Error() {
- t.Fatalf("expected %q error, got %q", git.ErrInvalidRepo, out)
+ if out != git.ErrNotExist.Error() {
+ t.Fatalf("expected %q error, got %q", git.ErrNotExist, out)
}
}
@@ -0,0 +1,18 @@
+package db
+
+import "context"
+
+var contextKey = &struct{ string }{"db"}
+
+// FromContext returns the database from the context.
+func FromContext(ctx context.Context) Database {
+ if db, ok := ctx.Value(contextKey).(Database); ok {
+ return db
+ }
+ return nil
+}
+
+// WithContext returns a new context with the database attached.
+func WithContext(ctx context.Context, db Database) context.Context {
+ return context.WithValue(ctx, contextKey, db)
+}
@@ -0,0 +1,25 @@
+package db
+
+import (
+ "context"
+ "errors"
+
+ "github.com/jmoiron/sqlx"
+)
+
+var (
+ // ErrNoDatabase is returned when no database is found in the context.
+ ErrNoDatabase = errors.New("no database found")
+)
+
+// Database is the interface that wraps basic database operations.
+type Database interface {
+ // Close closes the database connection.
+ Close() error
+ // Open opens a new database connection.
+ Open(ctx context.Context, url string) (Database, error)
+ // Migrate runs database migrations.
+ Migrate(url string) error
+ // DBx returns the underlying sqlx database.
+ DBx() *sqlx.DB
+}
@@ -0,0 +1,51 @@
+package db
+
+import (
+ "context"
+ "errors"
+ "sync"
+)
+
+var (
+ registry = map[string]Database{}
+ mtx = sync.Mutex{}
+
+ // ErrNotFound is returned when a database is not found.
+ ErrNotFound = errors.New("database not found")
+)
+
+// Register registers a database.
+func Register(name string, db Database) {
+ mtx.Lock()
+ defer mtx.Unlock()
+ registry[name] = db
+}
+
+// Get returns a database.
+func Get(name string) Database {
+ mtx.Lock()
+ defer mtx.Unlock()
+ return registry[name]
+}
+
+// List returns a list of registered databases.
+func List() []string {
+ mtx.Lock()
+ defer mtx.Unlock()
+ dbs := make([]string, 0)
+ for name := range registry {
+ dbs = append(dbs, name)
+ }
+ return dbs
+}
+
+// New returns a new database.
+func New(ctx context.Context, name string, dataSource string) (Database, error) {
+ mtx.Lock()
+ defer mtx.Unlock()
+ db := registry[name]
+ if db == nil {
+ return nil, ErrNotFound
+ }
+ return db.Open(ctx, dataSource)
+}
@@ -0,0 +1,63 @@
+package sqlite
+
+import (
+ "context"
+ "database/sql"
+ "errors"
+ "fmt"
+
+ "github.com/jmoiron/sqlx"
+ "modernc.org/sqlite"
+ sqlite3 "modernc.org/sqlite/lib"
+)
+
+// WrapDbErr wraps database errors.
+func WrapDbErr(err error) error {
+ if err != nil {
+ if errors.Is(err, sql.ErrNoRows) {
+ return ErrNoRecord
+ }
+ if liteErr, ok := err.(*sqlite.Error); ok {
+ code := liteErr.Code()
+ if code == sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY ||
+ code == sqlite3.SQLITE_CONSTRAINT_UNIQUE {
+ return ErrDuplicateKey
+ }
+ }
+ }
+ return err
+}
+
+// WrapTx wraps database transactions.
+func WrapTx(db *sqlx.DB, ctx context.Context, fn func(tx *sqlx.Tx) error) error {
+ tx, err := db.BeginTxx(ctx, nil)
+ if err != nil {
+ return fmt.Errorf("failed to begin transaction: %w", err)
+ }
+
+ if err := fn(tx); err != nil {
+ return Rollback(tx, err)
+ }
+
+ if err := tx.Commit(); err != nil {
+ if errors.Is(err, sql.ErrTxDone) {
+ // this is ok because whoever did finish the tx should have also written the error already.
+ return nil
+ }
+ return fmt.Errorf("failed to commit transaction: %w", err)
+ }
+
+ return nil
+}
+
+// Rollback rolls back database transactions.
+func Rollback(tx *sqlx.Tx, err error) error {
+ if rerr := tx.Rollback(); rerr != nil {
+ if errors.Is(rerr, sql.ErrTxDone) {
+ return err
+ }
+ return fmt.Errorf("failed to rollback: %s: %w", err.Error(), rerr)
+ }
+
+ return err
+}
@@ -0,0 +1,33 @@
+package sqlite
+
+import (
+ "embed"
+ "errors"
+
+ "github.com/charmbracelet/log"
+ "github.com/golang-migrate/migrate/v4"
+ _ "github.com/golang-migrate/migrate/v4/database/sqlite" // db driver
+ _ "github.com/golang-migrate/migrate/v4/source/file" // file driver
+ "github.com/golang-migrate/migrate/v4/source/iofs"
+ _ "modernc.org/sqlite" // sqlite driver
+)
+
+//go:embed migrations/*.sql
+var migrations embed.FS
+
+// Migrate runs database migrations.
+func (s *Sqlite) Migrate(url string) error {
+ d, err := iofs.New(migrations, ".")
+ if err != nil {
+ return err
+ }
+ m, err := migrate.NewWithSourceInstance("iofs", d, url)
+ if err != nil {
+ return err
+ }
+ log.Info("Running migrations...")
+ if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
+ return err
+ }
+ return nil
+}
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS settings;
+
+DROP TABLE IF EXISTS user;
+
+DROP TABLE IF EXISTS public_key;
+
+DROP TABLE IF EXISTS repo;
+
+DROP TABLE IF EXISTS collab;
+
+
@@ -0,0 +1,57 @@
+CREATE TABLE IF NOT EXISTS settings (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ key TEXT NOT NULL UNIQUE,
+ value TEXT NOT NULL,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS user (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ username TEXT UNIQUE,
+ admin BOOLEAN NOT NULL,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS public_key (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ user_id INTEGER NOT NULL,
+ public_key TEXT NOT NULL UNIQUE,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME NOT NULL,
+ UNIQUE (user_id, public_key),
+ CONSTRAINT user_id_fk
+ FOREIGN KEY(user_id) REFERENCES user(id)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS repo (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL UNIQUE,
+ project_name TEXT NOT NULL,
+ description TEXT NOT NULL,
+ private BOOLEAN NOT NULL,
+ mirror BOOLEAN NOT NULL,
+ hidden BOOLEAN NOT NULL,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS collab (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ user_id INTEGER NOT NULL,
+ repo_id INTEGER NOT NULL,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME NOT NULL,
+ UNIQUE (user_id, repo_id),
+ CONSTRAINT user_id_fk
+ FOREIGN KEY(user_id) REFERENCES user(id)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE,
+ CONSTRAINT repo_id_fk
+ FOREIGN KEY(repo_id) REFERENCES repo(id)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE
+);
@@ -0,0 +1,76 @@
+package sqlite
+
+import (
+ "errors"
+
+ "github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/db"
+ "github.com/jmoiron/sqlx"
+ "golang.org/x/net/context"
+)
+
+var (
+ // Options database options for the sqlite database.
+ Options = map[string][]string{
+ "_pragma": {
+ "busy_timeout(5000)",
+ "foreign_keys(1)",
+ },
+ }
+
+ // ErrDuplicateKey is returned when a unique constraint is violated.
+ ErrDuplicateKey = errors.New("record already exists")
+
+ // ErrNoRecord is returned when a record is not found.
+ ErrNoRecord = errors.New("record not found")
+)
+
+func init() {
+ db.Register("sqlite", &Sqlite{})
+}
+
+// Sqlite is the interface that wraps basic sqlite operations.
+type Sqlite struct {
+ ctx context.Context
+ db *sqlx.DB
+ logger *log.Logger
+}
+
+var _ db.Database = (*Sqlite)(nil)
+
+// DBx returns the underlying sqlx database.
+func (s *Sqlite) DBx() *sqlx.DB {
+ return s.db
+}
+
+// Open opens a new sqlite database connection.
+func (s *Sqlite) Open(ctx context.Context, path string) (db.Database, error) {
+ logger := log.FromContext(ctx).WithPrefix("sqlite")
+ dataSource := path
+ if len(Options) > 0 {
+ dataSource += "?"
+ for k, v := range Options {
+ for i, o := range v {
+ dataSource += k + "=" + o
+ if i < len(v)-1 {
+ dataSource += "&"
+ }
+ }
+ }
+ }
+ db, err := sqlx.ConnectContext(ctx, "sqlite", dataSource)
+ if err != nil {
+ return nil, err
+ }
+
+ return &Sqlite{
+ ctx: ctx,
+ db: db,
+ logger: logger,
+ }, nil
+}
+
+// Close closes the sqlite database connection.
+func (s *Sqlite) Close() error {
+ return s.db.Close()
+}
@@ -15,14 +15,14 @@ import (
var (
- // ErrNotAuthed represents unauthorized access.
- ErrNotAuthed = errors.New("you are not authorized to do this")
+ // ErrUnauthorized represents unauthorized access.
+ ErrUnauthorized = errors.New("you are not authorized to do this")
// ErrSystemMalfunction represents a general system error returned to clients.
ErrSystemMalfunction = errors.New("something went wrong")
- // ErrInvalidRepo represents an attempt to access a non-existent repo.
- ErrInvalidRepo = errors.New("invalid repo")
+ // ErrNotExist represents an attempt to access a non-existent repo.
+ ErrNotExist = errors.New("repo does not exist")
// ErrInvalidRequest represents an invalid request.
ErrInvalidRequest = errors.New("invalid request")
@@ -35,15 +35,22 @@ var (
)
// WritePktline encodes and writes a pktline to the given writer.
-func WritePktline(w io.Writer, v ...interface{}) {
+func WritePktline(w io.Writer, v ...interface{}) error {
msg := fmt.Sprintln(v...)
pkt := pktline.NewEncoder(w)
if err := pkt.EncodeString(msg); err != nil {
- log.Debugf("git: error writing pkt-line message: %s", err)
+ return fmt.Errorf("git: error writing pkt-line message: %w", err)
}
if err := pkt.Flush(); err != nil {
- log.Debugf("git: error flushing pkt-line message: %s", err)
+ return fmt.Errorf("git: error flushing pkt-line message: %w", err)
}
+
+ return nil
+}
+
+// WritePktlineErr writes an error pktline to the given writer.
+func WritePktlineErr(w io.Writer, err error) error {
+ return WritePktline(w, "ERR ", err.Error())
}
// EnsureWithin ensures the given repo is within the repos directory.
@@ -63,7 +70,7 @@ func EnsureWithin(reposDir string, repo string) error {
// ensure the repo is within the repos directory
if !strings.HasPrefix(absRepo, absRepos) {
log.Debugf("repo path is outside of repos directory: %s", absRepo)
- return ErrInvalidRepo
+ return ErrNotExist
}
return nil
@@ -50,7 +50,13 @@ type ServiceHandler func(ctx context.Context, cmd ServiceCommand) error
// gitServiceHandler is the default service handler using the git binary.
func gitServiceHandler(ctx context.Context, svc Service, scmd ServiceCommand) error {
- cmd := exec.CommandContext(ctx, "git", "-c", "uploadpack.allowFilter=true", svc.Name()) // nolint: gosec
+ cmd := exec.CommandContext(ctx, "git") // nolint: gosec
+ // Enable filter and sparse clone/checkout support.
+ cmd.Args = append(cmd.Args, []string{
+ "-c",
+ "uploadpack.allowFilter=true",
+ svc.Name(),
+ }...)
cmd.Dir = scmd.Dir
if len(scmd.Args) > 0 {
cmd.Args = append(cmd.Args, scmd.Args...)
@@ -105,33 +111,25 @@ func gitServiceHandler(ctx context.Context, svc Service, scmd ServiceCommand) er
// stdin
if scmd.Stdin != nil {
errg.Go(func() error {
- if scmd.StdinHandler != nil {
- return scmd.StdinHandler(scmd.Stdin, stdin)
- } else {
- return defaultStdinHandler(scmd.Stdin, stdin)
- }
+ defer stdin.Close() // nolint: errcheck
+ _, err := io.Copy(stdin, scmd.Stdin)
+ return err
})
}
// stdout
if scmd.Stdout != nil {
errg.Go(func() error {
- if scmd.StdoutHandler != nil {
- return scmd.StdoutHandler(scmd.Stdout, stdout)
- } else {
- return defaultStdoutHandler(scmd.Stdout, stdout)
- }
+ _, err := io.Copy(scmd.Stdout, stdout)
+ return err
})
}
// stderr
if scmd.Stderr != nil {
errg.Go(func() error {
- if scmd.StderrHandler != nil {
- return scmd.StderrHandler(scmd.Stderr, stderr)
- } else {
- return defaultStderrHandler(scmd.Stderr, stderr)
- }
+ _, erro := io.Copy(scmd.Stderr, stderr)
+ return erro
})
}
@@ -148,26 +146,7 @@ type ServiceCommand struct {
Args []string
// Modifier functions
- CmdFunc func(*exec.Cmd)
- StdinHandler func(io.Reader, io.WriteCloser) error
- StdoutHandler func(io.Writer, io.ReadCloser) error
- StderrHandler func(io.Writer, io.ReadCloser) error
-}
-
-func defaultStdinHandler(in io.Reader, stdin io.WriteCloser) error {
- defer stdin.Close() // nolint: errcheck
- _, err := io.Copy(stdin, in)
- return err
-}
-
-func defaultStdoutHandler(out io.Writer, stdout io.ReadCloser) error {
- _, err := io.Copy(out, stdout)
- return err
-}
-
-func defaultStderrHandler(err io.Writer, stderr io.ReadCloser) error {
- _, erro := io.Copy(err, stderr)
- return erro
+ CmdFunc func(*exec.Cmd)
}
// UploadPack runs the git upload-pack protocol against the provided repo.
@@ -7,6 +7,7 @@ import (
"github.com/charmbracelet/soft-serve/git"
"github.com/charmbracelet/soft-serve/internal/sync"
+ "github.com/charmbracelet/soft-serve/server/backend"
)
var jobSpecs = map[string]string{
@@ -15,11 +16,10 @@ var jobSpecs = map[string]string{
// mirrorJob runs the (pull) mirror job task.
func (s *Server) mirrorJob() func() {
- cfg := s.Config
- b := cfg.Backend
+ b := backend.FromContext(s.ctx)
logger := s.logger
return func() {
- repos, err := b.Repositories()
+ repos, err := b.Repositories(s.ctx, 1, 10)
if err != nil {
logger.Error("error getting repositories", "err", err)
return
@@ -44,8 +44,8 @@ func (s *Server) mirrorJob() func() {
cmd := git.NewCommand("remote", "update", "--prune")
cmd.AddEnvs(
fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o UserKnownHostsFile="%s" -o StrictHostKeyChecking=no -i "%s"`,
- filepath.Join(cfg.DataPath, "ssh", "known_hosts"),
- cfg.SSH.ClientKeyPath,
+ filepath.Join(s.cfg.DataPath, "ssh", "known_hosts"),
+ s.cfg.SSH.ClientKeyPath,
),
)
if _, err := cmd.RunInDir(r.Path); err != nil {
@@ -9,9 +9,6 @@ import (
"github.com/charmbracelet/log"
"github.com/charmbracelet/soft-serve/server/backend"
- "github.com/charmbracelet/soft-serve/server/backend/sqlite"
- "github.com/charmbracelet/soft-serve/server/cache"
- "github.com/charmbracelet/soft-serve/server/cache/lru"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/cron"
"github.com/charmbracelet/soft-serve/server/daemon"
@@ -29,11 +26,11 @@ type Server struct {
HTTPServer *web.HTTPServer
StatsServer *stats.StatsServer
Cron *cron.CronScheduler
- Config *config.Config
- Backend backend.Backend
+ Backend *backend.Backend
logger *log.Logger
ctx context.Context
+ cfg *config.Config
}
// NewServer returns a new *ssh.Server configured to serve Soft Serve. The SSH
@@ -42,35 +39,14 @@ type Server struct {
// restricted to that key. If authKey is not provided, the server will be
// publicly writable until configured otherwise by cloning the `config` repo.
func NewServer(ctx context.Context) (*Server, error) {
- cfg := config.FromContext(ctx)
-
var err error
- if c := cache.FromContext(ctx); c == nil {
- lruCache, err := lru.NewCache(ctx, lru.WithSize(1000))
- if err != nil {
- return nil, fmt.Errorf("create default cache: %w", err)
- }
-
- ctx = cache.WithContext(ctx, lruCache)
- }
-
- if cfg.Backend == nil {
- sb, err := sqlite.NewSqliteBackend(ctx)
- if err != nil {
- return nil, fmt.Errorf("create backend: %w", err)
- }
-
- cfg = cfg.WithBackend(sb)
- ctx = backend.WithContext(ctx, sb)
- }
-
srv := &Server{
Cron: cron.NewCronScheduler(ctx),
- Config: cfg,
- Backend: cfg.Backend,
+ Backend: backend.FromContext(ctx),
logger: log.FromContext(ctx).WithPrefix("server"),
ctx: ctx,
+ cfg: config.FromContext(ctx),
}
// Add cron jobs.
@@ -117,28 +93,28 @@ func start(ctx context.Context, fn func() error) error {
func (s *Server) Start() error {
errg, ctx := errgroup.WithContext(s.ctx)
errg.Go(func() error {
- s.logger.Print("Starting Git daemon", "addr", s.Config.Git.ListenAddr)
+ s.logger.Print("Starting Git daemon", "addr", s.cfg.GitDaemon.ListenAddr)
if err := start(ctx, s.GitDaemon.Start); !errors.Is(err, daemon.ErrServerClosed) {
return err
}
return nil
})
errg.Go(func() error {
- s.logger.Print("Starting HTTP server", "addr", s.Config.HTTP.ListenAddr)
+ s.logger.Print("Starting HTTP server", "addr", s.cfg.HTTP.ListenAddr)
if err := start(ctx, s.HTTPServer.ListenAndServe); !errors.Is(err, http.ErrServerClosed) {
return err
}
return nil
})
errg.Go(func() error {
- s.logger.Print("Starting SSH server", "addr", s.Config.SSH.ListenAddr)
+ s.logger.Print("Starting SSH server", "addr", s.cfg.SSH.ListenAddr)
if err := start(ctx, s.SSHServer.ListenAndServe); !errors.Is(err, ssh.ErrServerClosed) {
return err
}
return nil
})
errg.Go(func() error {
- s.logger.Print("Starting Stats server", "addr", s.Config.Stats.ListenAddr)
+ s.logger.Print("Starting Stats server", "addr", s.cfg.Stats.ListenAddr)
if err := start(ctx, s.StatsServer.ListenAndServe); !errors.Is(err, http.ErrServerClosed) {
return err
}
@@ -8,14 +8,13 @@ import (
"testing"
"github.com/charmbracelet/keygen"
- "github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/test"
"github.com/charmbracelet/ssh"
"github.com/matryer/is"
gossh "golang.org/x/crypto/ssh"
)
-func setupServer(tb testing.TB) (*Server, *config.Config, string) {
+func setupServer(tb testing.TB) (*Server, string) {
tb.Helper()
tb.Log("creating keypair")
pub, pkPath := createKeyPair(tb)
@@ -26,11 +25,6 @@ func setupServer(tb testing.TB) (*Server, *config.Config, string) {
tb.Setenv("SOFT_SERVE_SSH_LISTEN_ADDR", sshPort)
tb.Setenv("SOFT_SERVE_GIT_LISTEN_ADDR", fmt.Sprintf(":%d", test.RandomPort()))
ctx := context.TODO()
- cfg := config.DefaultConfig()
- if err := cfg.WriteConfig(); err != nil {
- tb.Fatal("failed to write default config: %w", err)
- }
- ctx = config.WithContext(ctx, cfg)
tb.Log("configuring server")
s, err := NewServer(ctx)
if err != nil {
@@ -43,7 +37,7 @@ func setupServer(tb testing.TB) (*Server, *config.Config, string) {
tb.Cleanup(func() {
s.Close()
})
- return s, cfg, pkPath
+ return s, pkPath
}
func createKeyPair(tb testing.TB) (ssh.PublicKey, string) {
@@ -0,0 +1,18 @@
+package settings
+
+import "context"
+
+var contextKey = &struct{ string }{"settings"}
+
+// FromContext returns the settings from the context.
+func FromContext(ctx context.Context) Settings {
+ if settings, ok := ctx.Value(contextKey).(Settings); ok {
+ return settings
+ }
+ return nil
+}
+
+// WithContext returns a new context with the settings attached.
+func WithContext(ctx context.Context, settings Settings) context.Context {
+ return context.WithValue(ctx, contextKey, settings)
+}
@@ -0,0 +1,50 @@
+package settings
+
+import (
+ "context"
+ "fmt"
+ "sync"
+)
+
+var (
+ registry = map[string]Constructor{}
+ mtx sync.RWMutex
+
+ // ErrNotFound is returned when a setting is not found.
+ ErrNotFound = fmt.Errorf("setting not found")
+)
+
+// Constructor is a function that returns a new setting.
+type Constructor func(ctx context.Context) (Settings, error)
+
+// Register registers a setting.
+func Register(name string, fn Constructor) {
+ mtx.Lock()
+ defer mtx.Unlock()
+
+ registry[name] = fn
+}
+
+// New returns a new setting.
+func New(ctx context.Context, name string) (Settings, error) {
+ mtx.RLock()
+ fn, ok := registry[name]
+ mtx.RUnlock()
+
+ if !ok {
+ return nil, ErrNotFound
+ }
+
+ return fn(ctx)
+}
+
+// List returns a list of registered settings.
+func List() []string {
+ mtx.Lock()
+ defer mtx.Unlock()
+ settings := make([]string, 0)
+ for name := range registry {
+ settings = append(settings, name)
+ }
+ return settings
+}
@@ -0,0 +1,19 @@
+package settings
+
+import (
+ "context"
+
+ "github.com/charmbracelet/soft-serve/server/access"
+)
+
+// Settings is an interface that manage server settings.
+type Settings interface {
+ // AnonAccess returns the access level for anonymous users.
+ AnonAccess(ctx context.Context) access.AccessLevel
+ // SetAnonAccess sets the access level for anonymous users.
+ SetAnonAccess(ctx context.Context, level access.AccessLevel) error
+ // AllowKeyless returns true if keyless access is allowed.
+ AllowKeyless(ctx context.Context) bool
+ // SetAllowKeyless sets whether or not keyless access is allowed.
+ SetAllowKeyless(ctx context.Context, allow bool) error
+}
@@ -0,0 +1,85 @@
+package sqlite
+
+import (
+ "context"
+
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/db"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/charmbracelet/soft-serve/server/settings"
+ "github.com/jmoiron/sqlx"
+)
+
+func init() {
+ settings.Register("sqlite", newSettings)
+}
+
+// SqliteSettings is a SQLite settings store.
+type SqliteSettings struct {
+ db db.Database
+ ctx context.Context
+}
+
+func newSettings(ctx context.Context) (settings.Settings, error) {
+ sdb := db.FromContext(ctx)
+ if sdb == nil {
+ return nil, db.ErrNoDatabase
+ }
+
+ return &SqliteSettings{
+ db: sdb,
+ ctx: ctx,
+ }, nil
+}
+
+// AllowKeyless returns whether or not keyless access is allowed.
+//
+// It implements backend.Backend.
+func (d *SqliteSettings) AllowKeyless(ctx context.Context) bool {
+ var allow bool
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.Get(&allow, "SELECT value FROM settings WHERE key = ?;", "allow_keyless")
+ }); err != nil {
+ return false
+ }
+
+ return allow
+}
+
+// AnonAccess returns the level of anonymous access.
+//
+// It implements backend.Backend.
+func (d *SqliteSettings) AnonAccess(ctx context.Context) access.AccessLevel {
+ var level string
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.Get(&level, "SELECT value FROM settings WHERE key = ?;", "anon_access")
+ }); err != nil {
+ return access.NoAccess
+ }
+
+ return access.ParseAccessLevel(level)
+}
+
+// SetAllowKeyless sets whether or not keyless access is allowed.
+//
+// It implements backend.Backend.
+func (d *SqliteSettings) SetAllowKeyless(ctx context.Context, allow bool) error {
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("UPDATE settings SET value = ?, updated_at = CURRENT_TIMESTAMP WHERE key = ?;", allow, "allow_keyless")
+ return err
+ }),
+ )
+}
+
+// SetAnonAccess sets the level of anonymous access.
+//
+// It implements backend.Backend.
+func (d *SqliteSettings) SetAnonAccess(ctx context.Context, level access.AccessLevel) error {
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("UPDATE settings SET value = ?, updated_at = CURRENT_TIMESTAMP WHERE key = ?;", level.String(), "anon_access")
+ return err
+ }),
+ )
+}
@@ -1,14 +1,18 @@
package ssh
import (
+ "context"
"strings"
tea "github.com/charmbracelet/bubbletea"
+ "github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/log"
- . "github.com/charmbracelet/soft-serve/internal/log"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/errors"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
"github.com/charmbracelet/soft-serve/server/ui"
"github.com/charmbracelet/soft-serve/server/ui/common"
"github.com/charmbracelet/ssh"
@@ -29,31 +33,39 @@ var (
)
// SessionHandler is the soft-serve bubbletea ssh session handler.
-func SessionHandler(cfg *config.Config) bm.ProgramHandler {
+func SessionHandler(ctx context.Context) bm.ProgramHandler {
+ be := backend.FromContext(ctx)
+ cfg := config.FromContext(ctx)
+ logger := log.FromContext(ctx).WithPrefix("ssh-pty")
return func(s ssh.Session) *tea.Program {
- ak := backend.MarshalAuthorizedKey(s.PublicKey())
+ ctx := backend.WithContext(s.Context(), be)
+ ctx = config.WithContext(ctx, cfg)
+ ctx = log.WithContext(ctx, logger)
+
+ ak := sshutils.MarshalAuthorizedKey(s.PublicKey())
pty, _, active := s.Pty()
if !active {
return nil
}
cmd := s.Command()
- initialRepo := ""
+ var initialRepo string
if len(cmd) == 1 {
+ user, _ := be.Authenticate(ctx, auth.NewPublicKey(s.PublicKey()))
initialRepo = cmd[0]
- auth := cfg.Backend.AccessLevelByPublicKey(initialRepo, s.PublicKey())
- if auth < backend.ReadOnlyAccess {
+ auth, _ := be.AccessLevel(ctx, initialRepo, user)
+ if auth < access.ReadOnlyAccess {
wish.Fatalln(s, errors.ErrUnauthorized)
return nil
}
}
envs := &sessionEnv{s}
- output := termenv.NewOutput(s, termenv.WithColorCache(true), termenv.WithEnvironment(envs))
- logger := NewDefaultLogger()
- ctx := log.WithContext(s.Context(), logger)
+ output := lipgloss.NewRenderer(s, termenv.WithColorCache(true), termenv.WithEnvironment(envs))
+ // FIXME: detect color profile and dark background from ssh.Session
+ output.SetColorProfile(termenv.ANSI256)
+ output.SetHasDarkBackground(true)
c := common.NewCommon(ctx, output, pty.Window.Width, pty.Window.Height)
- c.SetValue(common.ConfigKey, cfg)
m := ui.New(c, initialRepo)
p := tea.NewProgram(m,
tea.WithInput(s),
@@ -9,10 +9,10 @@ import (
"testing"
"time"
+ "github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/backend/sqlite"
"github.com/charmbracelet/soft-serve/server/cache"
- "github.com/charmbracelet/soft-serve/server/cache/noop"
- "github.com/charmbracelet/soft-serve/server/config"
+ _ "github.com/charmbracelet/soft-serve/server/cache/noop" // noop driver
"github.com/charmbracelet/soft-serve/server/test"
"github.com/charmbracelet/ssh"
bm "github.com/charmbracelet/wish/bubbletea"
@@ -60,17 +60,15 @@ func setup(tb testing.TB) (*gossh.Session, func() error) {
is.NoErr(os.RemoveAll(dp))
})
ctx := context.TODO()
- ca, _ := noop.NewCache(ctx)
+ ca, _ := cache.New(ctx, "noop")
ctx = cache.WithContext(ctx, ca)
- cfg := config.DefaultConfig()
- ctx = config.WithContext(ctx, cfg)
fb, err := sqlite.NewSqliteBackend(ctx)
if err != nil {
log.Fatal(err)
}
- cfg = cfg.WithBackend(fb)
+ ctx = backend.WithContext(ctx, fb)
return testsession.New(tb, &ssh.Server{
- Handler: bm.MiddlewareWithProgramHandler(SessionHandler(cfg), termenv.ANSI256)(func(s ssh.Session) {
+ Handler: bm.MiddlewareWithProgramHandler(SessionHandler(fb), termenv.ANSI256)(func(s ssh.Session) {
_, _, active := s.Pty()
if !active {
os.Exit(1)
@@ -4,26 +4,35 @@ import (
"context"
"errors"
"fmt"
+ "io"
"net"
"os"
+ "os/exec"
"path/filepath"
"strconv"
"strings"
+ "syscall"
"time"
+ "unsafe"
"github.com/charmbracelet/keygen"
"github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/access"
+ "github.com/charmbracelet/soft-serve/server/auth"
"github.com/charmbracelet/soft-serve/server/backend"
- cm "github.com/charmbracelet/soft-serve/server/cmd"
+ "github.com/creack/pty"
+
+ // cm "github.com/charmbracelet/soft-serve/server/cmd"
+
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/git"
+ "github.com/charmbracelet/soft-serve/server/sshutils"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/charmbracelet/soft-serve/server/utils"
"github.com/charmbracelet/ssh"
"github.com/charmbracelet/wish"
- bm "github.com/charmbracelet/wish/bubbletea"
lm "github.com/charmbracelet/wish/logging"
rm "github.com/charmbracelet/wish/recover"
- "github.com/muesli/termenv"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
gossh "golang.org/x/crypto/ssh"
@@ -77,11 +86,16 @@ var (
type SSHServer struct {
srv *ssh.Server
cfg *config.Config
- be backend.Backend
+ be *backend.Backend
ctx context.Context
logger *log.Logger
}
+func setWinsize(f *os.File, w, h int) {
+ syscall.Syscall(syscall.SYS_IOCTL, f.Fd(), uintptr(syscall.TIOCSWINSZ),
+ uintptr(unsafe.Pointer(&struct{ h, w, x, y uint16 }{uint16(h), uint16(w), 0, 0})))
+}
+
// NewSSHServer returns a new SSHServer.
func NewSSHServer(ctx context.Context) (*SSHServer, error) {
cfg := config.FromContext(ctx)
@@ -99,11 +113,72 @@ func NewSSHServer(ctx context.Context) (*SSHServer, error) {
rm.MiddlewareWithLogger(
logger,
// BubbleTea middleware.
- bm.MiddlewareWithProgramHandler(SessionHandler(cfg), termenv.ANSI256),
+ // bm.MiddlewareWithProgramHandler(SessionHandler(ctx), termenv.ANSI256),
// CLI middleware.
- cm.Middleware(cfg, logger),
+ // cm.Middleware(ctx, logger),
// Git middleware.
- s.Middleware(cfg),
+ // s.Middleware(cfg),
+ func(h ssh.Handler) ssh.Handler {
+ return func(s ssh.Session) {
+ ptyReq, winCh, isPty := s.Pty()
+ cmds := s.Command()
+
+ exe, err := os.Executable()
+ if err != nil {
+ s.Exit(1)
+ return
+ }
+
+ cmd := exec.Command(exe, cmds...)
+ if isPty {
+ cmd.Env = append(cmd.Env, fmt.Sprintf("TERM=%s", ptyReq.Term))
+ }
+ cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_ORIGINAL_COMMAND=%s", strings.Join(cmds, " ")))
+ cmd.Env = append(cmd.Env, cfg.Environ()...)
+
+ ptyf, tty, err := pty.Open()
+ if err != nil {
+ os.Exit(1)
+ return
+ }
+ defer tty.Close()
+
+ cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_TTY=%s", tty.Name()))
+
+ if cmd.Stdout == nil {
+ cmd.Stdout = tty
+ }
+ if cmd.Stderr == nil {
+ cmd.Stderr = tty
+ }
+ if cmd.Stdin == nil {
+ cmd.Stdin = tty
+ }
+
+ cmd.SysProcAttr = &syscall.SysProcAttr{
+ Setsid: true,
+ Setctty: true,
+ }
+
+ if err := cmd.Start(); err != nil {
+ _ = ptyf.Close()
+ os.Exit(1)
+ return
+ }
+ go func() {
+ for win := range winCh {
+ setWinsize(ptyf, win.Width, win.Height)
+ }
+ }()
+ go func() {
+ io.Copy(ptyf, s) // stdin
+ }()
+ io.Copy(s, ptyf) // stdout
+
+ cmd.Wait()
+ h(s)
+ }
+ },
// Logging middleware.
lm.MiddlewareWithLogger(logger.
StandardLog(log.StandardLogOptions{ForceLevel: log.DebugLevel})),
@@ -162,25 +237,34 @@ func (s *SSHServer) Shutdown(ctx context.Context) error {
// PublicKeyAuthHandler handles public key authentication.
func (s *SSHServer) PublicKeyHandler(ctx ssh.Context, pk ssh.PublicKey) (allowed bool) {
+ ctx.SetValue(config.ContextKeyConfig, s.cfg)
+ ctx.SetValue(ssh.ContextKeyPublicKey, pk)
+
if pk == nil {
return false
}
- ak := backend.MarshalAuthorizedKey(pk)
+ var ac access.AccessLevel
+ var user auth.User
+ ak := sshutils.MarshalAuthorizedKey(pk)
+
defer func(allowed *bool) {
publicKeyCounter.WithLabelValues(ak, ctx.User(), strconv.FormatBool(*allowed)).Inc()
+ s.logger.Debugf("access level for %q: %s", ak, ac)
+ ctx.SetValue(auth.ContextKeyUser, user)
}(&allowed)
- ac := s.cfg.Backend.AccessLevelByPublicKey("", pk)
- s.logger.Debugf("access level for %q: %s", ak, ac)
- allowed = ac >= backend.ReadWriteAccess
+ user, _ = s.be.Authenticate(ctx, auth.NewPublicKey(pk))
+ ac, _ = s.be.AccessLevel(ctx, "", user)
+ allowed = ac >= access.ReadWriteAccess
return
}
// KeyboardInteractiveHandler handles keyboard interactive authentication.
// This is used after all public key authentication has failed.
func (s *SSHServer) KeyboardInteractiveHandler(ctx ssh.Context, _ gossh.KeyboardInteractiveChallenge) bool {
- ac := s.cfg.Backend.AllowKeyless()
+ ctx.SetValue(config.ContextKeyConfig, s.cfg)
+ ac := s.be.AllowKeyless(ctx)
keyboardInteractiveCounter.WithLabelValues(ctx.User(), strconv.FormatBool(ac)).Inc()
return ac
}
@@ -196,14 +280,15 @@ func (ss *SSHServer) Middleware(cfg *config.Config) wish.Middleware {
func() {
cmdLine := s.Command()
ctx := s.Context()
- be := ss.be.WithContext(ctx)
if len(cmdLine) >= 2 && strings.HasPrefix(cmdLine[0], "git") {
// repo should be in the form of "repo.git"
name := utils.SanitizeRepo(cmdLine[1])
pk := s.PublicKey()
- ak := backend.MarshalAuthorizedKey(pk)
- access := cfg.Backend.AccessLevelByPublicKey(name, pk)
+ ak := sshutils.MarshalAuthorizedKey(pk)
+ user, _ := ss.be.Authenticate(ctx, auth.NewPublicKey(pk))
+ ac, _ := ss.be.AccessLevel(ctx, name, user)
+
// git bare repositories should end in ".git"
// https://git-scm.com/docs/gitrepository-layout
repo := name + ".git"
@@ -235,16 +320,16 @@ func (ss *SSHServer) Middleware(cfg *config.Config) wish.Middleware {
Dir: repoDir,
}
- ss.logger.Debug("git middleware", "cmd", service, "access", access.String())
+ ss.logger.Debug("git middleware", "cmd", service, "access", ac.String())
switch service {
case git.ReceivePackService:
- if access < backend.ReadWriteAccess {
- sshFatal(s, git.ErrNotAuthed)
+ if ac < access.ReadWriteAccess {
+ sshFatal(s, git.ErrUnauthorized)
return
}
- if _, err := be.Repository(name); err != nil {
- if _, err := be.CreateRepository(name, backend.RepositoryOptions{Private: false}); err != nil {
+ if _, err := ss.be.Repository(ctx, name); err != nil {
+ if _, err := ss.be.CreateRepository(ctx, name, store.RepositoryOptions{Private: false}); err != nil {
log.Errorf("failed to create repo: %s", err)
sshFatal(s, err)
return
@@ -264,8 +349,8 @@ func (ss *SSHServer) Middleware(cfg *config.Config) wish.Middleware {
receivePackCounter.WithLabelValues(ak, s.User(), name).Inc()
return
case git.UploadPackService, git.UploadArchiveService:
- if access < backend.ReadOnlyAccess {
- sshFatal(s, git.ErrNotAuthed)
+ if ac < access.ReadOnlyAccess {
+ sshFatal(s, git.ErrUnauthorized)
return
}
@@ -277,8 +362,8 @@ func (ss *SSHServer) Middleware(cfg *config.Config) wish.Middleware {
}
err := handler(ctx, cmd)
- if errors.Is(err, git.ErrInvalidRepo) {
- sshFatal(s, git.ErrInvalidRepo)
+ if errors.Is(err, git.ErrNotExist) {
+ sshFatal(s, git.ErrNotExist)
} else if err != nil {
sshFatal(s, git.ErrSystemMalfunction)
}
@@ -0,0 +1,37 @@
+package sshutils
+
+import (
+ "bytes"
+
+ "github.com/charmbracelet/ssh"
+ gossh "golang.org/x/crypto/ssh"
+)
+
+// ParseAuthorizedKey parses an authorized key string into a public key.
+func ParseAuthorizedKey(ak string) (gossh.PublicKey, string, error) {
+ pk, c, _, _, err := gossh.ParseAuthorizedKey([]byte(ak))
+ return pk, c, err
+}
+
+// MarshalAuthorizedKey marshals a public key into an authorized key string.
+//
+// This is the inverse of ParseAuthorizedKey.
+// This function is a copy of ssh.MarshalAuthorizedKey, but without the trailing newline.
+// It returns an empty string if pk is nil.
+func MarshalAuthorizedKey(pk gossh.PublicKey) string {
+ if pk == nil {
+ return ""
+ }
+ return string(bytes.TrimSuffix(gossh.MarshalAuthorizedKey(pk), []byte("\n")))
+}
+
+// KeysEqual returns whether the two public keys are equal.
+func KeysEqual(a, b gossh.PublicKey) bool {
+ return ssh.KeysEqual(a, b)
+}
+
+// FingerprintSHA256 returns the fingerprint of a public key.
+// This returns the same value as ssh.FingerprintSHA256.
+func FingerprintSHA256(pk gossh.PublicKey) string {
+ return gossh.FingerprintSHA256(pk)
+}
@@ -0,0 +1,18 @@
+package store
+
+import "context"
+
+var contextKey = &struct{ string }{"store"}
+
+// FromContext returns the store from the context.
+func FromContext(ctx context.Context) Store {
+ if store, ok := ctx.Value(contextKey).(Store); ok {
+ return store
+ }
+ return nil
+}
+
+// WithContext returns a new context with the store attached.
+func WithContext(ctx context.Context, store Store) context.Context {
+ return context.WithValue(ctx, contextKey, store)
+}
@@ -0,0 +1,52 @@
+package store
+
+import (
+ "context"
+ "errors"
+ "sync"
+
+ "github.com/go-git/go-billy/v5"
+)
+
+// Constructor is a function that returns a new store.
+type Constructor func(ctx context.Context, fs billy.Filesystem) (Store, error)
+
+var (
+ registry = map[string]Constructor{}
+ mtx sync.RWMutex
+
+ // ErrStoreNotFound is returned when a store is not found.
+ ErrStoreNotFound = errors.New("store not found")
+)
+
+// Register registers a store.
+func Register(name string, fn Constructor) {
+ mtx.Lock()
+ defer mtx.Unlock()
+
+ registry[name] = fn
+}
+
+// New returns a new store.
+func New(ctx context.Context, fs billy.Filesystem, name string) (Store, error) {
+ mtx.RLock()
+ fn, ok := registry[name]
+ mtx.RUnlock()
+
+ if !ok {
+ return nil, ErrStoreNotFound
+ }
+
+ return fn(ctx, fs)
+}
+
+// List returns a list of registered stores.
+func List() []string {
+ mtx.Lock()
+ defer mtx.Unlock()
+ stores := make([]string, 0)
+ for name := range registry {
+ stores = append(stores, name)
+ }
+ return stores
+}
@@ -0,0 +1,28 @@
+package store
+
+import (
+ "time"
+
+ "github.com/charmbracelet/soft-serve/git"
+)
+
+// Repository is a Git repository interface.
+type Repository interface {
+ // Name returns the repository's name.
+ Name() string
+ // ProjectName returns the repository's project name.
+ ProjectName() string
+ // Description returns the repository's description.
+ Description() string
+ // IsPrivate returns whether the repository is private.
+ IsPrivate() bool
+ // IsMirror returns whether the repository is a mirror.
+ IsMirror() bool
+ // IsHidden returns whether the repository is hidden.
+ IsHidden() bool
+ // UpdatedAt returns the time the repository was last updated.
+ // If the repository has never been updated, it returns the time it was created.
+ UpdatedAt() time.Time
+ // Open returns the underlying git.Repository.
+ Open() (*git.Repository, error)
+}
@@ -0,0 +1,203 @@
+package filesqlite
+
+import (
+ "bufio"
+ "context"
+ "os"
+ "path/filepath"
+ "sync"
+ "time"
+
+ "github.com/charmbracelet/soft-serve/git"
+ "github.com/charmbracelet/soft-serve/server/backend"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/jmoiron/sqlx"
+)
+
+var _ backend.Repository = (*Repo)(nil)
+
+// Repo is a Git repository with metadata stored in a SQLite database.
+type Repo struct {
+ name string
+ path string
+ db *sqlx.DB
+
+ // cache
+ // updatedAt is cached in "last-modified" file.
+ mu sync.Mutex
+ desc *string
+ projectName *string
+ isMirror *bool
+ isPrivate *bool
+ isHidden *bool
+}
+
+// Description returns the repository's description.
+//
+// It implements backend.Repository.
+func (r *Repo) Description() string {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+ if r.desc != nil {
+ return *r.desc
+ }
+
+ var desc string
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&desc, "SELECT description FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return ""
+ }
+
+ r.desc = &desc
+ return desc
+}
+
+// IsMirror returns whether the repository is a mirror.
+//
+// It implements backend.Repository.
+func (r *Repo) IsMirror() bool {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+ if r.isMirror != nil {
+ return *r.isMirror
+ }
+
+ var mirror bool
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&mirror, "SELECT mirror FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return false
+ }
+
+ r.isMirror = &mirror
+ return mirror
+}
+
+// IsPrivate returns whether the repository is private.
+//
+// It implements backend.Repository.
+func (r *Repo) IsPrivate() bool {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+ if r.isPrivate != nil {
+ return *r.isPrivate
+ }
+
+ var private bool
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&private, "SELECT private FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return false
+ }
+
+ r.isPrivate = &private
+ return private
+}
+
+// Name returns the repository's name.
+//
+// It implements backend.Repository.
+func (r *Repo) Name() string {
+ return r.name
+}
+
+// Open opens the repository.
+//
+// It implements backend.Repository.
+func (r *Repo) Open() (*git.Repository, error) {
+ return git.Open(r.path)
+}
+
+// ProjectName returns the repository's project name.
+//
+// It implements backend.Repository.
+func (r *Repo) ProjectName() string {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+ if r.projectName != nil {
+ return *r.projectName
+ }
+
+ var name string
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&name, "SELECT project_name FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return ""
+ }
+
+ r.projectName = &name
+ return name
+}
+
+// IsHidden returns whether the repository is hidden.
+//
+// It implements backend.Repository.
+func (r *Repo) IsHidden() bool {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+ if r.isHidden != nil {
+ return *r.isHidden
+ }
+
+ var hidden bool
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&hidden, "SELECT hidden FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return false
+ }
+
+ r.isHidden = &hidden
+ return hidden
+}
+
+// UpdatedAt returns the repository's last update time.
+func (r *Repo) UpdatedAt() time.Time {
+ var updatedAt time.Time
+
+ // Try to read the last modified time from the info directory.
+ if t, err := readOneline(filepath.Join(r.path, "info", "last-modified")); err == nil {
+ if t, err := time.Parse(time.RFC3339, t); err == nil {
+ return t
+ }
+ }
+
+ rr, err := git.Open(r.path)
+ if err == nil {
+ t, err := rr.LatestCommitTime()
+ if err == nil {
+ updatedAt = t
+ }
+ }
+
+ if updatedAt.IsZero() {
+ if err := sqlite.WrapTx(r.db, context.Background(), func(tx *sqlx.Tx) error {
+ return tx.Get(&updatedAt, "SELECT updated_at FROM repo WHERE name = ?", r.name)
+ }); err != nil {
+ return time.Time{}
+ }
+ }
+
+ return updatedAt
+}
+
+func (r *Repo) writeLastModified(t time.Time) error {
+ fp := filepath.Join(r.path, "info", "last-modified")
+ if err := os.MkdirAll(filepath.Dir(fp), os.ModePerm); err != nil {
+ return err
+ }
+
+ return os.WriteFile(fp, []byte(t.Format(time.RFC3339)), os.ModePerm)
+}
+
+func readOneline(path string) (string, error) {
+ f, err := os.Open(path)
+ if err != nil {
+ return "", err
+ }
+
+ defer f.Close() // nolint: errcheck
+ s := bufio.NewScanner(f)
+ s.Scan()
+ return s.Text(), s.Err()
+}
@@ -0,0 +1,82 @@
+package filesqlite
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "github.com/charmbracelet/log"
+ "github.com/charmbracelet/soft-serve/server/cache"
+ "github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/db"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/charmbracelet/soft-serve/server/store"
+ "github.com/go-git/go-billy/v5"
+)
+
+var (
+ // ErrDbNotSqlite is returned when the database is not a SQLite database.
+ ErrDbNotSqlite = errors.New("database is not a SQLite database")
+
+ // ErrRepoNotExist is returned when a repository does not exist.
+ ErrRepoNotExist = fmt.Errorf("repository does not exist")
+
+ // ErrRepoExist is returned when a repository already exists.
+ ErrRepoExist = fmt.Errorf("repository already exists")
+)
+
+// SqliteStore is a file-based SQLite store.
+type SqliteStore struct {
+ fs billy.Filesystem
+ ctx context.Context
+ cfg *config.Config
+ db db.Database
+ cache cache.Cache
+ logger *log.Logger
+}
+
+var _ store.Store = (*SqliteStore)(nil)
+
+func init() {
+ store.Register("sqlite", newFileSqliteStore)
+}
+
+func newFileSqliteStore(ctx context.Context, fs billy.Filesystem) (store.Store, error) {
+ sdb := db.FromContext(ctx)
+ if sdb == nil {
+ return nil, db.ErrNoDatabase
+ }
+
+ if _, ok := sdb.(*sqlite.Sqlite); !ok {
+ return nil, ErrDbNotSqlite
+ }
+
+ ss := &SqliteStore{
+ fs: fs,
+ ctx: ctx,
+ db: sdb,
+ logger: log.FromContext(ctx).WithPrefix("filesqlite"),
+ cfg: config.FromContext(ctx),
+ cache: cache.FromContext(ctx),
+ }
+
+ c := cache.FromContext(ctx)
+ if c == nil {
+ return nil, cache.ErrNotFound
+ }
+
+ return ss, nil
+}
+
+func (ss *SqliteStore) Filesystem() billy.Filesystem {
+ return ss.fs
+}
+
+func (ss *SqliteStore) reposPath() string {
+ return ss.fs.Root()
+}
+
+// cacheKey returns the cache key for a repository.
+func cacheKey(name string) string {
+ return fmt.Sprintf("repo:%s", name)
+}
@@ -0,0 +1,506 @@
+package filesqlite
+
+import (
+ "context"
+ "errors"
+ "fmt"
+ "os"
+ "path/filepath"
+
+ "github.com/charmbracelet/soft-serve/git"
+ "github.com/charmbracelet/soft-serve/server/db/sqlite"
+ "github.com/charmbracelet/soft-serve/server/store"
+ "github.com/charmbracelet/soft-serve/server/utils"
+ "github.com/jmoiron/sqlx"
+)
+
+// TODO: use billy.Filesystem instead of filepath
+
+// CreateRepository creates a new repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) CreateRepository(ctx context.Context, name string, opts store.RepositoryOptions) (store.Repository, error) {
+ name = utils.SanitizeRepo(name)
+ if err := utils.ValidateRepo(name); err != nil {
+ return nil, err
+ }
+
+ repo := name + ".git"
+ rp := filepath.Join(d.reposPath(), repo)
+
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ if _, err := tx.Exec(`INSERT INTO repo (name, project_name, description, private, mirror, hidden, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP);`,
+ name, opts.ProjectName, opts.Description, opts.Private, opts.Mirror, opts.Hidden); err != nil {
+ return err
+ }
+
+ _, err := git.Init(rp, true)
+ if err != nil {
+ d.logger.Debug("failed to create repository", "err", err)
+ return err
+ }
+
+ if err := d.updateGitDaemonExportOk(name, opts.Private); err != nil {
+ return err
+ }
+
+ return d.updateDescriptionFile(name, opts.Description)
+ }); err != nil {
+ d.logger.Debug("failed to create repository in database", "err", err)
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ r := &Repo{
+ name: name,
+ path: rp,
+ db: d.db.DBx(),
+ }
+
+ // Set cache
+ d.cache.Set(ctx, cacheKey(name), r)
+
+ return r, nil
+}
+
+// ImportRepository imports a repository from remote.
+func (d *SqliteStore) ImportRepository(ctx context.Context, name string, remote string, opts store.RepositoryOptions) (store.Repository, error) {
+ cfg := d.cfg
+ name = utils.SanitizeRepo(name)
+ if err := utils.ValidateRepo(name); err != nil {
+ return nil, err
+ }
+
+ repo := name + ".git"
+ rp := filepath.Join(d.reposPath(), repo)
+
+ if _, err := os.Stat(rp); err == nil || os.IsExist(err) {
+ return nil, ErrRepoExist
+ }
+
+ copts := git.CloneOptions{
+ Bare: true,
+ Mirror: opts.Mirror,
+ Quiet: true,
+ CommandOptions: git.CommandOptions{
+ Timeout: -1,
+ Context: ctx,
+ Envs: []string{
+ fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o UserKnownHostsFile="%s" -o StrictHostKeyChecking=no -i "%s"`,
+ filepath.Join(cfg.DataPath, "ssh", "known_hosts"),
+ cfg.SSH.ClientKeyPath,
+ ),
+ },
+ },
+ // Timeout: time.Hour,
+ }
+
+ if err := git.Clone(remote, rp, copts); err != nil {
+ d.logger.Error("failed to clone repository", "err", err, "mirror", opts.Mirror, "remote", remote, "path", rp)
+ // Cleanup the mess!
+ if rerr := os.RemoveAll(rp); rerr != nil {
+ err = errors.Join(err, rerr)
+ }
+ return nil, err
+ }
+
+ return d.CreateRepository(ctx, name, opts)
+}
+
+// DeleteRepository deletes a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) DeleteRepository(ctx context.Context, name string) error {
+ name = utils.SanitizeRepo(name)
+ repo := name + ".git"
+ rp := filepath.Join(d.reposPath(), repo)
+
+ return sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ // Delete repo from cache
+ defer d.cache.Delete(ctx, cacheKey(name))
+
+ if _, err := tx.Exec("DELETE FROM repo WHERE name = ?;", name); err != nil {
+ return err
+ }
+
+ return os.RemoveAll(rp)
+ })
+}
+
+// RenameRepository renames a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) RenameRepository(ctx context.Context, oldName string, newName string) error {
+ oldName = utils.SanitizeRepo(oldName)
+ if err := utils.ValidateRepo(oldName); err != nil {
+ return err
+ }
+
+ newName = utils.SanitizeRepo(newName)
+ if err := utils.ValidateRepo(newName); err != nil {
+ return err
+ }
+ oldRepo := oldName + ".git"
+ newRepo := newName + ".git"
+ op := filepath.Join(d.reposPath(), oldRepo)
+ np := filepath.Join(d.reposPath(), newRepo)
+ if _, err := os.Stat(op); err != nil {
+ return ErrRepoNotExist
+ }
+
+ if _, err := os.Stat(np); err == nil {
+ return ErrRepoExist
+ }
+
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ // Delete cache
+ defer d.cache.Delete(ctx, cacheKey(oldName))
+
+ _, err := tx.Exec("UPDATE repo SET name = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?;", newName, oldName)
+ if err != nil {
+ return err
+ }
+
+ // Make sure the new repository parent directory exists.
+ if err := os.MkdirAll(filepath.Dir(np), os.ModePerm); err != nil {
+ return err
+ }
+
+ if err := os.Rename(op, np); err != nil {
+ return err
+ }
+
+ return nil
+ }); err != nil {
+ return sqlite.WrapDbErr(err)
+ }
+
+ return nil
+}
+
+// CountRepositories returns the total number of repositories.
+func (d *SqliteStore) CountRepositories(ctx context.Context) (uint64, error) {
+ var count uint64
+
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.QueryRow("SELECT COUNT(*) FROM repo;").Scan(&count)
+ }); err != nil {
+ return 0, sqlite.WrapDbErr(err)
+ }
+
+ return count, nil
+}
+
+// Repositories returns a list of all repositories.
+//
+// It implements store.Backend.
+func (d *SqliteStore) Repositories(ctx context.Context, page int, perPage int) ([]store.Repository, error) {
+ repos := make([]store.Repository, 0)
+
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ rows, err := tx.Query("SELECT name FROM repo ORDER BY updated_at DESC LIMIT ? OFFSET ?;",
+ perPage, (page-1)*perPage)
+ if err != nil {
+ return err
+ }
+
+ defer rows.Close() // nolint: errcheck
+ for rows.Next() {
+ var name string
+ if err := rows.Scan(&name); err != nil {
+ return err
+ }
+
+ if r, ok := d.cache.Get(ctx, cacheKey(name)); ok && r != nil {
+ if r, ok := r.(*Repo); ok {
+ repos = append(repos, r)
+ }
+ continue
+ }
+
+ r := &Repo{
+ name: name,
+ path: filepath.Join(d.reposPath(), name+".git"),
+ db: d.db.DBx(),
+ }
+
+ // Cache repositories
+ d.cache.Set(ctx, cacheKey(name), r)
+
+ repos = append(repos, r)
+ }
+
+ return nil
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ return repos, nil
+}
+
+// Repository returns a repository by name.
+//
+// It implements store.Backend.
+func (d *SqliteStore) Repository(ctx context.Context, repo string) (store.Repository, error) {
+ repo = utils.SanitizeRepo(repo)
+
+ if r, ok := d.cache.Get(ctx, cacheKey(repo)); ok && r != nil {
+ if r, ok := r.(*Repo); ok {
+ return r, nil
+ }
+ }
+
+ rp := filepath.Join(d.reposPath(), repo+".git")
+ if _, err := os.Stat(rp); err != nil {
+ return nil, os.ErrNotExist
+ }
+
+ var count int
+ if err := sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ return tx.Get(&count, "SELECT COUNT(*) FROM repo WHERE name = ?", repo)
+ }); err != nil {
+ return nil, sqlite.WrapDbErr(err)
+ }
+
+ if count == 0 {
+ d.logger.Warn("repository exists but not found in database", "repo", repo)
+ return nil, ErrRepoNotExist
+ }
+
+ r := &Repo{
+ name: repo,
+ path: rp,
+ db: d.db.DBx(),
+ }
+
+ // Add to cache
+ d.cache.Set(ctx, cacheKey(repo), r)
+
+ return r, nil
+}
+
+// Description returns the description of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) Description(ctx context.Context, repo string) (string, error) {
+ r, err := d.Repository(ctx, repo)
+ if err != nil {
+ return "", err
+ }
+
+ return r.Description(), nil
+}
+
+// IsMirror returns true if the repository is a mirror.
+//
+// It implements store.Backend.
+func (d *SqliteStore) IsMirror(ctx context.Context, repo string) (bool, error) {
+ r, err := d.Repository(ctx, repo)
+ if err != nil {
+ return false, err
+ }
+
+ return r.IsMirror(), nil
+}
+
+// IsPrivate returns true if the repository is private.
+//
+// It implements store.Backend.
+func (d *SqliteStore) IsPrivate(ctx context.Context, repo string) (bool, error) {
+ r, err := d.Repository(ctx, repo)
+ if err != nil {
+ return false, err
+ }
+
+ return r.IsPrivate(), nil
+}
+
+// IsHidden returns true if the repository is hidden.
+//
+// It implements store.Backend.
+func (d *SqliteStore) IsHidden(ctx context.Context, repo string) (bool, error) {
+ r, err := d.Repository(ctx, repo)
+ if err != nil {
+ return false, err
+ }
+
+ return r.IsHidden(), nil
+}
+
+// SetHidden sets the hidden flag of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) SetHidden(ctx context.Context, repo string, hidden bool) error {
+ repo = utils.SanitizeRepo(repo)
+
+ // Delete cache
+ d.cache.Delete(ctx, cacheKey(repo))
+
+ return sqlite.WrapDbErr(sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var count int
+ if err := tx.Get(&count, "SELECT COUNT(*) FROM repo WHERE name = ?", repo); err != nil {
+ return err
+ }
+ if count == 0 {
+ return ErrRepoNotExist
+ }
+ _, err := tx.Exec("UPDATE repo SET hidden = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?;", hidden, repo)
+ return err
+ }))
+}
+
+// ProjectName returns the project name of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) ProjectName(ctx context.Context, repo string) (string, error) {
+ r, err := d.Repository(ctx, repo)
+ if err != nil {
+ return "", err
+ }
+
+ return r.ProjectName(), nil
+}
+
+func (d *SqliteStore) updateDescriptionFile(name, desc string) error {
+ repo := utils.RepoPath(d.reposPath(), name)
+ fp := filepath.Join(repo, "description")
+ return os.WriteFile(fp, []byte(desc), 0644)
+}
+
+// SetDescription sets the description of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) SetDescription(ctx context.Context, repo string, desc string) error {
+ repo = utils.SanitizeRepo(repo)
+
+ // Delete cache
+ d.cache.Delete(ctx, cacheKey(repo))
+
+ return sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var count int
+ if err := tx.Get(&count, "SELECT COUNT(*) FROM repo WHERE name = ?", repo); err != nil {
+ return err
+ }
+ if count == 0 {
+ return ErrRepoNotExist
+ }
+ _, err := tx.Exec("UPDATE repo SET description = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?", desc, repo)
+ if err != nil {
+ return err
+ }
+
+ return d.updateDescriptionFile(repo, desc)
+ })
+}
+
+func (d *SqliteStore) updateGitDaemonExportOk(name string, isPrivate bool) error {
+ repo := utils.RepoPath(d.reposPath(), name)
+ fp := filepath.Join(repo, "git-daemon-export-ok")
+ if isPrivate {
+ return os.Remove(fp)
+ }
+ return os.WriteFile(fp, []byte{}, 0644) // nolint: gosec
+}
+
+// SetPrivate sets the private flag of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) SetPrivate(ctx context.Context, name string, private bool) error {
+ name = utils.SanitizeRepo(name)
+
+ // Delete cache
+ d.cache.Delete(ctx, cacheKey(name))
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var count int
+ if err := tx.Get(&count, "SELECT COUNT(*) FROM repo WHERE name = ?", name); err != nil {
+ return err
+ }
+ if count == 0 {
+ return ErrRepoNotExist
+ }
+
+ _, err := tx.Exec("UPDATE repo SET private = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?", private, name)
+ if err != nil {
+ return err
+ }
+
+ return d.updateGitDaemonExportOk(name, private)
+ }),
+ )
+}
+
+// SetProjectName sets the project name of a repository.
+//
+// It implements store.Backend.
+func (d *SqliteStore) SetProjectName(ctx context.Context, repo string, name string) error {
+ repo = utils.SanitizeRepo(repo)
+
+ // Delete cache
+ d.cache.Delete(ctx, cacheKey(repo))
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ var count int
+ if err := tx.Get(&count, "SELECT COUNT(*) FROM repo WHERE name = ?", repo); err != nil {
+ return err
+ }
+ if count == 0 {
+ return ErrRepoNotExist
+ }
+ _, err := tx.Exec("UPDATE repo SET project_name = ?, updated_at = CURRENT_TIMESTAMP WHERE name = ?", name, repo)
+ return err
+ }),
+ )
+}
+
+// Touch updates the last update time of a repository.
+func (d *SqliteStore) Touch(ctx context.Context, repo string) error {
+ repo = utils.SanitizeRepo(repo)
+
+ // Delete cache
+ d.cache.Delete(ctx, cacheKey(repo))
+
+ return sqlite.WrapDbErr(
+ sqlite.WrapTx(d.db.DBx(), ctx, func(tx *sqlx.Tx) error {
+ _, err := tx.Exec("UPDATE repo SET updated_at = CURRENT_TIMESTAMP WHERE name = ?", repo)
+ if err != nil {
+ return err
+ }
+
+ if err := d.populateLastModified(ctx, repo); err != nil {
+ d.logger.Error("error populating last-modified", "repo", repo, "err", err)
+ return err
+ }
+
+ return nil
+ }),
+ )
+}
+
+func (d *SqliteStore) populateLastModified(ctx context.Context, repo string) error {
+ var rr *Repo
+ _rr, err := d.Repository(ctx, repo)
+ if err != nil {
+ return err
+ }
+
+ if r, ok := _rr.(*Repo); ok {
+ rr = r
+ } else {
+ return ErrRepoNotExist
+ }
+
+ r, err := rr.Open()
+ if err != nil {
+ return err
+ }
+
+ c, err := r.LatestCommitTime()
+ if err != nil {
+ return err
+ }
+
+ return rr.writeLastModified(c)
+}
@@ -0,0 +1,56 @@
+package store
+
+import (
+ "context"
+
+ "github.com/go-git/go-billy/v5"
+)
+
+// RepositoryOptions are options for creating a new repository.
+type RepositoryOptions struct {
+ Private bool
+ Description string
+ ProjectName string
+ Mirror bool
+ Hidden bool
+}
+
+// Store is an interface for managing repositories and repository metadata.
+type Store interface {
+ // Filesystem returns the underlying git filesystem.
+ Filesystem() billy.Filesystem
+ // Repository finds the given repository.
+ Repository(ctx context.Context, repo string) (Repository, error)
+ // CountRepositories returns the number of repositories.
+ CountRepositories(ctx context.Context) (uint64, error)
+ // Repositories returns a list of all repositories.
+ Repositories(ctx context.Context, page int, perPage int) ([]Repository, error)
+ // CreateRepository creates a new repository.
+ CreateRepository(ctx context.Context, name string, opts RepositoryOptions) (Repository, error)
+ // ImportRepository creates a new repository from a Git repository.
+ ImportRepository(ctx context.Context, name string, remote string, opts RepositoryOptions) (Repository, error)
+ // DeleteRepository deletes a repository.
+ DeleteRepository(ctx context.Context, name string) error
+ // RenameRepository renames a repository.
+ RenameRepository(ctx context.Context, oldName, newName string) error
+ // ProjectName returns the repository's project name.
+ ProjectName(ctx context.Context, repo string) (string, error)
+ // SetProjectName sets the repository's project name.
+ SetProjectName(ctx context.Context, repo, name string) error
+ // Description returns the repository's description.
+ Description(ctx context.Context, repo string) (string, error)
+ // SetDescription sets the repository's description.
+ SetDescription(ctx context.Context, repo, desc string) error
+ // IsPrivate returns whether the repository is private.
+ IsPrivate(ctx context.Context, repo string) (bool, error)
+ // SetPrivate sets whether the repository is private.
+ SetPrivate(ctx context.Context, repo string, private bool) error
+ // IsMirror returns whether the repository is a mirror.
+ IsMirror(ctx context.Context, repo string) (bool, error)
+ // IsHidden returns whether the repository is hidden.
+ IsHidden(ctx context.Context, repo string) (bool, error)
+ // SetHidden sets whether the repository is hidden.
+ SetHidden(ctx context.Context, repo string, hidden bool) error
+ // Touch updates the repository's last activity time.
+ Touch(ctx context.Context, repo string) error
+}
@@ -3,8 +3,11 @@ package common
import (
"context"
+ "github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/log"
"github.com/charmbracelet/soft-serve/git"
+ "github.com/charmbracelet/soft-serve/server/auth"
+ "github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/ui/keymap"
"github.com/charmbracelet/soft-serve/server/ui/styles"
@@ -30,27 +33,32 @@ type Common struct {
Styles *styles.Styles
KeyMap *keymap.KeyMap
Zone *zone.Manager
- Output *termenv.Output
+ Renderer *lipgloss.Renderer
Logger *log.Logger
}
// NewCommon returns a new Common struct.
-func NewCommon(ctx context.Context, out *termenv.Output, width, height int) Common {
+func NewCommon(ctx context.Context, re *lipgloss.Renderer, width, height int) Common {
if ctx == nil {
ctx = context.TODO()
}
return Common{
- ctx: ctx,
- Width: width,
- Height: height,
- Output: out,
- Styles: styles.DefaultStyles(),
- KeyMap: keymap.DefaultKeyMap(),
- Zone: zone.New(),
- Logger: log.FromContext(ctx).WithPrefix("ui"),
+ ctx: ctx,
+ Width: width,
+ Height: height,
+ Styles: styles.DefaultStyles(re),
+ KeyMap: keymap.DefaultKeyMap(),
+ Zone: zone.New(),
+ Logger: log.FromContext(ctx).WithPrefix("ui"),
+ Renderer: re,
}
}
+// Output returns the termenv output.
+func (c *Common) Output() *termenv.Output {
+ return c.Renderer.Output()
+}
+
// SetValue sets a value in the context.
func (c *Common) SetValue(key, value interface{}) {
c.ctx = context.WithValue(c.ctx, key, value)
@@ -64,11 +72,11 @@ func (c *Common) SetSize(width, height int) {
// Config returns the server config.
func (c *Common) Config() *config.Config {
- v := c.ctx.Value(ConfigKey)
- if cfg, ok := v.(*config.Config); ok {
- return cfg
- }
- return nil
+ return config.FromContext(c.ctx)
+}
+
+func (c *Common) Context() context.Context {
+ return c.ctx
}
// Repo returns the repository.
@@ -88,3 +96,13 @@ func (c *Common) PublicKey() ssh.PublicKey {
}
return nil
}
+
+// Backend returns the server backend.
+func (c *Common) Backend() *backend.Backend {
+ return backend.FromContext(c.ctx)
+}
+
+// User returns the current user from context.
+func (c *Common) User() auth.User {
+ return auth.UserFromContext(c.ctx)
+}
@@ -12,6 +12,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/soft-serve/server/ui/common"
vp "github.com/charmbracelet/soft-serve/server/ui/components/viewport"
+ "github.com/charmbracelet/soft-serve/server/uiutils"
"github.com/muesli/termenv"
)
@@ -20,8 +21,12 @@ const (
)
var (
- lineDigitStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("239"))
- lineBarStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("236"))
+ lineDigitStyle = func(r *lipgloss.Renderer) lipgloss.Style {
+ return r.NewStyle().Foreground(lipgloss.Color("239"))
+ }
+ lineBarStyle = func(r *lipgloss.Renderer) lipgloss.Style {
+ return lipgloss.NewStyle().Foreground(lipgloss.Color("236"))
+ }
)
// Code is a code snippet.
@@ -48,10 +53,10 @@ func New(c common.Common, content, extension string) *Code {
extension: extension,
Viewport: vp.New(c),
NoContentStyle: c.Styles.NoContent.Copy(),
- LineDigitStyle: lineDigitStyle,
- LineBarStyle: lineBarStyle,
+ LineDigitStyle: lineDigitStyle(c.Renderer),
+ LineBarStyle: lineBarStyle(c.Renderer),
}
- st := common.StyleConfig()
+ st := uiutils.StyleConfig()
r.styleConfig = st
r.renderContext = gansi.NewRenderContext(gansi.Options{
ColorProfile: termenv.TrueColor,
@@ -212,7 +217,7 @@ func (r *Code) renderFile(path, content string, width int) (string, error) {
s := strings.Builder{}
rc := r.renderContext
if r.showLineNumber {
- st := common.StyleConfig()
+ st := uiutils.StyleConfig()
var m uint
st.CodeBlock.Margin = &m
rc = gansi.NewRenderContext(gansi.Options{
@@ -227,7 +232,7 @@ func (r *Code) renderFile(path, content string, width int) (string, error) {
c = s.String()
if r.showLineNumber {
var ml int
- c, ml = withLineNumber(c)
+ c, ml = r.withLineNumber(c)
width -= ml
}
}
@@ -235,10 +240,10 @@ func (r *Code) renderFile(path, content string, width int) (string, error) {
// https://github.com/muesli/reflow/issues/43
//
// TODO: solve this upstream in Glamour/Reflow.
- return lipgloss.NewStyle().Width(width).Render(c), nil
+ return r.common.Renderer.NewStyle().Width(width).Render(c), nil
}
-func withLineNumber(s string) (string, int) {
+func (r *Code) withLineNumber(s string) (string, int) {
lines := strings.Split(s, "\n")
// NB: len() is not a particularly safe way to count string width (because
// it's counting bytes instead of runes) but in this case it's okay
@@ -247,8 +252,8 @@ func withLineNumber(s string) (string, int) {
for i, l := range lines {
digit := fmt.Sprintf("%*d", mll, i+1)
bar := "│"
- digit = lineDigitStyle.Render(digit)
- bar = lineBarStyle.Render(bar)
+ digit = r.LineDigitStyle.Render(digit)
+ bar = r.LineBarStyle.Render(bar)
if i < len(lines)-1 || len(l) != 0 {
// If the final line was a newline we'll get an empty string for
// the final line, so drop the newline altogether.
@@ -89,7 +89,7 @@ func (s *StatusBar) View() string {
Width(maxWidth).
Render(v)
- return lipgloss.NewStyle().MaxWidth(s.common.Width).
+ return s.common.Renderer.NewStyle().MaxWidth(s.common.Width).
Render(
lipgloss.JoinHorizontal(lipgloss.Top,
key,
@@ -105,7 +105,7 @@ func (t *Tabs) View() string {
s.WriteString(sep.String())
}
}
- return lipgloss.NewStyle().
+ return t.common.Renderer.NewStyle().
MaxWidth(t.common.Width).
Render(s.String())
}
@@ -140,7 +140,7 @@ func (d FileItemDelegate) Render(w io.Writer, m list.Model, index int, listItem
name = nameStyle.Render(name)
size = sizeStyle.Render(size)
modeStr := modeStyle.Render(mode.String())
- truncate := lipgloss.NewStyle().MaxWidth(m.Width() -
+ truncate := d.common.Renderer.NewStyle().MaxWidth(m.Width() -
s.Selector.GetHorizontalFrameSize() -
s.Selector.GetWidth())
fmt.Fprint(w,
@@ -16,6 +16,7 @@ import (
"github.com/charmbracelet/soft-serve/server/ui/components/footer"
"github.com/charmbracelet/soft-serve/server/ui/components/selector"
"github.com/charmbracelet/soft-serve/server/ui/components/viewport"
+ "github.com/charmbracelet/soft-serve/server/uiutils"
"github.com/muesli/reflow/wrap"
"github.com/muesli/termenv"
)
@@ -463,7 +464,7 @@ func (l *Log) loadDiffCmd() tea.Msg {
func renderCtx() gansi.RenderContext {
return gansi.NewRenderContext(gansi.Options{
ColorProfile: termenv.TrueColor,
- Styles: common.StyleConfig(),
+ Styles: uiutils.StyleConfig(),
})
}
@@ -84,8 +84,7 @@ func (r *Readme) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
r.ref = msg
cmds = append(cmds, r.Init())
case EmptyRepoMsg:
- r.code.SetContent(defaultEmptyRepoMsg(r.common.Config(),
- r.repo.Name()), ".md")
+ r.code.SetContent(defaultEmptyRepoMsg(r.common.Config(), r.repo.Name()), ".md")
}
c, cmd := r.code.Update(msg)
r.code = c.(*code.Code)
@@ -165,6 +165,7 @@ func (r *Repo) Init() tea.Cmd {
// Update implements tea.Model.
func (r *Repo) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+ cfg := r.common.Config()
cmds := make([]tea.Cmd, 0)
switch msg := msg.(type) {
case RepoMsg:
@@ -212,7 +213,7 @@ func (r *Repo) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if r.selectedRepo != nil {
cmds = append(cmds, r.updateStatusBarCmd)
urlID := fmt.Sprintf("%s-url", r.selectedRepo.Name())
- cmd := common.CloneCmd(r.common.Config().SSH.PublicURL, r.selectedRepo.Name())
+ cmd := common.CloneCmd(cfg.SSH.PublicURL, r.selectedRepo.Name())
if msg, ok := msg.(tea.MouseMsg); ok && r.common.Zone.Get(urlID).InBounds(msg) {
cmds = append(cmds, copyCmd(cmd, "Command copied to clipboard"))
}
@@ -234,9 +235,7 @@ func (r *Repo) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
case CopyMsg:
txt := msg.Text
- if cfg := r.common.Config(); cfg != nil {
- r.common.Output.Copy(txt)
- }
+ r.common.Output().Copy(txt)
cmds = append(cmds, func() tea.Msg {
return statusbar.StatusBarMsg{
Value: msg.Message,
@@ -324,10 +323,11 @@ func (r *Repo) View() string {
}
func (r *Repo) headerView() string {
+ cfg := r.common.Config()
if r.selectedRepo == nil {
return ""
}
- truncate := lipgloss.NewStyle().MaxWidth(r.common.Width)
+ truncate := r.common.Renderer.NewStyle().MaxWidth(r.common.Width)
name := r.selectedRepo.ProjectName()
if name == "" {
name = r.selectedRepo.Name()
@@ -344,9 +344,7 @@ func (r *Repo) headerView() string {
Width(r.common.Width - lipgloss.Width(desc) - 1).
Align(lipgloss.Right)
var url string
- if cfg := r.common.Config(); cfg != nil {
- url = common.CloneCmd(cfg.SSH.PublicURL, r.selectedRepo.Name())
- }
+ url = common.CloneCmd(cfg.SSH.PublicURL, r.selectedRepo.Name())
url = common.TruncateString(url, r.common.Width-lipgloss.Width(desc)-1)
url = r.common.Zone.Mark(
fmt.Sprintf("%s-url", r.selectedRepo.Name()),
@@ -13,6 +13,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/charmbracelet/soft-serve/server/ui/common"
"github.com/dustin/go-humanize"
)
@@ -54,7 +55,7 @@ type Item struct {
}
// New creates a new Item.
-func NewItem(repo backend.Repository, cfg *config.Config) (Item, error) {
+func NewItem(cfg *config.Config, repo store.Repository) (Item, error) {
var lastUpdate *time.Time
lu := repo.UpdatedAt()
if !lu.IsZero() {
@@ -136,7 +137,7 @@ func (d *ItemDelegate) Update(msg tea.Msg, m *list.Model) tea.Cmd {
switch {
case key.Matches(msg, d.common.KeyMap.Copy):
d.copiedIdx = idx
- d.common.Output.Copy(item.Command())
+ d.common.Output().Copy(item.Command())
return m.SetItem(idx, item)
}
}
@@ -8,6 +8,7 @@ import (
"github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
+ "github.com/charmbracelet/soft-serve/server/access"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/ui/common"
"github.com/charmbracelet/soft-serve/server/ui/components/code"
@@ -51,7 +52,7 @@ func New(c common.Common) *Selection {
ts[i] = b.String()
}
t := tabs.New(c, ts)
- t.TabSeparator = lipgloss.NewStyle()
+ t.TabSeparator = c.Renderer.NewStyle()
t.TabInactive = c.Styles.TopLevelNormalTab.Copy()
t.TabActive = c.Styles.TopLevelActiveTab.Copy()
t.TabDot = c.Styles.TopLevelActiveTabDot.Copy()
@@ -181,21 +182,23 @@ func (s *Selection) FullHelp() [][]key.Binding {
// Init implements tea.Model.
func (s *Selection) Init() tea.Cmd {
- var readmeCmd tea.Cmd
+ ctx := s.common.Context()
cfg := s.common.Config()
- if cfg == nil {
+ var readmeCmd tea.Cmd
+ be := s.common.Backend()
+ if be == nil {
return nil
}
pk := s.common.PublicKey()
- if pk == nil && !cfg.Backend.AllowKeyless() {
+ if pk == nil && !be.AllowKeyless(ctx) {
return nil
}
- repos, err := cfg.Backend.Repositories()
- if err != nil {
- return common.ErrorCmd(err)
- }
+ // TODO: fixme
+ repos, _ := be.Repositories(ctx, 1, 10)
+ user := s.common.User()
+
sortedItems := make(Items, 0)
for _, r := range repos {
if r.Name() == ".soft-serve" {
@@ -210,9 +213,10 @@ func (s *Selection) Init() tea.Cmd {
if r.IsHidden() {
continue
}
- al := cfg.Backend.AccessLevelByPublicKey(r.Name(), pk)
- if al >= backend.ReadOnlyAccess {
- item, err := NewItem(r, cfg)
+
+ al, _ := be.AccessLevel(ctx, r.Name(), user)
+ if al >= access.ReadOnlyAccess {
+ item, err := NewItem(cfg, r)
if err != nil {
s.common.Logger.Debugf("ui: failed to create item for %s: %v", r.Name(), err)
continue
@@ -286,15 +290,15 @@ func (s *Selection) View() string {
wm, hm := s.getMargins()
switch s.activePane {
case selectorPane:
- ss := lipgloss.NewStyle().
+ ss := s.common.Renderer.NewStyle().
Width(s.common.Width - wm).
Height(s.common.Height - hm)
view = ss.Render(s.selector.View())
case readmePane:
- rs := lipgloss.NewStyle().
+ rs := s.common.Renderer.NewStyle().
Height(s.common.Height - hm)
status := fmt.Sprintf("☰ %.f%%", s.readme.ScrollPercent()*100)
- readmeStatus := lipgloss.NewStyle().
+ readmeStatus := s.common.Renderer.NewStyle().
Align(lipgloss.Right).
Width(s.common.Width - wm).
Foreground(s.common.Styles.InactiveBorderColor).
@@ -140,7 +140,7 @@ type Styles struct {
}
// DefaultStyles returns default styles for the UI.
-func DefaultStyles() *Styles {
+func DefaultStyles(r *lipgloss.Renderer) *Styles {
highlightColor := lipgloss.Color("210")
highlightColorDim := lipgloss.Color("174")
selectorColor := lipgloss.Color("167")
@@ -151,10 +151,10 @@ func DefaultStyles() *Styles {
s.ActiveBorderColor = lipgloss.Color("62")
s.InactiveBorderColor = lipgloss.Color("241")
- s.App = lipgloss.NewStyle().
+ s.App = r.NewStyle().
Margin(1, 2)
- s.ServerName = lipgloss.NewStyle().
+ s.ServerName = r.NewStyle().
Height(1).
MarginLeft(1).
MarginBottom(1).
@@ -163,29 +163,29 @@ func DefaultStyles() *Styles {
Foreground(lipgloss.Color("229")).
Bold(true)
- s.TopLevelNormalTab = lipgloss.NewStyle().
+ s.TopLevelNormalTab = r.NewStyle().
MarginRight(2)
s.TopLevelActiveTab = s.TopLevelNormalTab.Copy().
Foreground(lipgloss.Color("36"))
- s.TopLevelActiveTabDot = lipgloss.NewStyle().
+ s.TopLevelActiveTabDot = r.NewStyle().
Foreground(lipgloss.Color("36"))
- s.RepoSelector.Normal.Base = lipgloss.NewStyle().
+ s.RepoSelector.Normal.Base = r.NewStyle().
PaddingLeft(1).
Border(lipgloss.Border{Left: " "}, false, false, false, true).
Height(3)
- s.RepoSelector.Normal.Title = lipgloss.NewStyle().Bold(true)
+ s.RepoSelector.Normal.Title = r.NewStyle().Bold(true)
- s.RepoSelector.Normal.Desc = lipgloss.NewStyle().
+ s.RepoSelector.Normal.Desc = r.NewStyle().
Foreground(lipgloss.Color("243"))
- s.RepoSelector.Normal.Command = lipgloss.NewStyle().
+ s.RepoSelector.Normal.Command = r.NewStyle().
Foreground(lipgloss.Color("132"))
- s.RepoSelector.Normal.Updated = lipgloss.NewStyle().
+ s.RepoSelector.Normal.Updated = r.NewStyle().
Foreground(lipgloss.Color("243"))
s.RepoSelector.Active.Base = s.RepoSelector.Normal.Base.Copy().
@@ -204,78 +204,78 @@ func DefaultStyles() *Styles {
s.RepoSelector.Active.Command = s.RepoSelector.Normal.Command.Copy().
Foreground(lipgloss.Color("204"))
- s.MenuItem = lipgloss.NewStyle().
+ s.MenuItem = r.NewStyle().
PaddingLeft(1).
Border(lipgloss.Border{
Left: " ",
}, false, false, false, true).
Height(3)
- s.MenuLastUpdate = lipgloss.NewStyle().
+ s.MenuLastUpdate = r.NewStyle().
Foreground(lipgloss.Color("241")).
Align(lipgloss.Right)
- s.Repo.Base = lipgloss.NewStyle()
+ s.Repo.Base = r.NewStyle()
- s.Repo.Title = lipgloss.NewStyle().
+ s.Repo.Title = r.NewStyle().
Padding(0, 2)
- s.Repo.Command = lipgloss.NewStyle().
+ s.Repo.Command = r.NewStyle().
Foreground(lipgloss.Color("168"))
- s.Repo.Body = lipgloss.NewStyle().
+ s.Repo.Body = r.NewStyle().
Margin(1, 0)
- s.Repo.Header = lipgloss.NewStyle().
+ s.Repo.Header = r.NewStyle().
Height(2).
Border(lipgloss.NormalBorder(), false, false, true, false).
BorderForeground(lipgloss.Color("236"))
- s.Repo.HeaderName = lipgloss.NewStyle().
+ s.Repo.HeaderName = r.NewStyle().
Foreground(lipgloss.Color("212")).
Bold(true)
- s.Repo.HeaderDesc = lipgloss.NewStyle().
+ s.Repo.HeaderDesc = r.NewStyle().
Foreground(lipgloss.Color("243"))
- s.Footer = lipgloss.NewStyle().
+ s.Footer = r.NewStyle().
MarginTop(1).
Padding(0, 1).
Height(1)
- s.Branch = lipgloss.NewStyle().
+ s.Branch = r.NewStyle().
Foreground(lipgloss.Color("203")).
Background(lipgloss.Color("236")).
Padding(0, 1)
- s.HelpKey = lipgloss.NewStyle().
+ s.HelpKey = r.NewStyle().
Foreground(lipgloss.Color("241"))
- s.HelpValue = lipgloss.NewStyle().
+ s.HelpValue = r.NewStyle().
Foreground(lipgloss.Color("239"))
- s.HelpDivider = lipgloss.NewStyle().
+ s.HelpDivider = r.NewStyle().
Foreground(lipgloss.Color("237")).
SetString(" • ")
- s.URLStyle = lipgloss.NewStyle().
+ s.URLStyle = r.NewStyle().
MarginLeft(1).
Foreground(lipgloss.Color("168"))
- s.Error = lipgloss.NewStyle().
+ s.Error = r.NewStyle().
MarginTop(2)
- s.ErrorTitle = lipgloss.NewStyle().
+ s.ErrorTitle = r.NewStyle().
Foreground(lipgloss.Color("230")).
Background(lipgloss.Color("204")).
Bold(true).
Padding(0, 1)
- s.ErrorBody = lipgloss.NewStyle().
+ s.ErrorBody = r.NewStyle().
Foreground(lipgloss.Color("252")).
MarginLeft(2)
- s.LogItem.Normal.Base = lipgloss.NewStyle().
+ s.LogItem.Normal.Base = r.NewStyle().
Border(lipgloss.Border{
Left: " ",
}, false, false, false, true).
@@ -290,74 +290,74 @@ func DefaultStyles() *Styles {
s.LogItem.Active.Hash = s.LogItem.Normal.Hash.Copy().
Foreground(hashColor)
- s.LogItem.Active.Hash = lipgloss.NewStyle().
+ s.LogItem.Active.Hash = r.NewStyle().
Bold(true).
Foreground(highlightColor)
- s.LogItem.Normal.Title = lipgloss.NewStyle().
+ s.LogItem.Normal.Title = r.NewStyle().
Foreground(lipgloss.Color("105"))
- s.LogItem.Active.Title = lipgloss.NewStyle().
+ s.LogItem.Active.Title = r.NewStyle().
Foreground(highlightColor).
Bold(true)
- s.LogItem.Normal.Desc = lipgloss.NewStyle().
+ s.LogItem.Normal.Desc = r.NewStyle().
Foreground(lipgloss.Color("246"))
- s.LogItem.Active.Desc = lipgloss.NewStyle().
+ s.LogItem.Active.Desc = r.NewStyle().
Foreground(lipgloss.Color("95"))
s.LogItem.Active.Keyword = s.LogItem.Active.Desc.Copy().
Foreground(highlightColorDim)
- s.LogItem.Normal.Hash = lipgloss.NewStyle().
+ s.LogItem.Normal.Hash = r.NewStyle().
Foreground(hashColor)
- s.LogItem.Active.Hash = lipgloss.NewStyle().
+ s.LogItem.Active.Hash = r.NewStyle().
Foreground(highlightColor)
- s.Log.Commit = lipgloss.NewStyle().
+ s.Log.Commit = r.NewStyle().
Margin(0, 2)
- s.Log.CommitHash = lipgloss.NewStyle().
+ s.Log.CommitHash = r.NewStyle().
Foreground(hashColor).
Bold(true)
- s.Log.CommitBody = lipgloss.NewStyle().
+ s.Log.CommitBody = r.NewStyle().
MarginTop(1).
MarginLeft(2)
- s.Log.CommitStatsAdd = lipgloss.NewStyle().
+ s.Log.CommitStatsAdd = r.NewStyle().
Foreground(lipgloss.Color("42")).
Bold(true)
- s.Log.CommitStatsDel = lipgloss.NewStyle().
+ s.Log.CommitStatsDel = r.NewStyle().
Foreground(lipgloss.Color("203")).
Bold(true)
- s.Log.Paginator = lipgloss.NewStyle().
+ s.Log.Paginator = r.NewStyle().
Margin(0).
Align(lipgloss.Center)
- s.Ref.Normal.Item = lipgloss.NewStyle()
+ s.Ref.Normal.Item = r.NewStyle()
- s.Ref.ItemSelector = lipgloss.NewStyle().
+ s.Ref.ItemSelector = r.NewStyle().
Foreground(selectorColor).
SetString("> ")
- s.Ref.Active.Item = lipgloss.NewStyle().
+ s.Ref.Active.Item = r.NewStyle().
Foreground(highlightColorDim)
- s.Ref.ItemBranch = lipgloss.NewStyle()
+ s.Ref.ItemBranch = r.NewStyle()
- s.Ref.Normal.ItemTag = lipgloss.NewStyle().
+ s.Ref.Normal.ItemTag = r.NewStyle().
Foreground(lipgloss.Color("39"))
- s.Ref.Active.ItemTag = lipgloss.NewStyle().
+ s.Ref.Active.ItemTag = r.NewStyle().
Bold(true).
Foreground(highlightColor)
- s.Ref.Active.Item = lipgloss.NewStyle().
+ s.Ref.Active.Item = r.NewStyle().
Bold(true).
Foreground(highlightColor)
@@ -367,17 +367,17 @@ func DefaultStyles() *Styles {
Width(1).
Foreground(selectorColor)
- s.Tree.Normal.FileName = lipgloss.NewStyle().
+ s.Tree.Normal.FileName = r.NewStyle().
MarginLeft(1)
s.Tree.Active.FileName = s.Tree.Normal.FileName.Copy().
Bold(true).
Foreground(highlightColor)
- s.Tree.Normal.FileDir = lipgloss.NewStyle().
+ s.Tree.Normal.FileDir = r.NewStyle().
Foreground(lipgloss.Color("39"))
- s.Tree.Active.FileDir = lipgloss.NewStyle().
+ s.Tree.Active.FileDir = r.NewStyle().
Foreground(highlightColor)
s.Tree.Normal.FileMode = s.Tree.Active.FileName.Copy().
@@ -393,66 +393,66 @@ func DefaultStyles() *Styles {
s.Tree.Active.FileSize = s.Tree.Normal.FileName.Copy().
Foreground(highlightColorDim)
- s.Tree.FileContent = lipgloss.NewStyle()
+ s.Tree.FileContent = r.NewStyle()
s.Tree.Paginator = s.Log.Paginator.Copy()
- s.Spinner = lipgloss.NewStyle().
+ s.Spinner = r.NewStyle().
MarginTop(1).
MarginLeft(2).
Foreground(lipgloss.Color("205"))
- s.SpinnerContainer = lipgloss.NewStyle()
+ s.SpinnerContainer = r.NewStyle()
- s.NoContent = lipgloss.NewStyle().
+ s.NoContent = r.NewStyle().
SetString("No Content.").
MarginTop(1).
MarginLeft(2).
Foreground(lipgloss.Color("242"))
- s.NoItems = lipgloss.NewStyle().
+ s.NoItems = r.NewStyle().
MarginLeft(2).
Foreground(lipgloss.Color("242"))
- s.StatusBar = lipgloss.NewStyle().
+ s.StatusBar = r.NewStyle().
Height(1)
- s.StatusBarKey = lipgloss.NewStyle().
+ s.StatusBarKey = r.NewStyle().
Bold(true).
Padding(0, 1).
Background(lipgloss.Color("206")).
Foreground(lipgloss.Color("228"))
- s.StatusBarValue = lipgloss.NewStyle().
+ s.StatusBarValue = r.NewStyle().
Padding(0, 1).
Background(lipgloss.Color("235")).
Foreground(lipgloss.Color("243"))
- s.StatusBarInfo = lipgloss.NewStyle().
+ s.StatusBarInfo = r.NewStyle().
Padding(0, 1).
Background(lipgloss.Color("212")).
Foreground(lipgloss.Color("230"))
- s.StatusBarBranch = lipgloss.NewStyle().
+ s.StatusBarBranch = r.NewStyle().
Padding(0, 1).
Background(lipgloss.Color("62")).
Foreground(lipgloss.Color("230"))
- s.StatusBarHelp = lipgloss.NewStyle().
+ s.StatusBarHelp = r.NewStyle().
Padding(0, 1).
Background(lipgloss.Color("237")).
Foreground(lipgloss.Color("243"))
- s.Tabs = lipgloss.NewStyle().
+ s.Tabs = r.NewStyle().
Height(1)
- s.TabInactive = lipgloss.NewStyle()
+ s.TabInactive = r.NewStyle()
- s.TabActive = lipgloss.NewStyle().
+ s.TabActive = r.NewStyle().
Underline(true).
Foreground(lipgloss.Color("36"))
- s.TabSeparator = lipgloss.NewStyle().
+ s.TabSeparator = r.NewStyle().
SetString("│").
Padding(0, 1).
Foreground(lipgloss.Color("238"))
@@ -47,7 +47,8 @@ type UI struct {
// New returns a new UI model.
func New(c common.Common, initialRepo string) *UI {
- serverName := c.Config().Name
+ cfg := c.Config()
+ serverName := cfg.Name
h := header.New(c, serverName)
ui := &UI{
serverName: serverName,
@@ -284,11 +285,11 @@ func (ui *UI) View() string {
}
func (ui *UI) openRepo(rn string) (backend.Repository, error) {
- cfg := ui.common.Config()
- if cfg == nil {
- return nil, errors.New("config is nil")
+ be := ui.common.Backend()
+ if be == nil {
+ return nil, errors.New("backend is nil")
}
- repos, err := cfg.Backend.Repositories()
+ repos, err := be.Repositories(ui.common.Context(), 1, 10)
if err != nil {
ui.common.Logger.Debugf("ui: failed to list repos: %v", err)
return nil, err
@@ -1,8 +1,8 @@
-package common
+package uiutils
import (
"github.com/charmbracelet/glamour"
- gansi "github.com/charmbracelet/glamour/ansi"
+ "github.com/charmbracelet/glamour/ansi"
)
func strptr(s string) *string {
@@ -10,7 +10,7 @@ func strptr(s string) *string {
}
// StyleConfig returns the default Glamour style configuration.
-func StyleConfig() gansi.StyleConfig {
+func StyleConfig() ansi.StyleConfig {
noColor := strptr("")
s := glamour.DarkStyleConfig
s.H1.BackgroundColor = noColor
@@ -15,6 +15,13 @@ func SanitizeRepo(repo string) string {
return repo
}
+// RepoPath returns the path to the repository.
+func RepoPath(dataPath, repo string) string {
+ repo = SanitizeRepo(repo) + ".git"
+ repo = strings.ReplaceAll(repo, "/", string(filepath.Separator))
+ return filepath.Join(dataPath, repo)
+}
+
// ValidateUsername returns an error if any of the given usernames are invalid.
func ValidateUsername(username string) error {
if username == "" {
@@ -15,9 +15,11 @@ import (
"github.com/charmbracelet/log"
gitb "github.com/charmbracelet/soft-serve/git"
+ "github.com/charmbracelet/soft-serve/server/access"
"github.com/charmbracelet/soft-serve/server/backend"
"github.com/charmbracelet/soft-serve/server/config"
"github.com/charmbracelet/soft-serve/server/git"
+ "github.com/charmbracelet/soft-serve/server/store"
"github.com/charmbracelet/soft-serve/server/utils"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -32,7 +34,7 @@ type GitRoute struct {
handler http.HandlerFunc
cfg *config.Config
- be backend.Backend
+ be *backend.Backend
logger *log.Logger
}
@@ -67,10 +69,6 @@ func (g GitRoute) Match(r *http.Request) *http.Request {
ctx = config.WithContext(ctx, g.cfg)
}
- if g.be != nil {
- ctx = backend.WithContext(ctx, g.be.WithContext(ctx))
- }
-
if g.logger != nil {
ctx = log.WithContext(ctx, g.logger)
}
@@ -186,32 +184,36 @@ func withAccess(fn http.HandlerFunc) http.HandlerFunc {
be := backend.FromContext(ctx)
logger := log.FromContext(ctx)
- if !be.AllowKeyless() {
+ if !be.AllowKeyless(ctx) {
renderForbidden(w)
return
}
repo := pat.Param(r, "repo")
service := git.Service(pat.Param(r, "service"))
- access := be.AccessLevel(repo, "")
+ ac, err := be.AccessLevel(ctx, repo, nil)
+ if err != nil {
+ renderUnauthorized(w)
+ return
+ }
switch service {
case git.ReceivePackService:
- if access < backend.ReadWriteAccess {
+ if ac < access.ReadWriteAccess {
renderUnauthorized(w)
return
}
// Create the repo if it doesn't exist.
- if _, err := be.Repository(repo); err != nil {
- if _, err := be.CreateRepository(repo, backend.RepositoryOptions{}); err != nil {
+ if _, err := be.Repository(ctx, repo); err != nil {
+ if _, err := be.CreateRepository(ctx, repo, store.RepositoryOptions{}); err != nil {
logger.Error("failed to create repository", "repo", repo, "err", err)
renderInternalServerError(w)
return
}
}
default:
- if access < backend.ReadOnlyAccess {
+ if ac < access.ReadOnlyAccess {
renderUnauthorized(w)
return
}
@@ -243,9 +245,9 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {
version := r.Header.Get("Git-Protocol")
+ var stdout bytes.Buffer
cmd := git.ServiceCommand{
- Stdin: r.Body,
- Stdout: w,
+ Stdout: &stdout,
Dir: dir,
Args: []string{"--stateless-rpc"},
}
@@ -255,53 +257,53 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {
}
// Handle gzip encoding
- cmd.StdinHandler = func(in io.Reader, stdin io.WriteCloser) (err error) {
- // We know that `in` is an `io.ReadCloser` because it's `r.Body`.
- reader := in.(io.ReadCloser)
- defer reader.Close() // nolint: errcheck
- switch r.Header.Get("Content-Encoding") {
- case "gzip":
- reader, err = gzip.NewReader(reader)
- if err != nil {
- return err
- }
- defer reader.Close() // nolint: errcheck
+ reader := r.Body
+ defer reader.Close() // nolint: errcheck
+ switch r.Header.Get("Content-Encoding") {
+ case "gzip":
+ reader, err := gzip.NewReader(reader)
+ if err != nil {
+ logger.Errorf("failed to create gzip reader: %v", err)
+ renderInternalServerError(w)
+ return
}
+ defer reader.Close() // nolint: errcheck
+ }
+
+ cmd.Stdin = reader
- _, err = io.Copy(stdin, reader)
- return err
+ if err := service.Handler(ctx, cmd); err != nil {
+ logger.Errorf("error executing service: %s", err)
+ renderInternalServerError(w)
+ return
}
// Handle buffered output
// Useful when using proxies
- cmd.StdoutHandler = func(out io.Writer, stdout io.ReadCloser) error {
- // We know that `out` is an `http.ResponseWriter`.
- flusher, ok := out.(http.Flusher)
- if !ok {
- return fmt.Errorf("expected http.ResponseWriter to be an http.Flusher, got %T", out)
- }
- p := make([]byte, 1024)
- for {
- nRead, err := stdout.Read(p)
- if err == io.EOF {
- break
- }
- nWrite, err := out.Write(p[:nRead])
- if err != nil {
- return err
- }
- if nRead != nWrite {
- return fmt.Errorf("failed to write data: %d read, %d written", nRead, nWrite)
- }
- flusher.Flush()
- }
-
- return nil
+ // We know that `out` is an `http.ResponseWriter`.
+ flusher, ok := w.(http.Flusher)
+ if !ok {
+ logger.Errorf("expected http.ResponseWriter to be an http.Flusher, got %T", w)
+ return
}
- if err := service.Handler(ctx, cmd); err != nil {
- logger.Errorf("error executing service: %s", err)
+ p := make([]byte, 1024)
+ for {
+ nRead, err := stdout.Read(p)
+ if err == io.EOF {
+ break
+ }
+ nWrite, err := w.Write(p[:nRead])
+ if err != nil {
+ logger.Errorf("failed to write data: %v", err)
+ return
+ }
+ if nRead != nWrite {
+ logger.Errorf("failed to write data: %d read, %d written", nRead, nWrite)
+ return
+ }
+ flusher.Flush()
}
}
@@ -400,10 +402,7 @@ func getServiceType(r *http.Request) git.Service {
}
func isSmart(r *http.Request, service git.Service) bool {
- if r.Header.Get("Content-Type") == fmt.Sprintf("application/x-%s-request", service) {
- return true
- }
- return false
+ return r.Header.Get("Content-Type") == fmt.Sprintf("application/x-%s-request", service)
}
func updateServerInfo(ctx context.Context, dir string) error {
@@ -36,7 +36,7 @@ Redirecting to docs at <a href="https://godoc.org/{{ .ImportRoot }}/{{ .Repo }}"
// GoGetHandler handles go get requests.
type GoGetHandler struct {
cfg *config.Config
- be backend.Backend
+ be *backend.Backend
}
var _ http.Handler = (*GoGetHandler)(nil)
@@ -44,7 +44,8 @@ var _ http.Handler = (*GoGetHandler)(nil)
func (g GoGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
repo := pattern.Path(r.Context())
repo = utils.SanitizeRepo(repo)
- be := g.be.WithContext(r.Context())
+ be := g.be
+ ctx := r.Context()
// Handle go get requests.
//
@@ -62,7 +63,7 @@ func (g GoGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// find the repo
for {
- if _, err := be.Repository(repo); err == nil {
+ if _, err := be.Repository(ctx, repo); err == nil {
break
}
@@ -13,7 +13,7 @@ import (
type HTTPServer struct {
ctx context.Context
cfg *config.Config
- be backend.Backend
+ be *backend.Backend
server *http.Server
}