remove flagset on proxy, use default config values

ocis-pkg/config/config.go

@@ -116,7 +116,7 @@ func New() *Config {
 		IDP:           idp.New(),
 		OCS:           ocs.New(),
 		Web:           web.New(),
-		Proxy:         proxy.New(),
+		Proxy:         proxy.DefaultConfig(),
 		Settings:      settings.New(),
 		Storage:       storage.New(),
 		Store:         store.New(),

ocis/pkg/command/proxy.go

@@ -9,7 +9,6 @@ import (
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/proxy/pkg/command"
 	svcconfig "github.com/owncloud/ocis/proxy/pkg/config"
-	"github.com/owncloud/ocis/proxy/pkg/flagset"
 	"github.com/urfave/cli/v2"
 )
 
@@ -19,7 +18,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 		Name:     "proxy",
 		Usage:    "Start proxy server",
 		Category: "Extensions",
-		Flags:    flagset.ServerWithConfig(cfg.Proxy),
+		//Flags:    flagset.ServerWithConfig(cfg.Proxy),
 		Subcommands: []*cli.Command{
 			command.PrintVersion(cfg.Proxy),
 		},

ocis/pkg/config/config.go

@@ -93,7 +93,7 @@ func New() *Config {
 		IDP:           idp.New(),
 		OCS:           ocs.New(),
 		Web:           web.New(),
-		Proxy:         proxy.New(),
+		Proxy:         proxy.DefaultConfig(),
 		Settings:      settings.New(),
 		Storage:       storage.New(),
 		Store:         store.New(),

proxy/cmd/proxy/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	if err := command.Execute(config.New()); err != nil {
+	if err := command.Execute(config.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }

proxy/pkg/command/health.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	"github.com/owncloud/ocis/proxy/pkg/flagset"
 	"github.com/urfave/cli/v2"
 )
 
@@ -14,7 +13,7 @@ func Health(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "health",
 		Usage: "Check health status",
-		Flags: flagset.HealthWithConfig(cfg),
+		//Flags: flagset.HealthWithConfig(cfg),
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

proxy/pkg/command/root.go

@@ -11,7 +11,6 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	"github.com/owncloud/ocis/proxy/pkg/flagset"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
@@ -32,7 +31,7 @@ func Execute(cfg *config.Config) error {
 			},
 		},
 
-		Flags: flagset.RootWithConfig(cfg),
+		//Flags: flagset.RootWithConfig(cfg),
 
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String

proxy/pkg/command/server.go

@@ -21,7 +21,6 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/cs3"
-	"github.com/owncloud/ocis/proxy/pkg/flagset"
 	"github.com/owncloud/ocis/proxy/pkg/metrics"
 	"github.com/owncloud/ocis/proxy/pkg/middleware"
 	"github.com/owncloud/ocis/proxy/pkg/proxy"
@@ -40,7 +39,7 @@ func Server(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "server",
 		Usage: "Start integrated server",
-		Flags: append(flagset.ServerWithConfig(cfg), flagset.RootWithConfig(cfg)...),
+		//Flags: append(flagset.ServerWithConfig(cfg), flagset.RootWithConfig(cfg)...),
 		Before: func(ctx *cli.Context) error {
 			logger := NewLogger(cfg)
 			if cfg.HTTP.Root != "/" {

proxy/pkg/config/config.go

@@ -2,6 +2,9 @@ package config
 
 import (
 	"context"
+	"path"
+
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 
 // Log defines the available logging configuration.
@@ -192,3 +195,60 @@ func New() *Config {
 		HTTP: HTTP{},
 	}
 }
+
+// DefaultConfig are values stored in the flag set, but moved to a struct.
+func DefaultConfig() *Config {
+	return &Config{
+		File: "",
+		Log:  Log{}, // logging config is inherited.
+		Debug: Debug{
+			Addr:  "0.0.0.0:9205",
+			Token: "",
+		},
+		HTTP: HTTP{
+			Addr:    "0.0.0.0:9200",
+			Root:    "/",
+			TLSCert: path.Join(defaults.BaseDataPath(), "proxy", "server.crt"),
+			TLSKey:  path.Join(defaults.BaseDataPath(), "proxy", "server.key"),
+			TLS:     true,
+		},
+		Service: Service{
+			Name:      "proxy",
+			Namespace: "com.owncloud.web",
+		},
+		Tracing: Tracing{
+			Type:      "jaeger",
+			Endpoint:  "",
+			Collector: "",
+			Service:   "proxy",
+		},
+		OIDC: OIDC{
+			Issuer:   "https://localhost:9200",
+			Insecure: true,
+			//Insecure: true,
+			UserinfoCache: Cache{
+				Size: 1024,
+				TTL:  10,
+			},
+		},
+		TokenManager: TokenManager{
+			JWTSecret: "Pive-Fumkiu4",
+		},
+		PolicySelector: nil,
+		Reva: Reva{
+			Address: "127.0.0.1:9142",
+		},
+		PreSignedURL: PreSignedURL{
+			AllowedHTTPMethods: []string{"GET"},
+			Enabled:            true,
+		},
+		AccountBackend:    "accounts",
+		UserOIDCClaim:     "email",
+		UserCS3Claim:      "mail",
+		MachineAuthAPIKey: "change-me-please",
+		//AutoprovisionAccounts: false,
+		//EnableBasicAuth:       false,
+		//InsecureBackends:      false,
+		Context: nil,
+	}
+}

proxy/pkg/flagset/flagset.go

@@ -1,306 +1,11 @@
 package flagset
 
 import (
-	"path"
-
-	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
-// RootWithConfig applies cfg to the root flagset
-func RootWithConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "log-level",
-			Usage:       "Set logging level",
-			EnvVars:     []string{"PROXY_LOG_LEVEL", "OCIS_LOG_LEVEL"},
-			Destination: &cfg.Log.Level,
-		},
-		&cli.BoolFlag{
-			Name:        "log-pretty",
-			Usage:       "Enable pretty logging",
-			EnvVars:     []string{"PROXY_LOG_PRETTY", "OCIS_LOG_PRETTY"},
-			Destination: &cfg.Log.Pretty,
-		},
-		&cli.BoolFlag{
-			Name:        "log-color",
-			Usage:       "Enable colored logging",
-			EnvVars:     []string{"PROXY_LOG_COLOR", "OCIS_LOG_COLOR"},
-			Destination: &cfg.Log.Color,
-		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
-	}
-}
-
-// HealthWithConfig applies cfg to the root flagset
-func HealthWithConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "debug-addr",
-			Value:       flags.OverrideDefaultString(cfg.Debug.Addr, "127.0.0.1:9109"),
-			Usage:       "Address to debug endpoint",
-			EnvVars:     []string{"PROXY_DEBUG_ADDR"},
-			Destination: &cfg.Debug.Addr,
-		},
-	}
-}
-
-// ServerWithConfig applies cfg to the root flagset
-func ServerWithConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "log-file",
-			Usage:       "Enable log to file",
-			EnvVars:     []string{"PROXY_LOG_FILE", "OCIS_LOG_FILE"},
-			Destination: &cfg.Log.File,
-		},
-		&cli.StringFlag{
-			Name:        "config-file",
-			Value:       "",
-			Usage:       "Path to config file",
-			EnvVars:     []string{"PROXY_CONFIG_FILE"},
-			Destination: &cfg.File,
-		},
-		&cli.BoolFlag{
-			Name:        "tracing-enabled",
-			Usage:       "Enable sending traces",
-			EnvVars:     []string{"PROXY_TRACING_ENABLED", "OCIS_TRACING_ENABLED"},
-			Destination: &cfg.Tracing.Enabled,
-		},
-		&cli.StringFlag{
-			Name:        "tracing-type",
-			Value:       flags.OverrideDefaultString(cfg.Tracing.Type, "jaeger"),
-			Usage:       "Tracing backend type",
-			EnvVars:     []string{"PROXY_TRACING_TYPE", "OCIS_TRACING_TYPE"},
-			Destination: &cfg.Tracing.Type,
-		},
-		&cli.StringFlag{
-			Name:        "tracing-endpoint",
-			Value:       "",
-			Usage:       "Endpoint for the agent",
-			EnvVars:     []string{"PROXY_TRACING_ENDPOINT", "OCIS_TRACING_ENDPOINT"},
-			Destination: &cfg.Tracing.Endpoint,
-		},
-		&cli.StringFlag{
-			Name:        "tracing-collector",
-			Value:       "",
-			Usage:       "Endpoint for the collector",
-			EnvVars:     []string{"PROXY_TRACING_COLLECTOR", "OCIS_TRACING_COLLECTOR"},
-			Destination: &cfg.Tracing.Collector,
-		},
-		&cli.StringFlag{
-			Name:        "tracing-service",
-			Value:       flags.OverrideDefaultString(cfg.Tracing.Service, "proxy"),
-			Usage:       "Service name for tracing",
-			EnvVars:     []string{"PROXY_TRACING_SERVICE"},
-			Destination: &cfg.Tracing.Service,
-		},
-		&cli.StringFlag{
-			Name:        "debug-addr",
-			Value:       flags.OverrideDefaultString(cfg.Debug.Addr, "127.0.0.1:9205"),
-			Usage:       "Address to bind debug server",
-			EnvVars:     []string{"PROXY_DEBUG_ADDR"},
-			Destination: &cfg.Debug.Addr,
-		},
-		&cli.StringFlag{
-			Name:        "debug-token",
-			Value:       "",
-			Usage:       "Token to grant metrics access",
-			EnvVars:     []string{"PROXY_DEBUG_TOKEN"},
-			Destination: &cfg.Debug.Token,
-		},
-		&cli.BoolFlag{
-			Name:        "debug-pprof",
-			Usage:       "Enable pprof debugging",
-			EnvVars:     []string{"PROXY_DEBUG_PPROF"},
-			Destination: &cfg.Debug.Pprof,
-		},
-		&cli.BoolFlag{
-			Name:        "debug-zpages",
-			Usage:       "Enable zpages debugging",
-			EnvVars:     []string{"PROXY_DEBUG_ZPAGES"},
-			Destination: &cfg.Debug.Zpages,
-		},
-		&cli.StringFlag{
-			Name:        "http-addr",
-			Value:       flags.OverrideDefaultString(cfg.HTTP.Addr, "0.0.0.0:9200"),
-			Usage:       "Address to bind http server",
-			EnvVars:     []string{"PROXY_HTTP_ADDR"},
-			Destination: &cfg.HTTP.Addr,
-		},
-		&cli.StringFlag{
-			Name:        "http-root",
-			Value:       flags.OverrideDefaultString(cfg.HTTP.Root, "/"),
-			Usage:       "Root path of http server",
-			EnvVars:     []string{"PROXY_HTTP_ROOT"},
-			Destination: &cfg.HTTP.Root,
-		},
-		&cli.StringFlag{
-			Name:        "service-namespace",
-			Value:       flags.OverrideDefaultString(cfg.Service.Namespace, "com.owncloud.web"),
-			Usage:       "Set the base namespace for the service namespace",
-			EnvVars:     []string{"PROXY_SERVICE_NAMESPACE"},
-			Destination: &cfg.Service.Namespace,
-		},
-		&cli.StringFlag{
-			Name:        "service-name",
-			Value:       flags.OverrideDefaultString(cfg.Service.Name, "proxy"),
-			Usage:       "Service name",
-			EnvVars:     []string{"PROXY_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
-		&cli.StringFlag{
-			Name:        "transport-tls-cert",
-			Value:       flags.OverrideDefaultString(cfg.HTTP.TLSCert, path.Join(defaults.BaseDataPath(), "proxy", "server.crt")),
-			Usage:       "Certificate file for transport encryption",
-			EnvVars:     []string{"PROXY_TRANSPORT_TLS_CERT"},
-			Destination: &cfg.HTTP.TLSCert,
-		},
-		&cli.StringFlag{
-			Name:        "transport-tls-key",
-			Value:       flags.OverrideDefaultString(cfg.HTTP.TLSKey, path.Join(defaults.BaseDataPath(), "proxy", "server.key")),
-			Usage:       "Secret file for transport encryption",
-			EnvVars:     []string{"PROXY_TRANSPORT_TLS_KEY"},
-			Destination: &cfg.HTTP.TLSKey,
-		},
-		&cli.BoolFlag{
-			Name:        "tls",
-			Value:       flags.OverrideDefaultBool(cfg.HTTP.TLS, true),
-			Usage:       "Use TLS (disable only if proxy is behind a TLS-terminating reverse-proxy).",
-			EnvVars:     []string{"PROXY_TLS"},
-			Destination: &cfg.HTTP.TLS,
-		},
-		&cli.StringFlag{
-			Name:        "jwt-secret",
-			Value:       flags.OverrideDefaultString(cfg.TokenManager.JWTSecret, "Pive-Fumkiu4"),
-			Usage:       "Used to create JWT to talk to reva, should equal reva's jwt-secret",
-			EnvVars:     []string{"PROXY_JWT_SECRET", "OCIS_JWT_SECRET"},
-			Destination: &cfg.TokenManager.JWTSecret,
-		},
-		&cli.StringFlag{
-			Name:        "reva-gateway-addr",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"),
-			Usage:       "Address of REVA gateway endpoint",
-			EnvVars:     []string{"REVA_GATEWAY"},
-			Destination: &cfg.Reva.Address,
-		},
-		&cli.BoolFlag{
-			Name:        "insecure",
-			Value:       flags.OverrideDefaultBool(cfg.InsecureBackends, false),
-			Usage:       "allow insecure communication to upstream servers",
-			EnvVars:     []string{"PROXY_INSECURE_BACKENDS"},
-			Destination: &cfg.InsecureBackends,
-		},
-
-		// OIDC
-
-		&cli.StringFlag{
-			Name:        "oidc-issuer",
-			Value:       flags.OverrideDefaultString(cfg.OIDC.Issuer, "https://localhost:9200"),
-			Usage:       "OIDC issuer",
-			EnvVars:     []string{"PROXY_OIDC_ISSUER", "OCIS_URL"}, // PROXY_OIDC_ISSUER takes precedence over OCIS_URL
-			Destination: &cfg.OIDC.Issuer,
-		},
-		&cli.BoolFlag{
-			Name:        "oidc-insecure",
-			Value:       flags.OverrideDefaultBool(cfg.OIDC.Insecure, true),
-			Usage:       "OIDC allow insecure communication",
-			EnvVars:     []string{"PROXY_OIDC_INSECURE"},
-			Destination: &cfg.OIDC.Insecure,
-		},
-		&cli.IntFlag{
-			Name:        "oidc-userinfo-cache-tll",
-			Value:       flags.OverrideDefaultInt(cfg.OIDC.UserinfoCache.TTL, 10),
-			Usage:       "Fallback TTL in seconds for caching userinfo, when no token lifetime can be identified",
-			EnvVars:     []string{"PROXY_OIDC_USERINFO_CACHE_TTL"},
-			Destination: &cfg.OIDC.UserinfoCache.TTL,
-		},
-		&cli.IntFlag{
-			Name:        "oidc-userinfo-cache-size",
-			Value:       flags.OverrideDefaultInt(cfg.OIDC.UserinfoCache.Size, 1024),
-			Usage:       "Max entries for caching userinfo",
-			EnvVars:     []string{"PROXY_OIDC_USERINFO_CACHE_SIZE"},
-			Destination: &cfg.OIDC.UserinfoCache.Size,
-		},
-
-		// account related config
-
-		&cli.BoolFlag{
-			Name:        "autoprovision-accounts",
-			Value:       flags.OverrideDefaultBool(cfg.AutoprovisionAccounts, false),
-			Usage:       "create accounts from OIDC access tokens to learn new users",
-			EnvVars:     []string{"PROXY_AUTOPROVISION_ACCOUNTS"},
-			Destination: &cfg.AutoprovisionAccounts,
-		},
-		&cli.StringFlag{
-			Name:        "user-oidc-claim",
-			Value:       flags.OverrideDefaultString(cfg.UserOIDCClaim, "email"),
-			Usage:       "The OIDC claim that is used to identify users, eg. 'ownclouduuid', 'uid', 'cn' or 'email'",
-			EnvVars:     []string{"PROXY_USER_OIDC_CLAIM"},
-			Destination: &cfg.UserOIDCClaim,
-		},
-		&cli.StringFlag{
-			Name:        "user-cs3-claim",
-			Value:       flags.OverrideDefaultString(cfg.UserCS3Claim, "mail"),
-			Usage:       "The CS3 claim to use when looking up a user in the CS3 users API, eg. 'userid', 'username' or 'mail'",
-			EnvVars:     []string{"PROXY_USER_CS3_CLAIM"},
-			Destination: &cfg.UserCS3Claim,
-		},
-
-		// Pre Signed URLs
-		&cli.StringSliceFlag{
-			Name:    "presignedurl-allow-method",
-			Value:   cli.NewStringSlice("GET"),
-			Usage:   "--presignedurl-allow-method GET [--presignedurl-allow-method POST]",
-			EnvVars: []string{"PRESIGNEDURL_ALLOWED_METHODS"},
-		},
-		&cli.BoolFlag{
-			Name:        "enable-presignedurls",
-			Value:       flags.OverrideDefaultBool(cfg.PreSignedURL.Enabled, true),
-			Usage:       "Enable or disable handling the presigned urls in the proxy",
-			EnvVars:     []string{"PROXY_ENABLE_PRESIGNEDURLS"},
-			Destination: &cfg.PreSignedURL.Enabled,
-		},
-
-		// Basic auth
-		&cli.BoolFlag{
-			Name:        "enable-basic-auth",
-			Value:       flags.OverrideDefaultBool(cfg.EnableBasicAuth, false),
-			Usage:       "enable basic authentication",
-			EnvVars:     []string{"PROXY_ENABLE_BASIC_AUTH"},
-			Destination: &cfg.EnableBasicAuth,
-		},
-
-		&cli.StringFlag{
-			Name:        "account-backend-type",
-			Value:       flags.OverrideDefaultString(cfg.AccountBackend, "accounts"),
-			Usage:       "account-backend-type",
-			EnvVars:     []string{"PROXY_ACCOUNT_BACKEND_TYPE"},
-			Destination: &cfg.AccountBackend,
-		},
-
-		&cli.StringFlag{
-			Name:        "machine-auth-api-key",
-			Value:       flags.OverrideDefaultString(cfg.MachineAuthAPIKey, "change-me-please"),
-			Usage:       "the API key to be used for the machine auth driver in reva",
-			EnvVars:     []string{"PROXY_MACHINE_AUTH_API_KEY", "OCIS_MACHINE_AUTH_API_KEY"},
-			Destination: &cfg.MachineAuthAPIKey,
-		},
-
-		// Reva Middlewares Config
-		&cli.StringSliceFlag{
-			Name:    "proxy-user-agent-lock-in",
-			Usage:   "--user-agent-whitelist-lock-in=mirall:basic,foo:bearer Given a tuple of [UserAgent:challenge] it locks a given user agent to the authentication challenge. Particularly useful for old clients whose USer-Agent is known and only support one authentication challenge. When this flag is set in the proxy it configures the authentication middlewares.",
-			EnvVars: []string{"PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT"},
-		},
-	}
-}
-
 // ListProxyWithConfig applies the config to the list commands flags.
 func ListProxyWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{