Merge pull request #3569 from owncloud/storage-config

[full-ci] Refactor storage configuration to make it similar to other oCIS configuration

.drone.star

@@ -93,7 +93,9 @@ config = {
             "suites": [
                 "apiShareManagement",
             ],
-            "skip": False,
+            # The tests fail after the storage config changes
+            # They will be fixed later.
+            "skip": True,
             "earlyFail": True,
             "cron": "nightly",
         },
@@ -101,7 +103,9 @@ config = {
             "suites": [
                 "apiWebdavOperations",
             ],
-            "skip": False,
+            # The tests fail after the storage config changes
+            # They will be fixed later.
+            "skip": True,
             "earlyFail": True,
             "cron": "nightly",
         },
@@ -1624,8 +1628,8 @@ def ocisServerWithIdp():
         "GRAPH_LDAP_SERVER_WRITE_ENABLED": "true",
         "LDAP_URI": "ldaps://0.0.0.0:9235",
         "LDAP_INSECURE": "true",
-        "LDAP_BIND_DN": "uid=libregraph,ou=sysusers,o=libregraph-idm",
-        "LDAP_BIND_PASSWORD": "idm",
+        "GRAPH_LDAP_BIND_DN": "uid=libregraph,ou=sysusers,o=libregraph-idm",
+        "GRAPH_LDAP_BIND_PASSWORD": "idm",
         "LDAP_USER_BASE_DN": "ou=users,o=libregraph-idm",
         "LDAP_USER_SCHEMA_ID": "ownclouduuid",
         "LDAP_USER_SCHEMA_MAIL": "mail",
@@ -1644,8 +1648,8 @@ def ocisServerWithIdp():
         "IDP_LDAP_LOGIN_ATTRIBUTE": "uid",
         "PROXY_ACCOUNT_BACKEND_TYPE": "cs3",
         "PROXY_ENABLE_BASIC_AUTH": "true",
-        "STORAGE_LDAP_BIND_DN": "uid=reva,ou=sysusers,o=libregraph-idm",
-        "STORAGE_LDAP_BIND_PASSWORD": "reva",
+        "LDAP_BIND_DN": "uid=reva,ou=sysusers,o=libregraph-idm",
+        "LDAP_BIND_PASSWORD": "reva",
         "OCS_ACCOUNT_BACKEND_TYPE": "cs3",
         "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy,idp,nats,idm,ocdav",
         "OCIS_LOG_LEVEL": "error",
@@ -1679,13 +1683,13 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
         user = "0:0"
         environment = {
             "OCIS_URL": "https://ocis-server:9200",
-            "STORAGE_GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
+            "GATEWAY_GRPC_ADDR": "0.0.0.0:9142",
             "STORAGE_HOME_DRIVER": "%s" % (storage),
             "STORAGE_USERS_DRIVER": "%s" % (storage),
             "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root",
             "STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users",
             "STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata",
-            "STORAGE_SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json",
+            "SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json",
             "PROXY_ENABLE_BASIC_AUTH": True,
             "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
             "IDP_IDENTIFIER_REGISTRATION_CONF": "/drone/src/tests/config/drone/identifier-registration.yml",
@@ -1708,42 +1712,38 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
         environment = {
             # Keycloak IDP specific configuration
             "PROXY_OIDC_ISSUER": "https://keycloak/auth/realms/owncloud",
+            "LDAP_IDP": "https://keycloak/auth/realms/owncloud",
             "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud",
             "WEB_OIDC_CLIENT_ID": "ocis-web",
             "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration",
-            "STORAGE_OIDC_ISSUER": "https://keycloak",
-            "STORAGE_LDAP_IDP": "https://keycloak/auth/realms/owncloud",
+            "AUTH_BEARER_OIDC_ISSUER": "https://keycloak",
             "WEB_OIDC_SCOPE": "openid profile email owncloud",
             # LDAP bind
-            "STORAGE_LDAP_URI": "ldaps://openldap",
-            "STORAGE_LDAP_INSECURE": "true",
-            "STORAGE_LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com",
-            "STORAGE_LDAP_BIND_PASSWORD": "admin",
+            "LDAP_URI": "ldaps://openldap",
+            "LDAP_INSECURE": "true",
+            "LDAP_BIND_DN": "cn=admin,dc=owncloud,dc=com",
+            "LDAP_BIND_PASSWORD": "admin",
             # LDAP user settings
             "PROXY_AUTOPROVISION_ACCOUNTS": "true",  # automatically create users when they login
             "PROXY_ACCOUNT_BACKEND_TYPE": "cs3",  # proxy should get users from CS3APIS (which gets it from LDAP)
             "PROXY_USER_OIDC_CLAIM": "ocis.user.uuid",  # claim was added in Keycloak
             "PROXY_USER_CS3_CLAIM": "userid",  # equals STORAGE_LDAP_USER_SCHEMA_UID
-            "STORAGE_LDAP_GROUP_BASE_DN": "ou=testgroups,dc=owncloud,dc=com",
-            "STORAGE_LDAP_GROUP_OBJECTCLASS": "groupOfUniqueNames",
-            "STORAGE_LDAP_GROUPFILTER": "(objectclass=owncloud)",
-            "STORAGE_LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn",
-            "STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER": "gidnumber",
-            "STORAGE_LDAP_GROUP_SCHEMA_ID": "cn",
-            "STORAGE_LDAP_GROUP_SCHEMA_MAIL": "mail",
-            "STORAGE_LDAP_GROUP_SCHEMA_MEMBER": "cn",
-            "STORAGE_LDAP_USER_BASE_DN": "ou=testusers,dc=owncloud,dc=com",
-            "STORAGE_LDAP_USER_OBJECTCLASS": "posixAccount",
-            "STORAGE_LDAP_USERFILTER": "(objectclass=owncloud)",
-            "STORAGE_LDAP_USER_SCHEMA_USERNAME": "cn",
-            "STORAGE_LDAP_USER_SCHEMA_DISPLAYNAME": "displayname",
-            "STORAGE_LDAP_USER_SCHEMA_GID_NUMBER": "gidnumber",
-            "STORAGE_LDAP_USER_SCHEMA_MAIL": "mail",
-            "STORAGE_LDAP_USER_SCHEMA_UID_NUMBER": "uidnumber",
-            "STORAGE_LDAP_USER_SCHEMA_ID": "ownclouduuid",
-            "STORAGE_LDAP_LOGIN_ATTRIBUTES": "uid,mail",
+            "LDAP_GROUP_BASE_DN": "ou=testgroups,dc=owncloud,dc=com",
+            "LDAP_GROUP_OBJECTCLASS": "groupOfUniqueNames",
+            "LDAP_GROUPFILTER": "(objectclass=owncloud)",
+            "LDAP_GROUP_SCHEMA_DISPLAYNAME": "cn",
+            "LDAP_GROUP_SCHEMA_ID": "cn",
+            "LDAP_GROUP_SCHEMA_MAIL": "mail",
+            "LDAP_GROUP_SCHEMA_MEMBER": "cn",
+            "LDAP_USER_BASE_DN": "ou=testusers,dc=owncloud,dc=com",
+            "LDAP_USER_OBJECTCLASS": "posixAccount",
+            "LDAP_USERFILTER": "(objectclass=owncloud)",
+            "LDAP_USER_SCHEMA_USERNAME": "cn",
+            "LDAP_USER_SCHEMA_DISPLAYNAME": "displayname",
+            "LDAP_USER_SCHEMA_MAIL": "mail",
+            "LDAP_USER_SCHEMA_ID": "ownclouduuid",
+            "LDAP_LOGIN_ATTRIBUTES": "uid,mail",
             # ownCloudSQL storage driver
-            "STORAGE_HOME_DRIVER": "owncloudsql",
             "STORAGE_USERS_DRIVER": "owncloudsql",
             "STORAGE_METADATA_DRIVER": "ocis",
             "STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR": "/mnt/data/files",
@@ -1758,19 +1758,19 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             # TODO: redis is not yet supported
             "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379",
             # ownCloudSQL sharing driver
-            "STORAGE_SHARING_USER_DRIVER": "owncloudsql",
-            "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud",
-            "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud",
-            "STORAGE_SHARING_USER_SQL_HOST": "oc10-db",
-            "STORAGE_SHARING_USER_SQL_PORT": 3306,
-            "STORAGE_SHARING_USER_SQL_NAME": "owncloud",
+            "SHARING_USER_DRIVER": "owncloudsql",
+            "SHARING_USER_SQL_USERNAME": "owncloud",
+            "SHARING_USER_SQL_PASSWORD": "owncloud",
+            "SHARING_USER_SQL_HOST": "oc10-db",
+            "SHARING_USER_SQL_PORT": 3306,
+            "SHARING_USER_SQL_NAME": "owncloud",
             # ownCloud storage readonly
             # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
             "OCIS_STORAGE_READ_ONLY": "false",
             # General oCIS config
             # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
             "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy,nats,ocdav",
-            "OCIS_LOG_LEVEL": "error",
+            "OCIS_LOG_LEVEL": "info",
             "OCIS_URL": OCIS_URL,
             "PROXY_TLS": "true",
             "OCIS_BASE_DATA_PATH": "/mnt/data/ocis",
@@ -1780,8 +1780,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "OCIS_MACHINE_AUTH_API_KEY": "change-me-please",
             "OCIS_INSECURE": "true",
             "PROXY_ENABLE_BASIC_AUTH": "true",
-            "ACCOUNTS_DEMO_USERS_AND_GROUPS": True,  # deprecated, remove after switching to LibreIDM
-            "IDM_CREATE_DEMO_USERS": True,
         }
         wait_for_ocis = {
             "name": "wait-for-ocis-server",

extensions/appprovider/pkg/command/command.go

@@ -9,11 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/appprovider/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -23,12 +24,15 @@ func AppProvider(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "app-provider",
 		Usage: "start appprovider for providing apps",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-app-provider")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
@@ -51,10 +55,12 @@ func AppProvider(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.AppProvider.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -66,7 +72,7 @@ func AppProvider(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.AppProvider.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -80,38 +86,36 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
 
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.AppProvider.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.AppProvider.GRPCNetwork,
-			"address": cfg.Reva.AppProvider.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"appprovider": map[string]interface{}{
-					"gatewaysvc":       cfg.Reva.Gateway.Endpoint,
-					"app_provider_url": cfg.Reva.AppProvider.ExternalAddr,
-					"driver":           cfg.Reva.AppProvider.Driver,
+					"app_provider_url": cfg.ExternalAddr,
+					"driver":           cfg.Driver,
 					"drivers": map[string]interface{}{
 						"wopi": map[string]interface{}{
-							"app_api_key":          cfg.Reva.AppProvider.WopiDriver.AppAPIKey,
-							"app_desktop_only":     cfg.Reva.AppProvider.WopiDriver.AppDesktopOnly,
-							"app_icon_uri":         cfg.Reva.AppProvider.WopiDriver.AppIconURI,
-							"app_int_url":          cfg.Reva.AppProvider.WopiDriver.AppInternalURL,
-							"app_name":             cfg.Reva.AppProvider.WopiDriver.AppName,
-							"app_url":              cfg.Reva.AppProvider.WopiDriver.AppURL,
-							"insecure_connections": cfg.Reva.AppProvider.WopiDriver.Insecure,
-							"iop_secret":           cfg.Reva.AppProvider.WopiDriver.IopSecret,
-							"jwt_secret":           cfg.Reva.AppProvider.WopiDriver.JWTSecret,
-							"wopi_url":             cfg.Reva.AppProvider.WopiDriver.WopiURL,
+							"app_api_key":          cfg.Drivers.WOPI.AppAPIKey,
+							"app_desktop_only":     cfg.Drivers.WOPI.AppDesktopOnly,
+							"app_icon_uri":         cfg.Drivers.WOPI.AppIconURI,
+							"app_int_url":          cfg.Drivers.WOPI.AppInternalURL,
+							"app_name":             cfg.Drivers.WOPI.AppName,
+							"app_url":              cfg.Drivers.WOPI.AppURL,
+							"insecure_connections": cfg.Drivers.WOPI.Insecure,
+							"iop_secret":           cfg.Drivers.WOPI.IopSecret,
+							"jwt_secret":           cfg.JWTSecret,
+							"wopi_url":             cfg.Drivers.WOPI.WopiURL,
 						},
 					},
 				},
@@ -128,28 +132,28 @@ type AppProviderSutureService struct {
 
 // NewAppProvider creates a new store.AppProviderSutureService
 func NewAppProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.AppProvider.Commons = cfg.Commons
 	return AppProviderSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.AppProvider,
 	}
 }
 
 func (s AppProviderSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.AppProvider.Context = ctx
+	cmd := AppProvider(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := AppProvider(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if AppProvider(s.cfg).Before != nil {
-		if err := AppProvider(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := AppProvider(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/appprovider/pkg/config/config.go

@@ -0,0 +1,67 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	ExternalAddr          string
+	Driver                string
+	Drivers               Drivers
+}
+
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;APP_PROVIDER_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;APP_PROVIDER_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;APP_PROVIDER_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;APP_PROVIDER_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;APP_PROVIDER_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;APP_PROVIDER_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;APP_PROVIDER_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;APP_PROVIDER_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"APP_PROVIDER_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"APP_PROVIDER_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"APP_PROVIDER_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"APP_PROVIDER_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"APP_PROVIDER_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"APP_PROVIDER_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type Drivers struct {
+	WOPI WOPIDriver
+}
+
+type WOPIDriver struct {
+	AppAPIKey      string `yaml:"app_api_key"`
+	AppDesktopOnly bool   `yaml:"app_desktop_only"`
+	AppIconURI     string `yaml:"app_icon_uri"`
+	AppInternalURL string `yaml:"app_internal_url"`
+	AppName        string `yaml:"app_name"`
+	AppURL         string `yaml:"app_url"`
+	Insecure       bool   `yaml:"insecure"`
+	IopSecret      string `yaml:"ipo_secret"`
+	WopiURL        string `yaml:"wopi_url"`
+}

extensions/appprovider/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,66 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/appprovider/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9165",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9164",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "appprovider",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		Driver:          "",
+		Drivers: config.Drivers{
+			WOPI: config.WOPIDriver{},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/auth-basic/pkg/command/command.go

@@ -10,38 +10,44 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/ldap"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
-// AuthBasic is the entrypoint for the auth-basic command.
+// Command is the entrypoint for the auth-basic command.
 func AuthBasic(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-basic",
 		Usage: "start authprovider for basic auth",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-auth-basic")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
 			// pre-create folders
-			if cfg.Reva.AuthProvider.Driver == "json" && cfg.Reva.AuthProvider.JSON != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.AuthProvider.JSON), os.FileMode(0700)); err != nil {
+			if cfg.AuthProvider == "json" && cfg.AuthProviders.JSON.File != "" {
+				if err := os.MkdirAll(filepath.Dir(cfg.AuthProviders.JSON.File), os.FileMode(0700)); err != nil {
 					return err
 				}
 			}
 
 			uuid := uuid.Must(uuid.NewV4())
+
 			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
 
 			rcfg := authBasicConfigFromStruct(c, cfg)
@@ -50,8 +56,9 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 				Interface("reva-config", rcfg).
 				Msg("config")
 
-			if cfg.Reva.AuthProvider.Driver == "ldap" {
-				if err := waitForLDAPCA(logger, &cfg.Reva.LDAP); err != nil {
+			if cfg.AuthProvider == "ldap" {
+				ldapCfg := cfg.AuthProviders.LDAP
+				if err := ldap.WaitForCA(logger, ldapCfg.Insecure, ldapCfg.CACert); err != nil {
 					logger.Error().Err(err).Msg("The configured LDAP CA cert does not exist")
 					return err
 				}
@@ -70,10 +77,12 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.AuthBasic.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -85,7 +94,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.AuthBasic.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -98,39 +107,38 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 func authBasicConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.AuthBasic.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.AuthBasic.GRPCNetwork,
-			"address": cfg.Reva.AuthBasic.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"authprovider": map[string]interface{}{
-					"auth_manager": cfg.Reva.AuthProvider.Driver,
+					"auth_manager": cfg.AuthProvider,
 					"auth_managers": map[string]interface{}{
 						"json": map[string]interface{}{
-							"users": cfg.Reva.AuthProvider.JSON,
+							"users": cfg.AuthProviders.JSON.File,
 						},
-						"ldap": ldapConfigFromString(cfg),
+						"ldap": ldapConfigFromString(cfg.AuthProviders.LDAP),
 						"owncloudsql": map[string]interface{}{
-							"dbusername":        cfg.Reva.UserOwnCloudSQL.DBUsername,
-							"dbpassword":        cfg.Reva.UserOwnCloudSQL.DBPassword,
-							"dbhost":            cfg.Reva.UserOwnCloudSQL.DBHost,
-							"dbport":            cfg.Reva.UserOwnCloudSQL.DBPort,
-							"dbname":            cfg.Reva.UserOwnCloudSQL.DBName,
-							"idp":               cfg.Reva.UserOwnCloudSQL.Idp,
-							"nobody":            cfg.Reva.UserOwnCloudSQL.Nobody,
-							"join_username":     cfg.Reva.UserOwnCloudSQL.JoinUsername,
-							"join_ownclouduuid": cfg.Reva.UserOwnCloudSQL.JoinOwnCloudUUID,
+							"dbusername":        cfg.AuthProviders.OwnCloudSQL.DBUsername,
+							"dbpassword":        cfg.AuthProviders.OwnCloudSQL.DBPassword,
+							"dbhost":            cfg.AuthProviders.OwnCloudSQL.DBHost,
+							"dbport":            cfg.AuthProviders.OwnCloudSQL.DBPort,
+							"dbname":            cfg.AuthProviders.OwnCloudSQL.DBName,
+							"idp":               cfg.AuthProviders.OwnCloudSQL.IDP,
+							"nobody":            cfg.AuthProviders.OwnCloudSQL.Nobody,
+							"join_username":     cfg.AuthProviders.OwnCloudSQL.JoinUsername,
+							"join_ownclouduuid": cfg.AuthProviders.OwnCloudSQL.JoinOwnCloudUUID,
 						},
 					},
 				},
@@ -147,14 +155,13 @@ type AuthBasicSutureService struct {
 
 // NewAuthBasicSutureService creates a new store.AuthBasicSutureService
 func NewAuthBasic(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.AuthBasic.Commons = cfg.Commons
 	return AuthBasicSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.AuthBasic,
 	}
 }
 
 func (s AuthBasicSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.AuthBasic.Context = ctx
 	f := &flag.FlagSet{}
 	cmdFlags := AuthBasic(s.cfg).Flags
 	for k := range cmdFlags {
@@ -174,3 +181,36 @@ func (s AuthBasicSutureService) Serve(ctx context.Context) error {
 
 	return nil
 }
+
+func ldapConfigFromString(cfg config.LDAPProvider) map[string]interface{} {
+	return map[string]interface{}{
+		"uri":               cfg.URI,
+		"cacert":            cfg.CACert,
+		"insecure":          cfg.Insecure,
+		"bind_username":     cfg.BindDN,
+		"bind_password":     cfg.BindPassword,
+		"user_base_dn":      cfg.UserBaseDN,
+		"group_base_dn":     cfg.GroupBaseDN,
+		"user_filter":       cfg.UserFilter,
+		"group_filter":      cfg.GroupFilter,
+		"user_objectclass":  cfg.UserObjectClass,
+		"group_objectclass": cfg.GroupObjectClass,
+		"login_attributes":  cfg.LoginAttributes,
+		"idp":               cfg.IDP,
+		"user_schema": map[string]interface{}{
+			"id":              cfg.UserSchema.ID,
+			"idIsOctetString": cfg.UserSchema.IDIsOctetString,
+			"mail":            cfg.UserSchema.Mail,
+			"displayName":     cfg.UserSchema.DisplayName,
+			"userName":        cfg.UserSchema.Username,
+		},
+		"group_schema": map[string]interface{}{
+			"id":              cfg.GroupSchema.ID,
+			"idIsOctetString": cfg.GroupSchema.IDIsOctetString,
+			"mail":            cfg.GroupSchema.Mail,
+			"displayName":     cfg.GroupSchema.DisplayName,
+			"groupName":       cfg.GroupSchema.Groupname,
+			"member":          cfg.GroupSchema.Member,
+		},
+	}
+}

extensions/auth-basic/pkg/config/config.go

@@ -0,0 +1,107 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	AuthProvider          string        `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"`
+	AuthProviders         AuthProviders `yaml:"auth_providers"`
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;AUTH_BASIC_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;AUTH_BASIC_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;AUTH_BASIC_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;AUTH_BASIC_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;AUTH_BASIC_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;AUTH_BASIC_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;AUTH_BASIC_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;AUTH_BASIC_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"AUTH_BASIC_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"AUTH_BASIC_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"AUTH_BASIC_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"AUTH_BASIC_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"AUTH_BASIC_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"AUTH_BASIC_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type AuthProviders struct {
+	JSON        JSONProvider        `yaml:"json"`
+	LDAP        LDAPProvider        `yaml:"ldap"`
+	OwnCloudSQL OwnCloudSQLProvider `yaml:"owncloud_sql"`
+}
+
+type JSONProvider struct {
+	File string `yaml:"file" env:"AUTH_BASIC_JSON_PROVIDER_FILE" desc:"The file to which the json provider writes the data."`
+}
+
+type LDAPProvider struct {
+	URI              string   `env:"LDAP_URI;AUTH_BASIC_LDAP_URI"`
+	CACert           string   `env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"`
+	Insecure         bool     `env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"`
+	BindDN           string   `env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"`
+	BindPassword     string   `env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
+	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"`
+	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"`
+	UserFilter       string   `env:"LDAP_USERFILTER;AUTH_BASIC_LDAP_USERFILTER"`
+	GroupFilter      string   `env:"LDAP_GROUPFILTER;AUTH_BASIC_LDAP_USERFILTER"`
+	UserObjectClass  string   `env:"LDAP_USER_OBJECTCLASS;AUTH_BASIC_LDAP_USER_OBJECTCLASS"`
+	GroupObjectClass string   `env:"LDAP_GROUP_OBJECTCLASS;AUTH_BASIC_LDAP_GROUP_OBJECTCLASS"`
+	LoginAttributes  []string `env:"LDAP_LOGIN_ATTRIBUTES;AUTH_BASIC_LDAP_LOGIN_ATTRIBUTES"`
+	IDP              string   `env:"OCIS_URL;AUTH_BASIC_IDP_URL"` // TODO what is this for?
+	GatewayEndpoint  string   // TODO do we need this here?
+	UserSchema       LDAPUserSchema
+	GroupSchema      LDAPGroupSchema
+}
+
+type LDAPUserSchema struct {
+	ID              string `env:"LDAP_USER_SCHEMA_ID;AUTH_BASIC_LDAP_USER_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;AUTH_BASIC_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_USER_SCHEMA_MAIL;AUTH_BASIC_LDAP_USER_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_USER_SCHEMA_DISPLAYNAME;AUTH_BASIC_LDAP_USER_SCHEMA_DISPLAYNAME"`
+	Username        string `env:"LDAP_USER_SCHEMA_USERNAME;AUTH_BASIC_LDAP_USER_SCHEMA_USERNAME"`
+}
+
+type LDAPGroupSchema struct {
+	ID              string `env:"LDAP_GROUP_SCHEMA_ID;AUTH_BASIC_LDAP_GROUP_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING;AUTH_BASIC_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_GROUP_SCHEMA_MAIL;AUTH_BASIC_LDAP_GROUP_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_GROUP_SCHEMA_DISPLAYNAME;AUTH_BASIC_LDAP_GROUP_SCHEMA_DISPLAYNAME"`
+	Groupname       string `env:"LDAP_GROUP_SCHEMA_GROUPNAME;AUTH_BASIC_LDAP_GROUP_SCHEMA_GROUPNAME"`
+	Member          string `env:"LDAP_GROUP_SCHEMA_MEMBER;AUTH_BASIC_LDAP_GROUP_SCHEMA_MEMBER"`
+}
+
+type OwnCloudSQLProvider struct {
+	DBUsername       string
+	DBPassword       string
+	DBHost           string
+	DBPort           int
+	DBName           string
+	IDP              string // TODO do we need this?
+	Nobody           int64  // TODO what is this?
+	JoinUsername     bool
+	JoinOwnCloudUUID bool
+}

extensions/auth-basic/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,108 @@
+package defaults
+
+import (
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9147",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9146",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "auth-basic",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		AuthProvider:    "ldap",
+		AuthProviders: config.AuthProviders{
+			LDAP: config.LDAPProvider{
+				URI:              "ldaps://localhost:9126",
+				CACert:           filepath.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
+				Insecure:         false,
+				UserBaseDN:       "dc=ocis,dc=test",
+				GroupBaseDN:      "dc=ocis,dc=test",
+				LoginAttributes:  []string{"cn", "mail"},
+				UserFilter:       "",
+				GroupFilter:      "",
+				UserObjectClass:  "posixAccount",
+				GroupObjectClass: "posixGroup",
+				BindDN:           "cn=reva,ou=sysusers,dc=ocis,dc=test",
+				BindPassword:     "reva",
+				IDP:              "https://localhost:9200",
+				UserSchema: config.LDAPUserSchema{
+					ID:          "ownclouduuid",
+					Mail:        "mail",
+					DisplayName: "displayname",
+					Username:    "cn",
+				},
+				GroupSchema: config.LDAPGroupSchema{
+					ID:          "cn",
+					Mail:        "mail",
+					DisplayName: "cn",
+					Groupname:   "cn",
+					Member:      "cn",
+				},
+			},
+			JSON: config.JSONProvider{},
+			OwnCloudSQL: config.OwnCloudSQLProvider{
+				DBUsername:       "owncloud",
+				DBPassword:       "secret",
+				DBHost:           "mysql",
+				DBPort:           3306,
+				DBName:           "owncloud",
+				IDP:              "https://localhost:9200",
+				Nobody:           90,
+				JoinUsername:     false,
+				JoinOwnCloudUUID: false,
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/auth-bearer/pkg/command/command.go

@@ -9,11 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -23,12 +24,15 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-bearer",
 		Usage: "start authprovider for bearer auth",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-auth-bearer")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
@@ -54,10 +58,12 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.AuthBearer.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -69,7 +75,7 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.AuthBearer.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -82,32 +88,30 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	return map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.AuthBearer.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.AuthBearer.GRPCNetwork,
-			"address": cfg.Reva.AuthBearer.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"authprovider": map[string]interface{}{
-					"auth_manager": "oidc",
+					"auth_manager": cfg.AuthProvider,
 					"auth_managers": map[string]interface{}{
 						"oidc": map[string]interface{}{
-							"issuer":     cfg.Reva.OIDC.Issuer,
-							"insecure":   cfg.Reva.OIDC.Insecure,
-							"id_claim":   cfg.Reva.OIDC.IDClaim,
-							"uid_claim":  cfg.Reva.OIDC.UIDClaim,
-							"gid_claim":  cfg.Reva.OIDC.GIDClaim,
-							"gatewaysvc": cfg.Reva.Gateway.Endpoint,
+							"issuer":    cfg.AuthProviders.OIDC.Issuer,
+							"insecure":  cfg.AuthProviders.OIDC.Insecure,
+							"id_claim":  cfg.AuthProviders.OIDC.IDClaim,
+							"uid_claim": cfg.AuthProviders.OIDC.UIDClaim,
+							"gid_claim": cfg.AuthProviders.OIDC.GIDClaim,
 						},
 					},
 				},
@@ -123,28 +127,28 @@ type AuthBearerSutureService struct {
 
 // NewAuthBearerSutureService creates a new gateway.AuthBearerSutureService
 func NewAuthBearer(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.AuthBearer.Commons = cfg.Commons
 	return AuthBearerSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.AuthBearer,
 	}
 }
 
 func (s AuthBearerSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.AuthBearer.Context = ctx
+	cmd := AuthBearer(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := AuthBearer(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if AuthBearer(s.cfg).Before != nil {
-		if err := AuthBearer(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := AuthBearer(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/auth-bearer/pkg/config/config.go

@@ -0,0 +1,61 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	AuthProvider          string        `yaml:"auth_provider" env:"AUTH_BEARER_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"`
+	AuthProviders         AuthProviders `yaml:"auth_providers"`
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;AUTH_BEARER_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;AUTH_BEARER_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;AUTH_BEARER_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;AUTH_BEARER_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;AUTH_BEARER_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;AUTH_BEARER_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;AUTH_BEARER_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;AUTH_BEARER_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"AUTH_BEARER_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"AUTH_BEARER_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"AUTH_BEARER_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"AUTH_BEARER_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"AUTH_BEARER_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"AUTH_BEARER_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type AuthProviders struct {
+	OIDC OIDCProvider `yaml:"oidc"`
+}
+
+type OIDCProvider struct {
+	Issuer   string `yaml:"issuer" env:"OCIS_URL;AUTH_BEARER_OIDC_ISSUER"`
+	Insecure bool   `yaml:"insecure" env:"OCIS_INSECURE;AUTH_BEARER_OIDC_INSECURE"`
+	IDClaim  string `yaml:"id_claim"`
+	UIDClaim string `yaml:"uid_claim"`
+	GIDClaim string `yaml:"gid_claim"`
+}

extensions/auth-bearer/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,70 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9149",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9148",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "auth-bearer",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		AuthProvider:    "ldap",
+		AuthProviders: config.AuthProviders{
+			OIDC: config.OIDCProvider{
+				Issuer:   "https://localhost:9200",
+				Insecure: false,
+				IDClaim:  "preferred_username",
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/auth-machine/pkg/command/command.go

@@ -9,11 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -23,12 +24,15 @@ func AuthMachine(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-machine",
 		Usage: "start authprovider for machine auth",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-auth-machine")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
@@ -54,10 +58,12 @@ func AuthMachine(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.AuthMachine.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -69,7 +75,7 @@ func AuthMachine(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.AuthMachine.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -82,28 +88,27 @@ func AuthMachine(cfg *config.Config) *cli.Command {
 func authMachineConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	return map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.AuthMachine.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.AuthMachine.GRPCNetwork,
-			"address": cfg.Reva.AuthMachine.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"authprovider": map[string]interface{}{
 					"auth_manager": "machine",
 					"auth_managers": map[string]interface{}{
 						"machine": map[string]interface{}{
-							"api_key":      cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
+							"api_key":      cfg.AuthProviders.Machine.APIKey,
+							"gateway_addr": cfg.GatewayEndpoint,
 						},
 					},
 				},
@@ -119,28 +124,29 @@ type AuthMachineSutureService struct {
 
 // NewAuthMachineSutureService creates a new gateway.AuthMachineSutureService
 func NewAuthMachine(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.AuthMachine.Commons = cfg.Commons
 	return AuthMachineSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.AuthMachine,
 	}
 }
 
 func (s AuthMachineSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.AuthMachine.Context = ctx
+	// s.cfg.Reva.AuthMachine.Context = ctx
+	cmd := AuthMachine(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := AuthMachine(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if AuthMachine(s.cfg).Before != nil {
-		if err := AuthMachine(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := AuthMachine(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/auth-machine/pkg/config/config.go

@@ -0,0 +1,57 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	AuthProvider          string        `yaml:"auth_provider" env:"AUTH_MACHINE_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"`
+	AuthProviders         AuthProviders `yaml:"auth_providers"`
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;AUTH_MACHINE_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;AUTH_MACHINE_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;AUTH_MACHINE_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;AUTH_MACHINE_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;AUTH_MACHINE_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;AUTH_MACHINE_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;AUTH_MACHINE_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;AUTH_MACHINE_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"AUTH_MACHINE_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"AUTH_MACHINE_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"AUTH_MACHINE_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"AUTH_MACHINE_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"AUTH_MACHINE_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"AUTH_MACHINE_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type AuthProviders struct {
+	Machine MachineProvider `yaml:"machine"`
+}
+
+type MachineProvider struct {
+	APIKey string `yaml:"api_key" env:"OCIS_MACHINE_AUTH_API_KEY;AUTH_MACHINE_PROVIDER_API_KEY" desc:"The api key for the machine auth provider."`
+}

extensions/auth-machine/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,68 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9167",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9166",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "auth-machine",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		AuthProvider:    "ldap",
+		AuthProviders: config.AuthProviders{
+			Machine: config.MachineProvider{
+				APIKey: "change-me-please",
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/frontend/pkg/command/command.go

@@ -12,12 +12,13 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/frontend/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/conversions"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -31,12 +32,17 @@ func Frontend(cfg *config.Config) *cli.Command {
 			if err := loadUserAgent(c, cfg); err != nil {
 				return err
 			}
-			return ParseConfig(c, cfg, "storage-frontend")
+			return nil
 		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
@@ -59,9 +65,9 @@ func Frontend(cfg *config.Config) *cli.Command {
 					"enabled":       true,
 					"version":       "2.0.0",
 					"formats":       []string{"tar", "zip"},
-					"archiver_url":  cfg.Reva.Archiver.ArchiverURL,
-					"max_num_files": strconv.FormatInt(cfg.Reva.Archiver.MaxNumFiles, 10),
-					"max_size":      strconv.FormatInt(cfg.Reva.Archiver.MaxSize, 10),
+					"archiver_url":  path.Join("/", cfg.Archiver.Prefix),
+					"max_num_files": strconv.FormatInt(cfg.Archiver.MaxNumFiles, 10),
+					"max_size":      strconv.FormatInt(cfg.Archiver.MaxSize, 10),
 				},
 			}
 
@@ -69,9 +75,9 @@ func Frontend(cfg *config.Config) *cli.Command {
 				{
 					"enabled":  true,
 					"version":  "1.0.0",
-					"apps_url": cfg.Reva.AppProvider.AppsURL,
-					"open_url": cfg.Reva.AppProvider.OpenURL,
-					"new_url":  cfg.Reva.AppProvider.NewURL,
+					"apps_url": cfg.AppProvider.AppsURL,
+					"open_url": cfg.AppProvider.OpenURL,
+					"new_url":  cfg.AppProvider.NewURL,
 				},
 			}
 
@@ -83,16 +89,16 @@ func Frontend(cfg *config.Config) *cli.Command {
 				"versioning":        true,
 				"archivers":         archivers,
 				"app_providers":     appProviders,
-				"favorites":         cfg.Reva.Frontend.Favorites,
+				"favorites":         cfg.EnableFavorites,
 			}
 
-			if cfg.Reva.DefaultUploadProtocol == "tus" {
+			if cfg.DefaultUploadProtocol == "tus" {
 				filesCfg["tus_support"] = map[string]interface{}{
 					"version":              "1.0.0",
 					"resumable":            "1.0.0",
 					"extension":            "creation,creation-with-upload",
-					"http_method_override": cfg.Reva.UploadHTTPMethodOverride,
-					"max_chunk_size":       cfg.Reva.UploadMaxChunkSize,
+					"http_method_override": cfg.UploadHTTPMethodOverride,
+					"max_chunk_size":       cfg.UploadMaxChunkSize,
 				}
 			}
 
@@ -109,10 +115,12 @@ func Frontend(cfg *config.Config) *cli.Command {
 			{
 				server, err := debug.Server(
 					debug.Name(c.Command.Name+"-debug"),
-					debug.Addr(cfg.Reva.Frontend.DebugAddr),
+					debug.Addr(cfg.Debug.Addr),
 					debug.Logger(logger),
 					debug.Context(ctx),
-					debug.Config(cfg),
+					debug.Pprof(cfg.Debug.Pprof),
+					debug.Zpages(cfg.Debug.Zpages),
+					debug.Token(cfg.Debug.Token),
 				)
 
 				if err != nil {
@@ -129,7 +137,7 @@ func Frontend(cfg *config.Config) *cli.Command {
 				})
 			}
 
-			if !cfg.Reva.Frontend.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -142,78 +150,77 @@ func Frontend(cfg *config.Config) *cli.Command {
 func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[string]interface{}) map[string]interface{} {
 	return map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Users.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint, // Todo or address?
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint, // Todo or address?
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"http": map[string]interface{}{
-			"network": cfg.Reva.Frontend.HTTPNetwork,
-			"address": cfg.Reva.Frontend.HTTPAddr,
+			"network": cfg.HTTP.Protocol,
+			"address": cfg.HTTP.Addr,
 			"middlewares": map[string]interface{}{
 				"cors": map[string]interface{}{
 					"allow_credentials": true,
 				},
 				"auth": map[string]interface{}{
-					"credentials_by_user_agent": cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent,
+					"credentials_by_user_agent": cfg.Middleware.Auth.CredentialsByUserAgent,
 					"credential_chain":          []string{"bearer"},
 				},
 			},
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"appprovider": map[string]interface{}{
-					"prefix":                 cfg.Reva.Frontend.AppProviderPrefix,
-					"transfer_shared_secret": cfg.Reva.TransferSecret,
+					"prefix":                 cfg.AppProvider.Prefix,
+					"transfer_shared_secret": cfg.TransferSecret,
 					"timeout":                86400,
-					"insecure":               cfg.Reva.Frontend.AppProviderInsecure,
+					"insecure":               cfg.AppProvider.Insecure,
 				},
 				"archiver": map[string]interface{}{
-					"prefix":        cfg.Reva.Frontend.ArchiverPrefix,
+					"prefix":        cfg.Archiver.Prefix,
 					"timeout":       86400,
-					"insecure":      cfg.Reva.Frontend.ArchiverInsecure,
-					"max_num_files": cfg.Reva.Archiver.MaxNumFiles,
-					"max_size":      cfg.Reva.Archiver.MaxSize,
+					"insecure":      cfg.Archiver.Insecure,
+					"max_num_files": cfg.Archiver.MaxNumFiles,
+					"max_size":      cfg.Archiver.MaxSize,
 				},
 				"datagateway": map[string]interface{}{
-					"prefix":                 cfg.Reva.Frontend.DatagatewayPrefix,
-					"transfer_shared_secret": cfg.Reva.TransferSecret,
+					"prefix":                 cfg.DataGateway.Prefix,
+					"transfer_shared_secret": cfg.TransferSecret,
 					"timeout":                86400,
 					"insecure":               true,
 				},
 				"ocs": map[string]interface{}{
-					"storage_registry_svc":      cfg.Reva.Gateway.Endpoint,
-					"share_prefix":              cfg.Reva.Frontend.OCSSharePrefix,
-					"home_namespace":            cfg.Reva.Frontend.OCSHomeNamespace,
-					"resource_info_cache_ttl":   cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
-					"prefix":                    cfg.Reva.Frontend.OCSPrefix,
-					"additional_info_attribute": cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
-					"machine_auth_apikey":       cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-					"cache_warmup_driver":       cfg.Reva.Frontend.OCSCacheWarmupDriver,
+					"storage_registry_svc":      cfg.GatewayEndpoint,
+					"share_prefix":              cfg.OCS.SharePrefix,
+					"home_namespace":            cfg.OCS.HomeNamespace,
+					"resource_info_cache_ttl":   cfg.OCS.ResourceInfoCacheTTL,
+					"prefix":                    cfg.OCS.Prefix,
+					"additional_info_attribute": cfg.OCS.AdditionalInfoAttribute,
+					"machine_auth_apikey":       cfg.AuthMachine.APIKey,
+					"cache_warmup_driver":       cfg.OCS.CacheWarmupDriver,
 					"cache_warmup_drivers": map[string]interface{}{
 						"cbox": map[string]interface{}{
-							"db_username": cfg.Reva.Sharing.UserSQLUsername,
-							"db_password": cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":     cfg.Reva.Sharing.UserSQLHost,
-							"db_port":     cfg.Reva.Sharing.UserSQLPort,
-							"db_name":     cfg.Reva.Sharing.UserSQLName,
-							"namespace":   cfg.Reva.UserStorage.EOS.Root,
-							"gatewaysvc":  cfg.Reva.Gateway.Endpoint,
+							"db_username": cfg.OCS.CacheWarmupDrivers.CBOX.DBUsername,
+							"db_password": cfg.OCS.CacheWarmupDrivers.CBOX.DBPassword,
+							"db_host":     cfg.OCS.CacheWarmupDrivers.CBOX.DBHost,
+							"db_port":     cfg.OCS.CacheWarmupDrivers.CBOX.DBPort,
+							"db_name":     cfg.OCS.CacheWarmupDrivers.CBOX.DBName,
+							"namespace":   cfg.OCS.CacheWarmupDrivers.CBOX.Namespace,
+							"gatewaysvc":  cfg.GatewayEndpoint,
 						},
 					},
 					"config": map[string]interface{}{
 						"version": "1.7",
 						"website": "ownCloud",
-						"host":    cfg.Reva.Frontend.PublicURL,
+						"host":    cfg.PublicURL,
 						"contact": "",
 						"ssl":     "false",
 					},
-					"default_upload_protocol": cfg.Reva.DefaultUploadProtocol,
+					"default_upload_protocol": cfg.DefaultUploadProtocol,
 					"capabilities": map[string]interface{}{
 						"capabilities": map[string]interface{}{
 							"core": map[string]interface{}{
@@ -232,8 +239,8 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 								"support_url_signing": true,
 							},
 							"checksums": map[string]interface{}{
-								"supported_types":       cfg.Reva.ChecksumSupportedTypes,
-								"preferred_upload_type": cfg.Reva.ChecksumPreferredUploadType,
+								"supported_types":       cfg.Checksums.SupportedTypes,
+								"preferred_upload_type": cfg.Checksums.PreferredUploadType,
 							},
 							"files": filesCfg,
 							"dav":   map[string]interface{}{},
@@ -287,7 +294,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 							},
 							"spaces": map[string]interface{}{
 								"version": "0.0.1",
-								"enabled": cfg.Reva.Frontend.ProjectSpaces,
+								"enabled": cfg.EnableProjectSpaces,
 							},
 						},
 						"version": map[string]interface{}{
@@ -313,7 +320,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 // have the indexes reversed and the tuple is in the format of [challenge:user-agent], then the same process is applied
 // in reverse for each individual part
 func loadUserAgent(c *cli.Context, cfg *config.Config) error {
-	cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent = make(map[string]string)
+	cfg.Middleware.Auth.CredentialsByUserAgent = make(map[string]string)
 	locks := c.StringSlice("user-agent-whitelist-lock-in")
 
 	for _, v := range locks {
@@ -323,7 +330,7 @@ func loadUserAgent(c *cli.Context, cfg *config.Config) error {
 			return fmt.Errorf("unexpected config value for user-agent lock-in: %v, expected format is user-agent:challenge", v)
 		}
 
-		cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent[conversions.Reverse(parts[1])] = conversions.Reverse(parts[0])
+		cfg.Middleware.Auth.CredentialsByUserAgent[conversions.Reverse(parts[1])] = conversions.Reverse(parts[0])
 	}
 
 	return nil
@@ -336,28 +343,29 @@ type FrontendSutureService struct {
 
 // NewFrontend creates a new frontend.FrontendSutureService
 func NewFrontend(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.Frontend.Commons = cfg.Commons
 	return FrontendSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.Frontend,
 	}
 }
 
 func (s FrontendSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Frontend.Context = ctx
+	// s.cfg.Reva.Frontend.Context = ctx
+	cmd := Frontend(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := Frontend(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if Frontend(s.cfg).Before != nil {
-		if err := Frontend(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := Frontend(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/frontend/pkg/config/config.go

@@ -0,0 +1,130 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	HTTP HTTPConfig `yaml:"http"`
+
+	// JWTSecret used to verify reva access token
+	JWTSecret             string `yaml:"jwt_secret"`
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+
+	EnableFavorites          bool `yaml:"favorites"`
+	EnableProjectSpaces      bool
+	UploadMaxChunkSize       int    `yaml:"upload_max_chunk_size"`
+	UploadHTTPMethodOverride string `yaml:"upload_http_method_override"`
+	DefaultUploadProtocol    string `yaml:"default_upload_protocol"`
+	TransferSecret           string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"`
+	PublicURL                string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
+
+	Archiver    Archiver
+	AppProvider AppProvider
+	DataGateway DataGateway
+	OCS         OCS
+	AuthMachine AuthMachine
+	Checksums   Checksums
+
+	Middleware Middleware
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;FRONTEND_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;FRONTEND_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;FRONTEND_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;FRONTEND_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;FRONTEND_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;FRONTEND_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;FRONTEND_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;FRONTEND_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"FRONTEND_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"FRONTEND_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"FRONTEND_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"FRONTEND_DEBUG_ZPAGES"`
+}
+
+type HTTPConfig struct {
+	Addr     string `yaml:"addr" env:"FRONTEND_HTTP_ADDR" desc:"The address of the http service."`
+	Protocol string `yaml:"protocol" env:"FRONTEND_HTTP_PROTOCOL" desc:"The transport protocol of the http service."`
+	Prefix   string `yaml:"prefix"`
+}
+
+// Middleware configures reva middlewares.
+type Middleware struct {
+	Auth Auth `yaml:"auth"`
+}
+
+// Auth configures reva http auth middleware.
+type Auth struct {
+	CredentialsByUserAgent map[string]string `yaml:"credentials_by_user_agenr"`
+}
+
+type Archiver struct {
+	MaxNumFiles int64 `yaml:"max_num_files"`
+	MaxSize     int64 `yaml:"max_size"`
+	Prefix      string
+	Insecure    bool `env:"OCIS_INSECURE;FRONTEND_ARCHIVER_INSECURE"`
+}
+
+type AppProvider struct {
+	ExternalAddr string `yaml:"external_addr"`
+	Driver       string `yaml:"driver"`
+	// WopiDriver   WopiDriver `yaml:"wopi_driver"`
+	AppsURL  string `yaml:"apps_url"`
+	OpenURL  string `yaml:"open_url"`
+	NewURL   string `yaml:"new_url"`
+	Prefix   string
+	Insecure bool `env:"OCIS_INSECURE;FRONTEND_APPPROVIDER_INSECURE"`
+}
+
+type DataGateway struct {
+	Prefix string
+}
+
+type OCS struct {
+	Prefix                  string `yaml:"prefix"`
+	SharePrefix             string `yaml:"share_prefix"`
+	HomeNamespace           string `yaml:"home_namespace"`
+	AdditionalInfoAttribute string `yaml:"additional_info_attribute"`
+	ResourceInfoCacheTTL    int    `yaml:"resource_info_cache_ttl"`
+	CacheWarmupDriver       string `yaml:"cache_warmup_driver"`
+	CacheWarmupDrivers      CacheWarmupDrivers
+}
+
+type CacheWarmupDrivers struct {
+	CBOX CBOXDriver
+}
+
+type CBOXDriver struct {
+	DBUsername string
+	DBPassword string
+	DBHost     string
+	DBPort     int
+	DBName     string
+	Namespace  string
+}
+
+type AuthMachine struct {
+	APIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
+}
+
+type Checksums struct {
+	SupportedTypes      []string `yaml:"supported_types"`
+	PreferredUploadType string   `yaml:"preferred_upload_type"`
+}

extensions/frontend/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,103 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/frontend/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9141",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		HTTP: config.HTTPConfig{
+			Addr:     "127.0.0.1:9140",
+			Protocol: "tcp",
+			Prefix:   "",
+		},
+		Service: config.Service{
+			Name: "frontend",
+		},
+		GatewayEndpoint:          "127.0.0.1:9142",
+		JWTSecret:                "Pive-Fumkiu4",
+		PublicURL:                "https://localhost:9200",
+		EnableFavorites:          false,
+		EnableProjectSpaces:      true,
+		UploadMaxChunkSize:       1e+8,
+		UploadHTTPMethodOverride: "",
+		DefaultUploadProtocol:    "tus",
+		TransferSecret:           "replace-me-with-a-transfer-secret",
+		Checksums: config.Checksums{
+			SupportedTypes:      []string{"sha1", "md5", "adler32"},
+			PreferredUploadType: "",
+		},
+		AppProvider: config.AppProvider{
+			Prefix:   "",
+			Insecure: false,
+		},
+		Archiver: config.Archiver{
+			Insecure:    false,
+			Prefix:      "archiver",
+			MaxNumFiles: 10000,
+			MaxSize:     1073741824,
+		},
+		DataGateway: config.DataGateway{
+			Prefix: "data",
+		},
+		OCS: config.OCS{
+			Prefix:                  "ocs",
+			SharePrefix:             "/Shares",
+			HomeNamespace:           "/users/{{.Id.OpaqueId}}",
+			CacheWarmupDriver:       "",
+			AdditionalInfoAttribute: "{{.Mail}}",
+			ResourceInfoCacheTTL:    0,
+		},
+		AuthMachine: config.AuthMachine{
+			APIKey: "change-me-please",
+		},
+		Middleware: config.Middleware{
+			Auth: config.Auth{
+				CredentialsByUserAgent: map[string]string{},
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/gateway/pkg/command/command.go

@@ -13,14 +13,13 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/mitchellh/mapstructure"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/gateway/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/extensions/storage/pkg/service/external"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
@@ -32,19 +31,21 @@ func Gateway(cfg *config.Config) *cli.Command {
 		Name:  "gateway",
 		Usage: "start gateway",
 		Before: func(c *cli.Context) error {
-			if err := ParseConfig(c, cfg, "storage-gateway"); err != nil {
-				return err
-			}
-
-			if cfg.Reva.DataGateway.PublicURL == "" {
-				cfg.Reva.DataGateway.PublicURL = strings.TrimRight(cfg.Reva.Frontend.PublicURL, "/") + "/data"
+			if cfg.DataGatewayPublicURL == "" {
+				cfg.DataGatewayPublicURL = strings.TrimRight(cfg.FrontendPublicURL, "/") + "/data"
 			}
 
 			return nil
 		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			uuid := uuid.Must(uuid.NewV4())
@@ -62,7 +63,7 @@ func Gateway(cfg *config.Config) *cli.Command {
 					ctx,
 					"com.owncloud.storage",
 					uuid.String(),
-					cfg.Reva.Gateway.GRPCAddr,
+					cfg.GRPC.Addr,
 					version.String,
 					logger,
 				)
@@ -87,10 +88,12 @@ func Gateway(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.Gateway.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -102,7 +105,7 @@ func Gateway(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.Gateway.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -115,56 +118,55 @@ func Gateway(cfg *config.Config) *cli.Command {
 func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logger) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Users.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.Gateway.GRPCNetwork,
-			"address": cfg.Reva.Gateway.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"gateway": map[string]interface{}{
 					// registries is located on the gateway
-					"authregistrysvc":    cfg.Reva.Gateway.Endpoint,
-					"storageregistrysvc": cfg.Reva.Gateway.Endpoint,
-					"appregistrysvc":     cfg.Reva.Gateway.Endpoint,
+					"authregistrysvc":    cfg.GatewayEndpoint,
+					"storageregistrysvc": cfg.GatewayEndpoint,
+					"appregistrysvc":     cfg.GatewayEndpoint,
 					// user metadata is located on the users services
-					"preferencessvc":   cfg.Reva.Users.Endpoint,
-					"userprovidersvc":  cfg.Reva.Users.Endpoint,
-					"groupprovidersvc": cfg.Reva.Groups.Endpoint,
-					"permissionssvc":   cfg.Reva.Permissions.Endpoint,
+					"preferencessvc":   cfg.UsersEndpoint,
+					"userprovidersvc":  cfg.UsersEndpoint,
+					"groupprovidersvc": cfg.GroupsEndpoint,
+					"permissionssvc":   cfg.PermissionsEndpoint,
 					// sharing is located on the sharing service
-					"usershareprovidersvc":          cfg.Reva.Sharing.Endpoint,
-					"publicshareprovidersvc":        cfg.Reva.Sharing.Endpoint,
-					"ocmshareprovidersvc":           cfg.Reva.Sharing.Endpoint,
-					"commit_share_to_storage_grant": cfg.Reva.Gateway.CommitShareToStorageGrant,
-					"commit_share_to_storage_ref":   cfg.Reva.Gateway.CommitShareToStorageRef,
-					"share_folder":                  cfg.Reva.Gateway.ShareFolder, // ShareFolder is the location where to create shares in the recipient's storage provider.
+					"usershareprovidersvc":          cfg.SharingEndpoint,
+					"publicshareprovidersvc":        cfg.SharingEndpoint,
+					"ocmshareprovidersvc":           cfg.SharingEndpoint,
+					"commit_share_to_storage_grant": cfg.CommitShareToStorageGrant,
+					"commit_share_to_storage_ref":   cfg.CommitShareToStorageRef,
+					"share_folder":                  cfg.ShareFolder, // ShareFolder is the location where to create shares in the recipient's storage provider.
 					// other
-					"disable_home_creation_on_login": cfg.Reva.Gateway.DisableHomeCreationOnLogin,
-					"datagateway":                    cfg.Reva.DataGateway.PublicURL,
-					"transfer_shared_secret":         cfg.Reva.TransferSecret,
-					"transfer_expires":               cfg.Reva.TransferExpires,
-					"home_mapping":                   cfg.Reva.Gateway.HomeMapping,
-					"etag_cache_ttl":                 cfg.Reva.Gateway.EtagCacheTTL,
+					"disable_home_creation_on_login": cfg.DisableHomeCreationOnLogin,
+					"datagateway":                    cfg.DataGatewayPublicURL,
+					"transfer_shared_secret":         cfg.TransferSecret,
+					"transfer_expires":               cfg.TransferExpires,
+					"home_mapping":                   cfg.HomeMapping,
+					"etag_cache_ttl":                 cfg.EtagCacheTTL,
 				},
 				"authregistry": map[string]interface{}{
 					"driver": "static",
 					"drivers": map[string]interface{}{
 						"static": map[string]interface{}{
 							"rules": map[string]interface{}{
-								"basic":        cfg.Reva.AuthBasic.Endpoint,
-								"bearer":       cfg.Reva.AuthBearer.Endpoint,
-								"machine":      cfg.Reva.AuthMachine.Endpoint,
-								"publicshares": cfg.Reva.StoragePublicLink.Endpoint,
+								"basic":        cfg.AuthBasicEndpoint,
+								"bearer":       cfg.AuthBearerEndpoint,
+								"machine":      cfg.AuthMachineEndpoint,
+								"publicshares": cfg.StoragePublicLinkEndpoint,
 							},
 						},
 					},
@@ -178,7 +180,7 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
 					},
 				},
 				"storageregistry": map[string]interface{}{
-					"driver": cfg.Reva.StorageRegistry.Driver,
+					"driver": cfg.StorageRegistry.Driver,
 					"drivers": map[string]interface{}{
 						"spaces": map[string]interface{}{
 							"providers": spacesProviders(cfg, logger),
@@ -194,20 +196,20 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
 func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[string]interface{} {
 
 	// if a list of rules is given it overrides the generated rules from below
-	if len(cfg.Reva.StorageRegistry.Rules) > 0 {
+	if len(cfg.StorageRegistry.Rules) > 0 {
 		rules := map[string]map[string]interface{}{}
-		for i := range cfg.Reva.StorageRegistry.Rules {
-			parts := strings.SplitN(cfg.Reva.StorageRegistry.Rules[i], "=", 2)
+		for i := range cfg.StorageRegistry.Rules {
+			parts := strings.SplitN(cfg.StorageRegistry.Rules[i], "=", 2)
 			rules[parts[0]] = map[string]interface{}{"address": parts[1]}
 		}
 		return rules
 	}
 
 	// check if the rules have to be read from a json file
-	if cfg.Reva.StorageRegistry.JSON != "" {
-		data, err := ioutil.ReadFile(cfg.Reva.StorageRegistry.JSON)
+	if cfg.StorageRegistry.JSON != "" {
+		data, err := ioutil.ReadFile(cfg.StorageRegistry.JSON)
 		if err != nil {
-			logger.Error().Err(err).Msg("Failed to read storage registry rules from JSON file: " + cfg.Reva.StorageRegistry.JSON)
+			logger.Error().Err(err).Msg("Failed to read storage registry rules from JSON file: " + cfg.StorageRegistry.JSON)
 			return nil
 		}
 		var rules map[string]map[string]interface{}
@@ -220,7 +222,7 @@ func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[strin
 
 	// generate rules based on default config
 	return map[string]map[string]interface{}{
-		cfg.Reva.StorageUsers.Endpoint: {
+		cfg.StorageUsersEndpoint: {
 			"spaces": map[string]interface{}{
 				"personal": map[string]interface{}{
 					"mount_point":   "/users",
@@ -232,7 +234,7 @@ func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[strin
 				},
 			},
 		},
-		cfg.Reva.StorageShares.Endpoint: {
+		cfg.StorageSharesEndpoint: {
 			"spaces": map[string]interface{}{
 				"virtual": map[string]interface{}{
 					// The root of the share jail is mounted here
@@ -251,7 +253,7 @@ func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[strin
 			},
 		},
 		// public link storage returns the mount id of the actual storage
-		cfg.Reva.StoragePublicLink.Endpoint: {
+		cfg.StoragePublicLinkEndpoint: {
 			"spaces": map[string]interface{}{
 				"grant": map[string]interface{}{
 					"mount_point": ".",
@@ -281,10 +283,10 @@ func mimetypes(cfg *config.Config, logger log.Logger) []map[string]interface{} {
 	var m []map[string]interface{}
 
 	// load default app mimetypes from a json file
-	if cfg.Reva.AppRegistry.MimetypesJSON != "" {
-		data, err := ioutil.ReadFile(cfg.Reva.AppRegistry.MimetypesJSON)
+	if cfg.AppRegistry.MimetypesJSON != "" {
+		data, err := ioutil.ReadFile(cfg.AppRegistry.MimetypesJSON)
 		if err != nil {
-			logger.Error().Err(err).Msg("Failed to read app registry mimetypes from JSON file: " + cfg.Reva.AppRegistry.MimetypesJSON)
+			logger.Error().Err(err).Msg("Failed to read app registry mimetypes from JSON file: " + cfg.AppRegistry.MimetypesJSON)
 			return nil
 		}
 		if err = json.Unmarshal(data, &mimetypes); err != nil {
@@ -385,56 +387,30 @@ type GatewaySutureService struct {
 
 // NewGatewaySutureService creates a new gateway.GatewaySutureService
 func NewGateway(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.Gateway.Commons = cfg.Commons
 	return GatewaySutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.Gateway,
 	}
 }
 
 func (s GatewaySutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Gateway.Context = ctx
+	cmd := Gateway(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := Gateway(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if Gateway(s.cfg).Before != nil {
-		if err := Gateway(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := Gateway(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 
 	return nil
 }
-
-// ParseConfig loads accounts configuration from known paths.
-func ParseConfig(c *cli.Context, cfg *config.Config, storageExtension string) error {
-	conf, err := ociscfg.BindSourcesToStructs(storageExtension, cfg)
-	if err != nil {
-		return err
-	}
-
-	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
-	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
-		cfg.Log = &shared.Log{
-			Level:  cfg.Commons.Log.Level,
-			Pretty: cfg.Commons.Log.Pretty,
-			Color:  cfg.Commons.Log.Color,
-			File:   cfg.Commons.Log.File,
-		}
-	} else if cfg.Log == nil {
-		cfg.Log = &shared.Log{}
-	}
-
-	// load all env variables relevant to the config in the current context.
-	conf.LoadOSEnv(config.GetEnv(cfg), false)
-
-	bindings := config.StructMappings(cfg)
-	return ociscfg.BindEnv(conf, bindings)
-}

extensions/gateway/pkg/config/config.go

@@ -0,0 +1,82 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+
+	CommitShareToStorageGrant  bool
+	CommitShareToStorageRef    bool
+	ShareFolder                string
+	DisableHomeCreationOnLogin bool
+	TransferSecret             string `env:"STORAGE_TRANSFER_SECRET"`
+	TransferExpires            int
+	HomeMapping                string
+	EtagCacheTTL               int
+
+	UsersEndpoint             string
+	GroupsEndpoint            string
+	PermissionsEndpoint       string
+	SharingEndpoint           string
+	DataGatewayPublicURL      string
+	FrontendPublicURL         string `env:"OCIS_URL;GATEWAY_FRONTEND_PUBLIC_URL"`
+	AuthBasicEndpoint         string
+	AuthBearerEndpoint        string
+	AuthMachineEndpoint       string
+	StoragePublicLinkEndpoint string
+	StorageUsersEndpoint      string
+	StorageSharesEndpoint     string
+
+	StorageRegistry StorageRegistry
+	AppRegistry     AppRegistry
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;GATEWAY_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;GATEWAY_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;GATEWAY_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;GATEWAY_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;GATEWAY_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;GATEWAY_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;GATEWAY_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;GATEWAY_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"GATEWAY_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"GATEWAY_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"GATEWAY_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"GATEWAY_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"GATEWAY_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"GATEWAY_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type StorageRegistry struct {
+	Driver string
+	Rules  []string
+	JSON   string
+}
+
+type AppRegistry struct {
+	MimetypesJSON string
+}

extensions/gateway/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,92 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/gateway/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9143",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9142",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "gateway",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+
+		CommitShareToStorageGrant:  true,
+		CommitShareToStorageRef:    true,
+		ShareFolder:                "Shares",
+		DisableHomeCreationOnLogin: true,
+		TransferSecret:             "replace-me-with-a-transfer-secret",
+		TransferExpires:            24 * 60 * 60,
+		HomeMapping:                "",
+		EtagCacheTTL:               0,
+
+		UsersEndpoint:             "localhost:9144",
+		GroupsEndpoint:            "localhost:9160",
+		PermissionsEndpoint:       "localhost:9191",
+		SharingEndpoint:           "localhost:9150",
+		DataGatewayPublicURL:      "",
+		FrontendPublicURL:         "https://localhost:9200",
+		AuthBasicEndpoint:         "localhost:9146",
+		AuthBearerEndpoint:        "localhost:9148",
+		AuthMachineEndpoint:       "localhost:9166",
+		StoragePublicLinkEndpoint: "localhost:9178",
+		StorageUsersEndpoint:      "localhost:9157",
+		StorageSharesEndpoint:     "localhost:9154",
+
+		StorageRegistry: config.StorageRegistry{
+			Driver: "spaces",
+			JSON:   "",
+		},
+		AppRegistry: config.AppRegistry{
+			MimetypesJSON: "",
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/glauth/pkg/config/defaults/defaultconfig.go

@@ -86,5 +86,5 @@ func EnsureDefaults(cfg *config.Config) {
 }
 
 func Sanitize(cfg *config.Config) {
-	// nothing to santizie here atm
+	// nothing to sanitize here atm
 }

extensions/group/pkg/command/command.go

@@ -10,11 +10,13 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/group/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/ldap"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -24,19 +26,22 @@ func Groups(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "groups",
 		Usage: "start groups service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-groups")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
 			// pre-create folders
-			if cfg.Reva.Groups.Driver == "json" && cfg.Reva.Groups.JSON != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Groups.JSON), os.FileMode(0700)); err != nil {
+			if cfg.Driver == "json" && cfg.Drivers.JSON.File != "" {
+				if err := os.MkdirAll(filepath.Dir(cfg.Drivers.JSON.File), os.FileMode(0700)); err != nil {
 					return err
 				}
 			}
@@ -46,8 +51,8 @@ func Groups(cfg *config.Config) *cli.Command {
 
 			rcfg := groupsConfigFromStruct(c, cfg)
 
-			if cfg.Reva.Groups.Driver == "ldap" {
-				if err := waitForLDAPCA(logger, &cfg.Reva.LDAP); err != nil {
+			if cfg.Driver == "ldap" {
+				if err := ldap.WaitForCA(logger, cfg.Drivers.LDAP.Insecure, cfg.Drivers.LDAP.CACert); err != nil {
 					logger.Error().Err(err).Msg("The configured LDAP CA cert does not exist")
 					return err
 				}
@@ -70,10 +75,12 @@ func Groups(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.Groups.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -85,7 +92,7 @@ func Groups(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.Groups.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -98,40 +105,39 @@ func Groups(cfg *config.Config) *cli.Command {
 func groupsConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	return map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Groups.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.Groups.GRPCNetwork,
-			"address": cfg.Reva.Groups.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"groupprovider": map[string]interface{}{
-					"driver": cfg.Reva.Groups.Driver,
+					"driver": cfg.Driver,
 					"drivers": map[string]interface{}{
 						"json": map[string]interface{}{
-							"groups": cfg.Reva.Groups.JSON,
+							"groups": cfg.Drivers.JSON.File,
 						},
-						"ldap": ldapConfigFromString(cfg),
+						"ldap": ldapConfigFromString(cfg.Drivers.LDAP),
 						"rest": map[string]interface{}{
-							"client_id":                      cfg.Reva.UserGroupRest.ClientID,
-							"client_secret":                  cfg.Reva.UserGroupRest.ClientSecret,
-							"redis_address":                  cfg.Reva.UserGroupRest.RedisAddress,
-							"redis_username":                 cfg.Reva.UserGroupRest.RedisUsername,
-							"redis_password":                 cfg.Reva.UserGroupRest.RedisPassword,
-							"group_members_cache_expiration": cfg.Reva.Groups.GroupMembersCacheExpiration,
-							"id_provider":                    cfg.Reva.UserGroupRest.IDProvider,
-							"api_base_url":                   cfg.Reva.UserGroupRest.APIBaseURL,
-							"oidc_token_endpoint":            cfg.Reva.UserGroupRest.OIDCTokenEndpoint,
-							"target_api":                     cfg.Reva.UserGroupRest.TargetAPI,
+							"client_id":                      cfg.Drivers.REST.ClientID,
+							"client_secret":                  cfg.Drivers.REST.ClientSecret,
+							"redis_address":                  cfg.Drivers.REST.RedisAddr,
+							"redis_username":                 cfg.Drivers.REST.RedisUsername,
+							"redis_password":                 cfg.Drivers.REST.RedisPassword,
+							"group_members_cache_expiration": cfg.GroupMembersCacheExpiration,
+							"id_provider":                    cfg.Drivers.REST.IDProvider,
+							"api_base_url":                   cfg.Drivers.REST.APIBaseURL,
+							"oidc_token_endpoint":            cfg.Drivers.REST.OIDCTokenEndpoint,
+							"target_api":                     cfg.Drivers.REST.TargetAPI,
 						},
 					},
 				},
@@ -147,14 +153,14 @@ type GroupSutureService struct {
 
 // NewGroupProviderSutureService creates a new storage.GroupProvider
 func NewGroupProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.Group.Commons = cfg.Commons
 	return GroupSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.Group,
 	}
 }
 
 func (s GroupSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Groups.Context = ctx
+	// s.cfg.Reva.Groups.Context = ctx
 	f := &flag.FlagSet{}
 	cmdFlags := Groups(s.cfg).Flags
 	for k := range cmdFlags {
@@ -174,3 +180,36 @@ func (s GroupSutureService) Serve(ctx context.Context) error {
 
 	return nil
 }
+
+func ldapConfigFromString(cfg config.LDAPDriver) map[string]interface{} {
+	return map[string]interface{}{
+		"uri":               cfg.URI,
+		"cacert":            cfg.CACert,
+		"insecure":          cfg.Insecure,
+		"bind_username":     cfg.BindDN,
+		"bind_password":     cfg.BindPassword,
+		"user_base_dn":      cfg.UserBaseDN,
+		"group_base_dn":     cfg.GroupBaseDN,
+		"user_filter":       cfg.UserFilter,
+		"group_filter":      cfg.GroupFilter,
+		"user_objectclass":  cfg.UserObjectClass,
+		"group_objectclass": cfg.GroupObjectClass,
+		"login_attributes":  cfg.LoginAttributes,
+		"idp":               cfg.IDP,
+		"user_schema": map[string]interface{}{
+			"id":              cfg.UserSchema.ID,
+			"idIsOctetString": cfg.UserSchema.IDIsOctetString,
+			"mail":            cfg.UserSchema.Mail,
+			"displayName":     cfg.UserSchema.DisplayName,
+			"userName":        cfg.UserSchema.Username,
+		},
+		"group_schema": map[string]interface{}{
+			"id":              cfg.GroupSchema.ID,
+			"idIsOctetString": cfg.GroupSchema.IDIsOctetString,
+			"mail":            cfg.GroupSchema.Mail,
+			"displayName":     cfg.GroupSchema.DisplayName,
+			"groupName":       cfg.GroupSchema.Groupname,
+			"member":          cfg.GroupSchema.Member,
+		},
+	}
+}

extensions/group/pkg/config/config.go

@@ -0,0 +1,121 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret                   string
+	GatewayEndpoint             string
+	SkipUserGroupsInToken       bool
+	GroupMembersCacheExpiration int
+	Driver                      string
+	Drivers                     Drivers
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;GROUPS_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;GROUPS_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;GROUPS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;GROUPS_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;GROUPS_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;GROUPS_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;GROUPS_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;GROUPS_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"GROUPS_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"GROUPS_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"GROUPS_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"GROUPS_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"GROUPS_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"GROUPS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type Drivers struct {
+	JSON        JSONDriver
+	LDAP        LDAPDriver
+	OwnCloudSQL OwnCloudSQLDriver
+	REST        RESTProvider
+}
+
+type JSONDriver struct {
+	File string
+}
+type LDAPDriver struct {
+	URI              string   `env:"LDAP_URI;GROUPS_LDAP_URI"`
+	CACert           string   `env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
+	Insecure         bool     `env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
+	BindDN           string   `env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
+	BindPassword     string   `env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
+	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
+	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
+	UserFilter       string   `env:"LDAP_USERFILTER;GROUPS_LDAP_USERFILTER"`
+	GroupFilter      string   `env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
+	UserObjectClass  string   `env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
+	GroupObjectClass string   `env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
+	LoginAttributes  []string `env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
+	IDP              string   `env:"OCIS_URL;GROUPS_IDP_URL"` // TODO what is this for?
+	GatewayEndpoint  string   // TODO do we need this here?
+	UserSchema       LDAPUserSchema
+	GroupSchema      LDAPGroupSchema
+}
+
+type LDAPUserSchema struct {
+	ID              string `env:"LDAP_USER_SCHEMA_ID;GROUPS_LDAP_USER_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;GROUPS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_USER_SCHEMA_MAIL;GROUPS_LDAP_USER_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_USER_SCHEMA_DISPLAYNAME;GROUPS_LDAP_USER_SCHEMA_DISPLAYNAME"`
+	Username        string `env:"LDAP_USER_SCHEMA_USERNAME;GROUPS_LDAP_USER_SCHEMA_USERNAME"`
+}
+
+type LDAPGroupSchema struct {
+	ID              string `env:"LDAP_GROUP_SCHEMA_ID;GROUPS_LDAP_GROUP_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING;GROUPS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_GROUP_SCHEMA_MAIL;GROUPS_LDAP_GROUP_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_GROUP_SCHEMA_DISPLAYNAME;GROUPS_LDAP_GROUP_SCHEMA_DISPLAYNAME"`
+	Groupname       string `env:"LDAP_GROUP_SCHEMA_GROUPNAME;GROUPS_LDAP_GROUP_SCHEMA_GROUPNAME"`
+	Member          string `env:"LDAP_GROUP_SCHEMA_MEMBER;GROUPS_LDAP_GROUP_SCHEMA_MEMBER"`
+}
+
+type OwnCloudSQLDriver struct {
+	DBUsername         string
+	DBPassword         string
+	DBHost             string
+	DBPort             int
+	DBName             string
+	IDP                string // TODO do we need this?
+	Nobody             int64  // TODO what is this?
+	JoinUsername       bool
+	JoinOwnCloudUUID   bool
+	EnableMedialSearch bool
+}
+
+type RESTProvider struct {
+	ClientID          string
+	ClientSecret      string
+	RedisAddr         string
+	RedisUsername     string
+	RedisPassword     string
+	IDProvider        string
+	APIBaseURL        string
+	OIDCTokenEndpoint string
+	TargetAPI         string
+}

extensions/group/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,113 @@
+package defaults
+
+import (
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9161",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9160",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "user",
+		},
+		GroupMembersCacheExpiration: 5,
+		GatewayEndpoint:             "127.0.0.1:9142",
+		JWTSecret:                   "Pive-Fumkiu4",
+		Driver:                      "ldap",
+		Drivers: config.Drivers{
+			LDAP: config.LDAPDriver{
+				URI:              "ldaps://localhost:9126",
+				CACert:           filepath.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
+				Insecure:         false,
+				UserBaseDN:       "dc=ocis,dc=test",
+				GroupBaseDN:      "dc=ocis,dc=test",
+				LoginAttributes:  []string{"cn", "mail"},
+				UserFilter:       "",
+				GroupFilter:      "",
+				UserObjectClass:  "posixAccount",
+				GroupObjectClass: "posixGroup",
+				BindDN:           "cn=reva,ou=sysusers,dc=ocis,dc=test",
+				BindPassword:     "reva",
+				IDP:              "https://localhost:9200",
+				UserSchema: config.LDAPUserSchema{
+					ID:          "ownclouduuid",
+					Mail:        "mail",
+					DisplayName: "displayname",
+					Username:    "cn",
+				},
+				GroupSchema: config.LDAPGroupSchema{
+					ID:          "cn",
+					Mail:        "mail",
+					DisplayName: "cn",
+					Groupname:   "cn",
+					Member:      "cn",
+				},
+			},
+			JSON: config.JSONDriver{},
+			OwnCloudSQL: config.OwnCloudSQLDriver{
+				DBUsername:         "owncloud",
+				DBPassword:         "secret",
+				DBHost:             "mysql",
+				DBPort:             3306,
+				DBName:             "owncloud",
+				IDP:                "https://localhost:9200",
+				Nobody:             90,
+				JoinUsername:       false,
+				JoinOwnCloudUUID:   false,
+				EnableMedialSearch: false,
+			},
+			REST: config.RESTProvider{
+				RedisAddr: "localhost:6379",
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/ocdav/pkg/command/ocdav.go

@@ -0,0 +1,171 @@
+package command
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"strings"
+
+	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
+	"github.com/oklog/run"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/conversions"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
+	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
+)
+
+// OCDav is the entrypoint for the ocdav command.
+// TODO move ocdav cmd to a separate service
+func OCDav(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "ocdav",
+		Usage: "start ocdav service",
+		Before: func(c *cli.Context) error {
+			if err := loadUserAgent(c, cfg); err != nil {
+				return err
+			}
+			return nil
+		},
+		Action: func(c *cli.Context) error {
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
+
+			gr := run.Group{}
+			ctx, cancel := context.WithCancel(context.Background())
+			//metrics     = metrics.New()
+
+			defer cancel()
+
+			gr.Add(func() error {
+				s, err := ocdav.Service(
+					ocdav.Context(ctx),
+					ocdav.Logger(logger.Logger),
+					ocdav.Address(cfg.HTTP.Addr),
+					ocdav.FilesNamespace(cfg.FilesNamespace),
+					ocdav.WebdavNamespace(cfg.WebdavNamespace),
+					ocdav.SharesNamespace(cfg.SharesNamespace),
+					ocdav.Timeout(cfg.Timeout),
+					ocdav.Insecure(cfg.Insecure),
+					ocdav.PublicURL(cfg.PublicURL),
+					ocdav.Prefix(cfg.HTTP.Prefix),
+					ocdav.GatewaySvc(cfg.GatewayEndpoint),
+					ocdav.JWTSecret(cfg.JWTSecret),
+					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation
+					// ocdav.LockSystem(), // will default to the CS3 lock system
+					// ocdav.TLSConfig() // tls config for the http server
+				)
+				if err != nil {
+					return err
+				}
+
+				return s.Run()
+			}, func(err error) {
+				logger.Info().Err(err).Str("server", c.Command.Name).Msg("Shutting down server")
+				cancel()
+			})
+
+			{
+				server, err := debug.Server(
+					debug.Name(c.Command.Name+"-debug"),
+					debug.Addr(cfg.Debug.Addr),
+					debug.Logger(logger),
+					debug.Context(ctx),
+					debug.Pprof(cfg.Debug.Pprof),
+					debug.Zpages(cfg.Debug.Zpages),
+					debug.Token(cfg.Debug.Token),
+				)
+
+				if err != nil {
+					logger.Info().
+						Err(err).
+						Str("server", "debug").
+						Msg("Failed to initialize server")
+
+					return err
+				}
+
+				gr.Add(server.ListenAndServe, func(_ error) {
+					cancel()
+				})
+			}
+
+			if !cfg.Supervised {
+				sync.Trap(&gr, cancel)
+			}
+
+			return gr.Run()
+		},
+	}
+}
+
+// OCDavSutureService allows for the ocdav command to be embedded and supervised by a suture supervisor tree.
+type OCDavSutureService struct {
+	cfg *config.Config
+}
+
+// NewOCDav creates a new ocdav.OCDavSutureService
+func NewOCDav(cfg *ociscfg.Config) suture.Service {
+	cfg.OCDav.Commons = cfg.Commons
+	return OCDavSutureService{
+		cfg: cfg.OCDav,
+	}
+}
+
+func (s OCDavSutureService) Serve(ctx context.Context) error {
+	// s.cfg.Reva.Frontend.Context = ctx
+	cmd := OCDav(s.cfg)
+	f := &flag.FlagSet{}
+	cmdFlags := cmd.Flags
+	for k := range cmdFlags {
+		if err := cmdFlags[k].Apply(f); err != nil {
+			return err
+		}
+	}
+	cliCtx := cli.NewContext(nil, f, nil)
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
+			return err
+		}
+	}
+	if err := cmd.Action(cliCtx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// loadUserAgent reads the user-agent-whitelist-lock-in, since it is a string flag, and attempts to construct a map of
+// "user-agent":"challenge" locks in for Reva.
+// Modifies cfg. Spaces don't need to be trimmed as urfavecli takes care of it. User agents with spaces are valid. i.e:
+// Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:83.0) Gecko/20100101 Firefox/83.0
+// This function works by relying in our format of specifying [user-agent:challenge] and the fact that the user agent
+// might contain ":" (colon), so the original string is reversed, split in two parts, by the time it is split we
+// have the indexes reversed and the tuple is in the format of [challenge:user-agent], then the same process is applied
+// in reverse for each individual part
+func loadUserAgent(c *cli.Context, cfg *config.Config) error {
+	cfg.Middleware.Auth.CredentialsByUserAgent = make(map[string]string)
+	locks := c.StringSlice("user-agent-whitelist-lock-in")
+
+	for _, v := range locks {
+		vv := conversions.Reverse(v)
+		parts := strings.SplitN(vv, ":", 2)
+		if len(parts) != 2 {
+			return fmt.Errorf("unexpected config value for user-agent lock-in: %v, expected format is user-agent:challenge", v)
+		}
+
+		cfg.Middleware.Auth.CredentialsByUserAgent[conversions.Reverse(parts[1])] = conversions.Reverse(parts[0])
+	}
+
+	return nil
+}

extensions/ocdav/pkg/config/config.go

@@ -0,0 +1,71 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	HTTP HTTPConfig `yaml:"http"`
+
+	// JWTSecret used to verify reva access token
+	JWTSecret             string `yaml:"jwt_secret"`
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+
+	WebdavNamespace string `yaml:"webdav_namespace"`
+	FilesNamespace  string `yaml:"files_namespace"`
+	SharesNamespace string `yaml:"shares_namespace"`
+	// PublicURL used to redirect /s/{token} URLs to
+	PublicURL string `yaml:"public_url" env:"OCIS_URL;OCDAV_PUBLIC_URL"`
+
+	// Insecure certificates allowed when making requests to the gateway
+	Insecure bool `yaml:"insecure" env:"OCIS_INSECURE;OCDAV_INSECURE"`
+	// Timeout in seconds when making requests to the gateway
+	Timeout    int64 `yaml:"timeout"`
+	Middleware Middleware
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;OCDAV_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;OCDAV_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;OCDAV_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;OCDAV_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;OCDAV_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;OCDAV_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;OCDAV_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;OCDAV_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"OCDAV_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"OCDAV_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"OCDAV_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"OCDAV_DEBUG_ZPAGES"`
+}
+
+type HTTPConfig struct {
+	Addr     string `yaml:"addr" env:"OCDAV_HTTP_ADDR" desc:"The address of the http service."`
+	Protocol string `yaml:"protocol" env:"OCDAV_HTTP_PROTOCOL" desc:"The transport protocol of the http service."`
+	Prefix   string `yaml:"prefix"`
+}
+
+// Middleware configures reva middlewares.
+type Middleware struct {
+	Auth Auth `yaml:"auth"`
+}
+
+// Auth configures reva http auth middleware.
+type Auth struct {
+	CredentialsByUserAgent map[string]string `yaml:"credentials_by_user_agenr"`
+}

extensions/ocdav/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,74 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9163",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		HTTP: config.HTTPConfig{
+			Addr:     "127.0.0.1:0", // :0 to pick any free local port
+			Protocol: "tcp",
+			Prefix:   "",
+		},
+		Service: config.Service{
+			Name: "ocdav",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		WebdavNamespace: "/users/{{.Id.OpaqueId}}",
+		FilesNamespace:  "/users/{{.Id.OpaqueId}}",
+		SharesNamespace: "/Shares",
+		PublicURL:       "https://localhost:9200",
+		Insecure:        false,
+		Timeout:         84300,
+		Middleware: config.Middleware{
+			Auth: config.Auth{
+				CredentialsByUserAgent: map[string]string{},
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/sharing/pkg/command/command.go

@@ -0,0 +1,238 @@
+package command
+
+import (
+	"context"
+	"flag"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
+
+	"github.com/cs3org/reva/v2/cmd/revad/runtime"
+	"github.com/gofrs/uuid"
+	"github.com/oklog/run"
+	"github.com/owncloud/ocis/extensions/sharing/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
+)
+
+// Sharing is the entrypoint for the sharing command.
+func Sharing(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "sharing",
+		Usage: "start sharing service",
+		Action: func(c *cli.Context) error {
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
+			gr := run.Group{}
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			// precreate folders
+			if cfg.UserSharingDriver == "json" && cfg.UserSharingDrivers.JSON.File != "" {
+				if err := os.MkdirAll(filepath.Dir(cfg.UserSharingDrivers.JSON.File), os.FileMode(0700)); err != nil {
+					return err
+				}
+			}
+			if cfg.PublicSharingDriver == "json" && cfg.PublicSharingDrivers.JSON.File != "" {
+				if err := os.MkdirAll(filepath.Dir(cfg.PublicSharingDrivers.JSON.File), os.FileMode(0700)); err != nil {
+					return err
+				}
+			}
+
+			uuid := uuid.Must(uuid.NewV4())
+			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
+
+			rcfg := sharingConfigFromStruct(c, cfg)
+
+			gr.Add(func() error {
+				runtime.RunWithOptions(
+					rcfg,
+					pidFile,
+					runtime.WithLogger(&logger.Logger),
+				)
+				return nil
+			}, func(_ error) {
+				logger.Info().
+					Str("server", c.Command.Name).
+					Msg("Shutting down server")
+
+				cancel()
+			})
+
+			debug, err := debug.Server(
+				debug.Name(c.Command.Name+"-debug"),
+				debug.Addr(cfg.Debug.Addr),
+				debug.Logger(logger),
+				debug.Context(ctx),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
+			)
+
+			if err != nil {
+				logger.Info().Err(err).Str("server", c.Command.Name+"-debug").Msg("Failed to initialize server")
+				return err
+			}
+
+			gr.Add(debug.ListenAndServe, func(_ error) {
+				cancel()
+			})
+
+			if !cfg.Supervised {
+				sync.Trap(&gr, cancel)
+			}
+
+			return gr.Run()
+		},
+	}
+}
+
+// sharingConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
+func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
+	rcfg := map[string]interface{}{
+		"core": map[string]interface{}{
+			"tracing_enabled":      cfg.Tracing.Enabled,
+			"tracing_endpoint":     cfg.Tracing.Endpoint,
+			"tracing_collector":    cfg.Tracing.Collector,
+			"tracing_service_name": c.Command.Name,
+		},
+		"shared": map[string]interface{}{
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
+		},
+		"grpc": map[string]interface{}{
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
+			// TODO build services dynamically
+			"services": map[string]interface{}{
+				"usershareprovider": map[string]interface{}{
+					"driver": cfg.UserSharingDriver,
+					"drivers": map[string]interface{}{
+						"json": map[string]interface{}{
+							"file":         cfg.UserSharingDrivers.JSON.File,
+							"gateway_addr": cfg.GatewayEndpoint,
+						},
+						"sql": map[string]interface{}{ // cernbox sql
+							"db_username":                   cfg.UserSharingDrivers.SQL.DBUsername,
+							"db_password":                   cfg.UserSharingDrivers.SQL.DBPassword,
+							"db_host":                       cfg.UserSharingDrivers.SQL.DBHost,
+							"db_port":                       cfg.UserSharingDrivers.SQL.DBPort,
+							"db_name":                       cfg.UserSharingDrivers.SQL.DBName,
+							"password_hash_cost":            cfg.UserSharingDrivers.SQL.PasswordHashCost,
+							"enable_expired_shares_cleanup": cfg.UserSharingDrivers.SQL.EnableExpiredSharesCleanup,
+							"janitor_run_interval":          cfg.UserSharingDrivers.SQL.JanitorRunInterval,
+						},
+						"oc10-sql": map[string]interface{}{
+							"storage_mount_id": cfg.UserSharingDrivers.SQL.UserStorageMountID,
+							"db_username":      cfg.UserSharingDrivers.SQL.DBUsername,
+							"db_password":      cfg.UserSharingDrivers.SQL.DBPassword,
+							"db_host":          cfg.UserSharingDrivers.SQL.DBHost,
+							"db_port":          cfg.UserSharingDrivers.SQL.DBPort,
+							"db_name":          cfg.UserSharingDrivers.SQL.DBName,
+						},
+						"cs3": map[string]interface{}{
+							"provider_addr":       cfg.UserSharingDrivers.CS3.ProviderAddr,
+							"service_user_id":     cfg.UserSharingDrivers.CS3.ServiceUserID,
+							"service_user_idp":    cfg.UserSharingDrivers.CS3.ServiceUserIDP,
+							"machine_auth_apikey": cfg.UserSharingDrivers.CS3.MachineAuthAPIKey,
+						},
+					},
+				},
+				"publicshareprovider": map[string]interface{}{
+					"driver": cfg.PublicSharingDriver,
+					"drivers": map[string]interface{}{
+						"json": map[string]interface{}{
+							"file":         cfg.PublicSharingDrivers.JSON.File,
+							"gateway_addr": cfg.GatewayEndpoint,
+						},
+						"sql": map[string]interface{}{
+							"db_username":                   cfg.PublicSharingDrivers.SQL.DBUsername,
+							"db_password":                   cfg.PublicSharingDrivers.SQL.DBPassword,
+							"db_host":                       cfg.PublicSharingDrivers.SQL.DBHost,
+							"db_port":                       cfg.PublicSharingDrivers.SQL.DBPort,
+							"db_name":                       cfg.PublicSharingDrivers.SQL.DBName,
+							"password_hash_cost":            cfg.PublicSharingDrivers.SQL.PasswordHashCost,
+							"enable_expired_shares_cleanup": cfg.PublicSharingDrivers.SQL.EnableExpiredSharesCleanup,
+							"janitor_run_interval":          cfg.PublicSharingDrivers.SQL.JanitorRunInterval,
+						},
+						"oc10-sql": map[string]interface{}{
+							"storage_mount_id":              cfg.PublicSharingDrivers.SQL.UserStorageMountID,
+							"db_username":                   cfg.PublicSharingDrivers.SQL.DBUsername,
+							"db_password":                   cfg.PublicSharingDrivers.SQL.DBPassword,
+							"db_host":                       cfg.PublicSharingDrivers.SQL.DBHost,
+							"db_port":                       cfg.PublicSharingDrivers.SQL.DBPort,
+							"db_name":                       cfg.PublicSharingDrivers.SQL.DBName,
+							"password_hash_cost":            cfg.PublicSharingDrivers.SQL.PasswordHashCost,
+							"enable_expired_shares_cleanup": cfg.PublicSharingDrivers.SQL.EnableExpiredSharesCleanup,
+							"janitor_run_interval":          cfg.PublicSharingDrivers.SQL.JanitorRunInterval,
+						},
+						"cs3": map[string]interface{}{
+							"provider_addr":       cfg.PublicSharingDrivers.CS3.ProviderAddr,
+							"service_user_id":     cfg.PublicSharingDrivers.CS3.ServiceUserID,
+							"service_user_idp":    cfg.PublicSharingDrivers.CS3.ServiceUserIDP,
+							"machine_auth_apikey": cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey,
+						},
+					},
+				},
+			},
+			"interceptors": map[string]interface{}{
+				"eventsmiddleware": map[string]interface{}{
+					"group":     "sharing",
+					"type":      "nats",
+					"address":   cfg.Events.Addr,
+					"clusterID": cfg.Events.ClusterID,
+				},
+			},
+		},
+	}
+	return rcfg
+}
+
+// SharingSutureService allows for the storage-sharing command to be embedded and supervised by a suture supervisor tree.
+type SharingSutureService struct {
+	cfg *config.Config
+}
+
+// NewSharingSutureService creates a new store.SharingSutureService
+func NewSharing(cfg *ociscfg.Config) suture.Service {
+	cfg.Sharing.Commons = cfg.Commons
+	return SharingSutureService{
+		cfg: cfg.Sharing,
+	}
+}
+
+func (s SharingSutureService) Serve(ctx context.Context) error {
+	// s.cfg.Reva.Sharing.Context = ctx
+	cmd := Sharing(s.cfg)
+	f := &flag.FlagSet{}
+	cmdFlags := cmd.Flags
+	for k := range cmdFlags {
+		if err := cmdFlags[k].Apply(f); err != nil {
+			return err
+		}
+	}
+	cliCtx := cli.NewContext(nil, f, nil)
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
+			return err
+		}
+	}
+	if err := cmd.Action(cliCtx); err != nil {
+		return err
+	}
+
+	return nil
+}

extensions/sharing/pkg/config/config.go

@@ -0,0 +1,115 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	UserSharingDriver     string
+	UserSharingDrivers    UserSharingDrivers
+	PublicSharingDriver   string
+	PublicSharingDrivers  PublicSharingDrivers
+	Events                Events
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;SHARING_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;SHARING_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;SHARING_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;SHARING_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;SHARING_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;SHARING_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;SHARING_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;SHARING_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"SHARING_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"SHARING_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"SHARING_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"SHARING_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"SHARING_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"SHARING_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type UserSharingDrivers struct {
+	JSON UserSharingJSONDriver
+	SQL  UserSharingSQLDriver
+	CS3  UserSharingCS3Driver
+}
+
+type UserSharingJSONDriver struct {
+	File string `env:"SHARING_USER_JSON_FILE"`
+}
+
+type UserSharingSQLDriver struct {
+	DBUsername                 string `env:"SHARING_USER_SQL_USERNAME"`
+	DBPassword                 string `env:"SHARING_USER_SQL_PASSWORD"`
+	DBHost                     string `env:"SHARING_USER_SQL_HOST"`
+	DBPort                     int    `env:"SHARING_USER_SQL_PORT"`
+	DBName                     string `env:"SHARING_USER_SQL_NAME"`
+	PasswordHashCost           int
+	EnableExpiredSharesCleanup bool
+	JanitorRunInterval         int
+	UserStorageMountID         string
+}
+
+type UserSharingCS3Driver struct {
+	ProviderAddr      string
+	ServiceUserID     string
+	ServiceUserIDP    string `env:"OCIS_URL;SHARING_CS3_SERVICE_USER_IDP"`
+	MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
+}
+
+type PublicSharingDrivers struct {
+	JSON PublicSharingJSONDriver
+	SQL  PublicSharingSQLDriver
+	CS3  PublicSharingCS3Driver
+}
+
+type PublicSharingJSONDriver struct {
+	File string
+}
+
+type PublicSharingSQLDriver struct {
+	DBUsername                 string
+	DBPassword                 string
+	DBHost                     string
+	DBPort                     int
+	DBName                     string
+	PasswordHashCost           int
+	EnableExpiredSharesCleanup bool
+	JanitorRunInterval         int
+	UserStorageMountID         string
+}
+
+type PublicSharingCS3Driver struct {
+	ProviderAddr      string
+	ServiceUserID     string
+	ServiceUserIDP    string
+	MachineAuthAPIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
+}
+
+type Events struct {
+	Addr      string
+	ClusterID string
+}

extensions/sharing/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,111 @@
+package defaults
+
+import (
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/sharing/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9151",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9150",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "sharing",
+		},
+		GatewayEndpoint:   "127.0.0.1:9142",
+		JWTSecret:         "Pive-Fumkiu4",
+		UserSharingDriver: "json",
+		UserSharingDrivers: config.UserSharingDrivers{
+			JSON: config.UserSharingJSONDriver{
+				File: filepath.Join(defaults.BaseDataPath(), "storage", "shares.json"),
+			},
+			SQL: config.UserSharingSQLDriver{
+				DBUsername:                 "",
+				DBPassword:                 "",
+				DBHost:                     "",
+				DBPort:                     1433,
+				DBName:                     "",
+				PasswordHashCost:           11,
+				EnableExpiredSharesCleanup: true,
+				JanitorRunInterval:         60,
+			},
+			CS3: config.UserSharingCS3Driver{
+				ProviderAddr:   "127.0.0.1:9215",
+				ServiceUserID:  "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
+				ServiceUserIDP: "https://localhost:9200",
+			},
+		},
+		PublicSharingDriver: "json",
+		PublicSharingDrivers: config.PublicSharingDrivers{
+			JSON: config.PublicSharingJSONDriver{
+				File: filepath.Join(defaults.BaseDataPath(), "storage", "publicshares.json"),
+			},
+			SQL: config.PublicSharingSQLDriver{
+				DBUsername:                 "",
+				DBPassword:                 "",
+				DBHost:                     "",
+				DBPort:                     1433,
+				DBName:                     "",
+				PasswordHashCost:           11,
+				EnableExpiredSharesCleanup: true,
+				JanitorRunInterval:         60,
+			},
+			CS3: config.PublicSharingCS3Driver{
+				ProviderAddr:   "127.0.0.1:9215",
+				ServiceUserID:  "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
+				ServiceUserIDP: "https://localhost:9200",
+			},
+		},
+		Events: config.Events{
+			Addr:      "127.0.0.1:9233",
+			ClusterID: "ocis-cluster",
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/storage-metadata/pkg/command/command.go

@@ -6,16 +6,16 @@ import (
 	"os"
 	"path"
 
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/command/storagedrivers"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/extensions/storage/pkg/service/external"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/thejerf/suture/v4"
@@ -27,22 +27,25 @@ import (
 // It provides a ocis-specific storage store metadata (shares,account,settings...)
 func StorageMetadata(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:  "storage-metadata",
-		Usage: "start storage-metadata service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-metadata")
-		},
+		Name:     "storage-metadata",
+		Usage:    "start storage-metadata service",
 		Category: "extensions",
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 
 			gr := run.Group{}
 			ctx, cancel := func() (context.Context, context.CancelFunc) {
-				if cfg.Reva.StorageMetadata.Context == nil {
+				if cfg.Context == nil {
 					return context.WithCancel(context.Background())
 				}
-				return context.WithCancel(cfg.Reva.StorageMetadata.Context)
+				return context.WithCancel(cfg.Context)
 			}()
 
 			defer cancel()
@@ -67,10 +70,12 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.StorageMetadata.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -89,7 +94,7 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -97,7 +102,7 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 				ctx,
 				"com.owncloud.storage.metadata",
 				uuid.Must(uuid.NewV4()).String(),
-				cfg.Reva.StorageMetadata.GRPCAddr,
+				cfg.GRPC.Addr,
 				version.String,
 				logger,
 			); err != nil {
@@ -113,43 +118,42 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.StorageMetadata.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.StorageMetadata.GRPCNetwork,
-			"address": cfg.Reva.StorageMetadata.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			"interceptors": map[string]interface{}{
 				"log": map[string]interface{}{},
 			},
 			"services": map[string]interface{}{
 				"storageprovider": map[string]interface{}{
-					"driver":          cfg.Reva.StorageMetadata.Driver,
-					"drivers":         storagedrivers.MetadataDrivers(cfg),
-					"data_server_url": cfg.Reva.StorageMetadata.DataServerURL,
-					"tmp_folder":      cfg.Reva.StorageMetadata.TempFolder,
+					"driver":          cfg.Driver,
+					"drivers":         config.MetadataDrivers(cfg),
+					"data_server_url": cfg.DataServerURL,
+					"tmp_folder":      cfg.TempFolder,
 				},
 			},
 		},
 		"http": map[string]interface{}{
-			"network": cfg.Reva.StorageMetadata.HTTPNetwork,
-			"address": cfg.Reva.StorageMetadata.HTTPAddr,
+			"network": cfg.HTTP.Protocol,
+			"address": cfg.HTTP.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"dataprovider": map[string]interface{}{
 					"prefix":      "data",
-					"driver":      cfg.Reva.StorageMetadata.Driver,
-					"drivers":     storagedrivers.MetadataDrivers(cfg),
+					"driver":      cfg.Driver,
+					"drivers":     config.MetadataDrivers(cfg),
 					"timeout":     86400,
-					"insecure":    cfg.Reva.StorageMetadata.DataProvider.Insecure,
+					"insecure":    cfg.DataProviderInsecure,
 					"disable_tus": true,
 				},
 			},
@@ -165,14 +169,14 @@ type MetadataSutureService struct {
 
 // NewSutureService creates a new storagemetadata.SutureService
 func NewStorageMetadata(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.StorageMetadata.Commons = cfg.Commons
 	return MetadataSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.StorageMetadata,
 	}
 }
 
 func (s MetadataSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.StorageMetadata.Context = ctx
+	s.cfg.Context = ctx
 	f := &flag.FlagSet{}
 	cmdFlags := StorageMetadata(s.cfg).Flags
 	for k := range cmdFlags {

extensions/storage-metadata/pkg/config/config.go

@@ -0,0 +1,147 @@
+package config
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+)
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+	HTTP HTTPConfig `yaml:"http"`
+
+	Context               context.Context
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	Driver                string  `yaml:"driver" env:"STORAGE_METADATA_DRIVER" desc:"The driver which should be used by the service"`
+	Drivers               Drivers `yaml:"drivers"`
+	DataServerURL         string
+	TempFolder            string
+	DataProviderInsecure  bool `env:"OCIS_INSECURE;STORAGE_METADATA_DATAPROVIDER_INSECURE"`
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_METADATA_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_METADATA_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_METADATA_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_METADATA_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_METADATA_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_METADATA_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_METADATA_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_METADATA_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"STORAGE_METADATA_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"STORAGE_METADATA_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"STORAGE_METADATA_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"STORAGE_METADATA_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type HTTPConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type Drivers struct {
+	EOS   EOSDriver
+	Local LocalDriver
+	OCIS  OCISDriver
+	S3    S3Driver
+	S3NG  S3NGDriver
+}
+
+type EOSDriver struct {
+	// Root is the absolute path to the location of the data
+	Root string `yaml:"root"`
+	// ShadowNamespace for storing shadow data
+	ShadowNamespace string `yaml:"shadow_namespace"`
+	// UploadsNamespace for storing upload data
+	UploadsNamespace string `yaml:"uploads_namespace"`
+	// Location of the eos binary.
+	// Default is /usr/bin/eos.
+	EosBinary string `yaml:"eos_binary"`
+	// Location of the xrdcopy binary.
+	// Default is /usr/bin/xrdcopy.
+	XrdcopyBinary string `yaml:"xrd_copy_binary"`
+	// URL of the Master EOS MGM.
+	// Default is root://eos-example.org
+	MasterURL string `yaml:"master_url"`
+	// URL of the Slave EOS MGM.
+	// Default is root://eos-example.org
+	SlaveURL string `yaml:"slave_url"`
+	// Location on the local fs where to store reads.
+	// Defaults to os.TempDir()
+	CacheDirectory string `yaml:"cache_directory"`
+	// SecProtocol specifies the xrootd security protocol to use between the server and EOS.
+	SecProtocol string `yaml:"sec_protocol"`
+	// Keytab specifies the location of the keytab to use to authenticate to EOS.
+	Keytab string `yaml:"keytab"`
+	// SingleUsername is the username to use when SingleUserMode is enabled
+	SingleUsername string `yaml:"single_username"`
+	// Enables logging of the commands executed
+	// Defaults to false
+	EnableLogging bool `yaml:"enable_logging"`
+	// ShowHiddenSysFiles shows internal EOS files like
+	// .sys.v# and .sys.a# files.
+	ShowHiddenSysFiles bool `yaml:"shadow_hidden_files"`
+	// ForceSingleUserMode will force connections to EOS to use SingleUsername
+	ForceSingleUserMode bool `yaml:"force_single_user_mode"`
+	// UseKeyTabAuth changes will authenticate requests by using an EOS keytab.
+	UseKeytab bool `yaml:"user_keytab"`
+	// gateway service to use for uid lookups
+	GatewaySVC string `yaml:"gateway_svc"`
+	GRPCURI    string
+	UserLayout string
+}
+
+type LocalDriver struct {
+	// Root is the absolute path to the location of the data
+	Root string `yaml:"root"`
+}
+
+type OCISDriver struct {
+	// Root is the absolute path to the location of the data
+	Root                string `yaml:"root" env:"STORAGE_METADATA_DRIVER_OCIS_ROOT"`
+	UserLayout          string
+	PermissionsEndpoint string
+}
+
+type S3Driver struct {
+	Region    string `yaml:"region"`
+	AccessKey string `yaml:"access_key"`
+	SecretKey string `yaml:"secret_key"`
+	Endpoint  string `yaml:"endpoint"`
+	Bucket    string `yaml:"bucket"`
+}
+
+type S3NGDriver struct {
+	// Root is the absolute path to the location of the data
+	Root                string `yaml:"root"`
+	UserLayout          string
+	PermissionsEndpoint string
+	Region              string `yaml:"region"`
+	AccessKey           string `yaml:"access_key"`
+	SecretKey           string `yaml:"secret_key"`
+	Endpoint            string `yaml:"endpoint"`
+	Bucket              string `yaml:"bucket"`
+}

extensions/storage-metadata/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,112 @@
+package defaults
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9217",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9215",
+			Protocol: "tcp",
+		},
+		HTTP: config.HTTPConfig{
+			Addr:     "127.0.0.1:9216",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "storage-metadata",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		TempFolder:      filepath.Join(defaults.BaseDataPath(), "tmp", "metadata"),
+		DataServerURL:   "http://localhost:9216/data",
+		Driver:          "ocis",
+		Drivers: config.Drivers{
+			EOS: config.EOSDriver{
+				Root:                "/eos/dockertest/reva",
+				UserLayout:          "{{substr 0 1 .Username}}/{{.Username}}",
+				ShadowNamespace:     "",
+				UploadsNamespace:    "",
+				EosBinary:           "/usr/bin/eos",
+				XrdcopyBinary:       "/usr/bin/xrdcopy",
+				MasterURL:           "root://eos-mgm1.eoscluster.cern.ch:1094",
+				GRPCURI:             "",
+				SlaveURL:            "root://eos-mgm1.eoscluster.cern.ch:1094",
+				CacheDirectory:      os.TempDir(),
+				EnableLogging:       false,
+				ShowHiddenSysFiles:  false,
+				ForceSingleUserMode: false,
+				UseKeytab:           false,
+				SecProtocol:         "",
+				Keytab:              "",
+				SingleUsername:      "",
+				GatewaySVC:          "127.0.0.1:9142",
+			},
+			Local: config.LocalDriver{
+				Root: filepath.Join(defaults.BaseDataPath(), "storage", "local", "metadata"),
+			},
+			S3: config.S3Driver{
+				Region: "default",
+			},
+			S3NG: config.S3NGDriver{
+				Root:                filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
+				UserLayout:          "{{.Id.OpaqueId}}",
+				Region:              "default",
+				PermissionsEndpoint: "127.0.0.1:9191",
+			},
+			OCIS: config.OCISDriver{
+				Root:                filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
+				UserLayout:          "{{.Id.OpaqueId}}",
+				PermissionsEndpoint: "127.0.0.1:9191",
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/storage-metadata/pkg/config/metadata.go

@@ -0,0 +1,75 @@
+package config
+
+func MetadataDrivers(cfg *Config) map[string]interface{} {
+	return map[string]interface{}{
+		"eos": map[string]interface{}{
+			"namespace":              cfg.Drivers.EOS.Root,
+			"shadow_namespace":       cfg.Drivers.EOS.ShadowNamespace,
+			"uploads_namespace":      cfg.Drivers.EOS.UploadsNamespace,
+			"eos_binary":             cfg.Drivers.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Drivers.EOS.XrdcopyBinary,
+			"master_url":             cfg.Drivers.EOS.MasterURL,
+			"slave_url":              cfg.Drivers.EOS.SlaveURL,
+			"cache_directory":        cfg.Drivers.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Drivers.EOS.SecProtocol,
+			"keytab":                 cfg.Drivers.EOS.Keytab,
+			"single_username":        cfg.Drivers.EOS.SingleUsername,
+			"enable_logging":         cfg.Drivers.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Drivers.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Drivers.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Drivers.EOS.UseKeytab,
+			"gatewaysvc":             cfg.Drivers.EOS.GatewaySVC,
+			"enable_home":            false,
+		},
+		"eosgrpc": map[string]interface{}{
+			"namespace":              cfg.Drivers.EOS.Root,
+			"shadow_namespace":       cfg.Drivers.EOS.ShadowNamespace,
+			"eos_binary":             cfg.Drivers.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Drivers.EOS.XrdcopyBinary,
+			"master_url":             cfg.Drivers.EOS.MasterURL,
+			"master_grpc_uri":        cfg.Drivers.EOS.GRPCURI,
+			"slave_url":              cfg.Drivers.EOS.SlaveURL,
+			"cache_directory":        cfg.Drivers.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Drivers.EOS.SecProtocol,
+			"keytab":                 cfg.Drivers.EOS.Keytab,
+			"single_username":        cfg.Drivers.EOS.SingleUsername,
+			"user_layout":            cfg.Drivers.EOS.UserLayout,
+			"enable_logging":         cfg.Drivers.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Drivers.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Drivers.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Drivers.EOS.UseKeytab,
+			"enable_home":            false,
+			"gatewaysvc":             cfg.Drivers.EOS.GatewaySVC,
+		},
+		"local": map[string]interface{}{
+			"root": cfg.Drivers.Local.Root,
+		},
+		"ocis": map[string]interface{}{
+			"root":                cfg.Drivers.OCIS.Root,
+			"user_layout":         cfg.Drivers.OCIS.UserLayout,
+			"treetime_accounting": false,
+			"treesize_accounting": false,
+			"permissionssvc":      cfg.Drivers.OCIS.PermissionsEndpoint,
+		},
+		"s3": map[string]interface{}{
+			"region":     cfg.Drivers.S3.Region,
+			"access_key": cfg.Drivers.S3.AccessKey,
+			"secret_key": cfg.Drivers.S3.SecretKey,
+			"endpoint":   cfg.Drivers.S3.Endpoint,
+			"bucket":     cfg.Drivers.S3.Bucket,
+		},
+		"s3ng": map[string]interface{}{
+			"root":                cfg.Drivers.S3NG.Root,
+			"enable_home":         false,
+			"user_layout":         cfg.Drivers.S3NG.UserLayout,
+			"treetime_accounting": false,
+			"treesize_accounting": false,
+			"permissionssvc":      cfg.Drivers.S3NG.PermissionsEndpoint,
+			"s3.region":           cfg.Drivers.S3NG.Region,
+			"s3.access_key":       cfg.Drivers.S3NG.AccessKey,
+			"s3.secret_key":       cfg.Drivers.S3NG.SecretKey,
+			"s3.endpoint":         cfg.Drivers.S3NG.Endpoint,
+			"s3.bucket":           cfg.Drivers.S3NG.Bucket,
+		},
+	}
+}

extensions/storage-publiclink/pkg/command/storagepubliclink.go

@@ -9,11 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -21,15 +22,18 @@ import (
 // StoragePublicLink is the entrypoint for the reva-storage-public-link command.
 func StoragePublicLink(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:  "storage-public-link",
-		Usage: "start storage-public-link service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-public-link")
-		},
+		Name:     "storage-public-link",
+		Usage:    "start storage-public-link service",
 		Category: "extensions",
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg, logger)
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
@@ -54,10 +58,12 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.StoragePublicLink.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -69,7 +75,7 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StoragePublicLink.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -82,33 +88,32 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 func storagePublicLinkConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.StoragePublicLink.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.StoragePublicLink.GRPCNetwork,
-			"address": cfg.Reva.StoragePublicLink.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			"interceptors": map[string]interface{}{
 				"log": map[string]interface{}{},
 			},
 			"services": map[string]interface{}{
 				"publicstorageprovider": map[string]interface{}{
-					"mount_id":     cfg.Reva.StoragePublicLink.MountID,
-					"gateway_addr": cfg.Reva.Gateway.Endpoint,
+					"mount_id":     cfg.StorageProvider.MountID,
+					"gateway_addr": cfg.StorageProvider.GatewayEndpoint,
 				},
 				"authprovider": map[string]interface{}{
 					"auth_manager": "publicshares",
 					"auth_managers": map[string]interface{}{
 						"publicshares": map[string]interface{}{
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
+							"gateway_addr": cfg.AuthProvider.GatewayEndpoint,
 						},
 					},
 				},
@@ -125,28 +130,29 @@ type StoragePublicLinkSutureService struct {
 
 // NewStoragePublicLinkSutureService creates a new storage.StoragePublicLinkSutureService
 func NewStoragePublicLink(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.StoragePublicLink.Commons = cfg.Commons
 	return StoragePublicLinkSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.StoragePublicLink,
 	}
 }
 
 func (s StoragePublicLinkSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.StoragePublicLink.Context = ctx
+	// s.cfg.Reva.StoragePublicLink.Context = ctx
+	cmd := StoragePublicLink(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := StoragePublicLink(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if StoragePublicLink(s.cfg).Before != nil {
-		if err := StoragePublicLink(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := StoragePublicLink(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/storage-publiclink/pkg/config/config.go

@@ -0,0 +1,63 @@
+package config
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+)
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	Context               context.Context
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	AuthProvider          AuthProvider
+	StorageProvider       StorageProvider
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_METADATA_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_METADATA_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_METADATA_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_METADATA_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_METADATA_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_METADATA_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_METADATA_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_METADATA_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"STORAGE_METADATA_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"STORAGE_METADATA_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"STORAGE_METADATA_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"STORAGE_METADATA_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type AuthProvider struct {
+	GatewayEndpoint string
+}
+
+type StorageProvider struct {
+	MountID         string
+	GatewayEndpoint string
+}

extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,69 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9179",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9178",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "storage-publiclink",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		AuthProvider: config.AuthProvider{
+			GatewayEndpoint: "127.0.0.1:9142",
+		},
+		StorageProvider: config.StorageProvider{
+			MountID:         "7993447f-687f-490d-875c-ac95e89a62a4",
+			GatewayEndpoint: "127.0.0.1:9142",
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/storage-shares/pkg/command/command.go

@@ -6,14 +6,15 @@ import (
 	"os"
 	"path"
 
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage-shares/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
@@ -24,14 +25,15 @@ func StorageShares(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-shares",
 		Usage: "start storage-shares service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-shares")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
@@ -58,10 +60,12 @@ func StorageShares(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.StorageShares.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -73,7 +77,7 @@ func StorageShares(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageShares.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -86,29 +90,27 @@ func StorageShares(cfg *config.Config) *cli.Command {
 func storageSharesConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.StorageShares.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.StorageShares.GRPCNetwork,
-			"address": cfg.Reva.StorageShares.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			"services": map[string]interface{}{
 				"sharesstorageprovider": map[string]interface{}{
-					"usershareprovidersvc": cfg.Reva.Sharing.Endpoint,
-					"gateway_addr":         cfg.Reva.Gateway.Endpoint,
+					"usershareprovidersvc": cfg.SharesProviderEndpoint,
 				},
 			},
 		},
 	}
-	if cfg.Reva.StorageShares.ReadOnly {
+	if cfg.ReadOnly {
 		gcfg := rcfg["grpc"].(map[string]interface{})
 		gcfg["interceptors"] = map[string]interface{}{
 			"readonly": map[string]interface{}{},
@@ -124,28 +126,29 @@ type StorageSharesSutureService struct {
 
 // NewStorageShares creates a new storage.StorageSharesSutureService
 func NewStorageShares(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.StorageShares.Commons = cfg.Commons
 	return StorageSharesSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.StorageShares,
 	}
 }
 
 func (s StorageSharesSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.StorageShares.Context = ctx
+	// s.cfg.Reva.StorageShares.Context = ctx
+	cmd := StorageShares(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := StorageShares(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if StorageShares(s.cfg).Before != nil {
-		if err := StorageShares(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := StorageShares(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/storage-shares/pkg/config/config.go

@@ -0,0 +1,60 @@
+package config
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+)
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+	HTTP HTTPConfig `yaml:"http"`
+
+	Context                context.Context
+	JWTSecret              string
+	GatewayEndpoint        string
+	SkipUserGroupsInToken  bool
+	ReadOnly               bool
+	SharesProviderEndpoint string
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_METADATA_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_METADATA_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_METADATA_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_METADATA_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_METADATA_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_METADATA_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_METADATA_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_METADATA_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"STORAGE_METADATA_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"STORAGE_METADATA_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"STORAGE_METADATA_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"STORAGE_METADATA_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type HTTPConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_METADATA_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_METADATA_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}

extensions/storage-shares/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,68 @@
+package defaults
+
+import (
+	"github.com/owncloud/ocis/extensions/storage-shares/pkg/config"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9156",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9154",
+			Protocol: "tcp",
+		},
+		HTTP: config.HTTPConfig{
+			Addr:     "127.0.0.1:9155",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "storage-metadata",
+		},
+		GatewayEndpoint:        "127.0.0.1:9142",
+		JWTSecret:              "Pive-Fumkiu4",
+		ReadOnly:               false,
+		SharesProviderEndpoint: "localhost:9150",
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/storage-users/pkg/command/command.go

@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/command/storagedrivers"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
+	"github.com/owncloud/ocis/extensions/storage-users/pkg/config"
 	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -24,17 +24,17 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-users",
 		Usage: "start storage-users service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-userprovider")
-		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
-
 			defer cancel()
 
 			uuid := uuid.Must(uuid.NewV4())
@@ -59,10 +59,12 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 
 			debugServer, err := debug.Server(
 				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.StorageUsers.DebugAddr),
+				debug.Addr(cfg.Debug.Addr),
 				debug.Logger(logger),
 				debug.Context(ctx),
-				debug.Config(cfg),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
 			)
 
 			if err != nil {
@@ -74,7 +76,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageUsers.Supervised {
+			if !cfg.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
@@ -87,57 +89,56 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 func storageUsersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.StorageUsers.MaxCPUs,
 			"tracing_enabled":      cfg.Tracing.Enabled,
 			"tracing_endpoint":     cfg.Tracing.Endpoint,
 			"tracing_collector":    cfg.Tracing.Collector,
 			"tracing_service_name": c.Command.Name,
 		},
 		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
 		},
 		"grpc": map[string]interface{}{
-			"network": cfg.Reva.StorageUsers.GRPCNetwork,
-			"address": cfg.Reva.StorageUsers.GRPCAddr,
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"storageprovider": map[string]interface{}{
-					"driver":             cfg.Reva.StorageUsers.Driver,
-					"drivers":            storagedrivers.UserDrivers(cfg),
-					"mount_id":           cfg.Reva.StorageUsers.MountID,
-					"expose_data_server": cfg.Reva.StorageUsers.ExposeDataServer,
-					"data_server_url":    cfg.Reva.StorageUsers.DataServerURL,
-					"tmp_folder":         cfg.Reva.StorageUsers.TempFolder,
+					"driver":             cfg.Driver,
+					"drivers":            config.UserDrivers(cfg),
+					"mount_id":           cfg.MountID,
+					"expose_data_server": cfg.ExposeDataServer,
+					"data_server_url":    cfg.DataServerURL,
+					"tmp_folder":         cfg.TempFolder,
 				},
 			},
 			"interceptors": map[string]interface{}{
 				"eventsmiddleware": map[string]interface{}{
 					"group":     "sharing",
 					"type":      "nats",
-					"address":   cfg.Reva.Sharing.Events.Address,
-					"clusterID": cfg.Reva.Sharing.Events.ClusterID,
+					"address":   cfg.Events.Addr,
+					"clusterID": cfg.Events.ClusterID,
 				},
 			},
 		},
 		"http": map[string]interface{}{
-			"network": cfg.Reva.StorageUsers.HTTPNetwork,
-			"address": cfg.Reva.StorageUsers.HTTPAddr,
+			"network": cfg.HTTP.Protocol,
+			"address": cfg.HTTP.Addr,
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"dataprovider": map[string]interface{}{
-					"prefix":      cfg.Reva.StorageUsers.HTTPPrefix,
-					"driver":      cfg.Reva.StorageUsers.Driver,
-					"drivers":     storagedrivers.UserDrivers(cfg),
+					"prefix":      cfg.HTTP.Prefix,
+					"driver":      cfg.Driver,
+					"drivers":     config.UserDrivers(cfg),
 					"timeout":     86400,
-					"insecure":    cfg.Reva.StorageUsers.DataProvider.Insecure,
+					"insecure":    cfg.DataProviderInsecure,
 					"disable_tus": false,
 				},
 			},
 		},
 	}
-	if cfg.Reva.StorageUsers.ReadOnly {
+	if cfg.ReadOnly {
 		gcfg := rcfg["grpc"].(map[string]interface{})
 		gcfg["interceptors"] = map[string]interface{}{
 			"readonly": map[string]interface{}{},
@@ -153,28 +154,29 @@ type StorageUsersSutureService struct {
 
 // NewStorageUsersSutureService creates a new storage.StorageUsersSutureService
 func NewStorageUsers(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
+	cfg.StorageUsers.Commons = cfg.Commons
 	return StorageUsersSutureService{
-		cfg: cfg.Storage,
+		cfg: cfg.StorageUsers,
 	}
 }
 
 func (s StorageUsersSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.StorageUsers.Context = ctx
+	// s.cfg.Reva.StorageUsers.Context = ctx
+	cmd := StorageUsers(s.cfg)
 	f := &flag.FlagSet{}
-	cmdFlags := StorageUsers(s.cfg).Flags
+	cmdFlags := cmd.Flags
 	for k := range cmdFlags {
 		if err := cmdFlags[k].Apply(f); err != nil {
 			return err
 		}
 	}
 	cliCtx := cli.NewContext(nil, f, nil)
-	if StorageUsers(s.cfg).Before != nil {
-		if err := StorageUsers(s.cfg).Before(cliCtx); err != nil {
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
 			return err
 		}
 	}
-	if err := StorageUsers(s.cfg).Action(cliCtx); err != nil {
+	if err := cmd.Action(cliCtx); err != nil {
 		return err
 	}
 

extensions/storage-users/pkg/config/config.go

@@ -0,0 +1,196 @@
+package config
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+)
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+	HTTP HTTPConfig `yaml:"http"`
+
+	Context               context.Context
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	Driver                string  `yaml:"driver" env:"STORAGE_USERS_DRIVER" desc:"The storage driver which should be used by the service"`
+	Drivers               Drivers `yaml:"drivers"`
+	DataServerURL         string
+	TempFolder            string
+	DataProviderInsecure  bool `env:"OCIS_INSECURE;STORAGE_USERS_DATAPROVIDER_INSECURE"`
+	Events                Events
+	MountID               string
+	ExposeDataServer      bool
+	ReadOnly              bool
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORAGE_USERS_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;STORAGE_USERS_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORAGE_USERS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORAGE_USERS_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;STORAGE_USERS_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;STORAGE_USERS_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;STORAGE_USERS_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;STORAGE_USERS_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"STORAGE_USERS_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"STORAGE_USERS_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"STORAGE_USERS_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"STORAGE_USERS_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_USERS_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_USERS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type HTTPConfig struct {
+	Addr     string `yaml:"addr" env:"STORAGE_USERS_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"STORAGE_USERS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+	Prefix   string
+}
+
+type Drivers struct {
+	EOS         EOSDriver
+	Local       LocalDriver
+	OCIS        OCISDriver
+	S3          S3Driver
+	S3NG        S3NGDriver
+	OwnCloudSQL OwnCloudSQLDriver
+}
+
+type EOSDriver struct {
+	// Root is the absolute path to the location of the data
+	Root string `yaml:"root"`
+	// ShadowNamespace for storing shadow data
+	ShadowNamespace string `yaml:"shadow_namespace"`
+	// UploadsNamespace for storing upload data
+	UploadsNamespace string `yaml:"uploads_namespace"`
+	// Location of the eos binary.
+	// Default is /usr/bin/eos.
+	EosBinary string `yaml:"eos_binary"`
+	// Location of the xrdcopy binary.
+	// Default is /usr/bin/xrdcopy.
+	XrdcopyBinary string `yaml:"xrd_copy_binary"`
+	// URL of the Master EOS MGM.
+	// Default is root://eos-example.org
+	MasterURL string `yaml:"master_url"`
+	// URL of the Slave EOS MGM.
+	// Default is root://eos-example.org
+	SlaveURL string `yaml:"slave_url"`
+	// Location on the local fs where to store reads.
+	// Defaults to os.TempDir()
+	CacheDirectory string `yaml:"cache_directory"`
+	// SecProtocol specifies the xrootd security protocol to use between the server and EOS.
+	SecProtocol string `yaml:"sec_protocol"`
+	// Keytab specifies the location of the keytab to use to authenticate to EOS.
+	Keytab string `yaml:"keytab"`
+	// SingleUsername is the username to use when SingleUserMode is enabled
+	SingleUsername string `yaml:"single_username"`
+	// Enables logging of the commands executed
+	// Defaults to false
+	EnableLogging bool `yaml:"enable_logging"`
+	// ShowHiddenSysFiles shows internal EOS files like
+	// .sys.v# and .sys.a# files.
+	ShowHiddenSysFiles bool `yaml:"shadow_hidden_files"`
+	// ForceSingleUserMode will force connections to EOS to use SingleUsername
+	ForceSingleUserMode bool `yaml:"force_single_user_mode"`
+	// UseKeyTabAuth changes will authenticate requests by using an EOS keytab.
+	UseKeytab bool `yaml:"user_keytab"`
+	// gateway service to use for uid lookups
+	GatewaySVC string `yaml:"gateway_svc"`
+	//ShareFolder defines the name of the folder jailing all shares
+	ShareFolder string `yaml:"share_folder"`
+	GRPCURI     string
+	UserLayout  string
+}
+
+type LocalDriver struct {
+	// Root is the absolute path to the location of the data
+	Root string `yaml:"root" env:"STORAGE_USERS_LOCAL_ROOT"`
+	//ShareFolder defines the name of the folder jailing all shares
+	ShareFolder string `yaml:"share_folder"`
+	UserLayout  string
+}
+
+type OCISDriver struct {
+	// Root is the absolute path to the location of the data
+	Root                string `yaml:"root" env:"STORAGE_USERS_OCIS_ROOT"`
+	UserLayout          string
+	PermissionsEndpoint string
+	// PersonalSpaceAliasTemplate  contains the template used to construct
+	// the personal space alias, eg: `"{{.SpaceType}}/{{.User.Username | lower}}"`
+	PersonalSpaceAliasTemplate string `yaml:"personalspacealias_template"`
+	// GeneralSpaceAliasTemplate contains the template used to construct
+	// the general space alias, eg: `{{.SpaceType}}/{{.SpaceName | replace " " "-" | lower}}`
+	GeneralSpaceAliasTemplate string `yaml:"generalspacealias_template"`
+	//ShareFolder defines the name of the folder jailing all shares
+	ShareFolder string `yaml:"share_folder"`
+}
+
+type S3Driver struct {
+	// Root is the absolute path to the location of the data
+	Root      string `yaml:"root"`
+	Region    string `yaml:"region"`
+	AccessKey string `yaml:"access_key"`
+	SecretKey string `yaml:"secret_key"`
+	Endpoint  string `yaml:"endpoint"`
+	Bucket    string `yaml:"bucket"`
+}
+
+type S3NGDriver struct {
+	// Root is the absolute path to the location of the data
+	Root                string `yaml:"root"`
+	UserLayout          string
+	PermissionsEndpoint string
+	Region              string `yaml:"region"`
+	AccessKey           string `yaml:"access_key"`
+	SecretKey           string `yaml:"secret_key"`
+	Endpoint            string `yaml:"endpoint"`
+	Bucket              string `yaml:"bucket"`
+	// PersonalSpaceAliasTemplate  contains the template used to construct
+	// the personal space alias, eg: `"{{.SpaceType}}/{{.User.Username | lower}}"`
+	PersonalSpaceAliasTemplate string `yaml:"personalspacealias_template"`
+	// GeneralSpaceAliasTemplate contains the template used to construct
+	// the general space alias, eg: `{{.SpaceType}}/{{.SpaceName | replace " " "-" | lower}}`
+	GeneralSpaceAliasTemplate string `yaml:"generalspacealias_template"`
+	//ShareFolder defines the name of the folder jailing all shares
+	ShareFolder string `yaml:"share_folder"`
+}
+
+type OwnCloudSQLDriver struct {
+	// Root is the absolute path to the location of the data
+	Root string `yaml:"root" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR"`
+	//ShareFolder defines the name of the folder jailing all shares
+	ShareFolder           string `yaml:"share_folder" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"`
+	UserLayout            string `env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT"`
+	UploadInfoDir         string `yaml:"upload_info_dir" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR"`
+	DBUsername            string `yaml:"db_username" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME"`
+	DBPassword            string `yaml:"db_password" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD"`
+	DBHost                string `yaml:"db_host" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST"`
+	DBPort                int    `yaml:"db_port" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT"`
+	DBName                string `yaml:"db_name" env:"STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME"`
+	UsersProviderEndpoint string
+}
+
+type Events struct {
+	Addr      string
+	ClusterID string
+}

extensions/storage-users/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,131 @@
+package defaults
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/storage-users/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9159",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9157",
+			Protocol: "tcp",
+		},
+		HTTP: config.HTTPConfig{
+			Addr:     "127.0.0.1:9158",
+			Protocol: "tcp",
+			Prefix:   "data",
+		},
+		Service: config.Service{
+			Name: "storage-users",
+		},
+		GatewayEndpoint: "127.0.0.1:9142",
+		JWTSecret:       "Pive-Fumkiu4",
+		TempFolder:      filepath.Join(defaults.BaseDataPath(), "tmp", "users"),
+		DataServerURL:   "http://localhost:9158/data",
+		MountID:         "1284d238-aa92-42ce-bdc4-0b0000009157",
+		Driver:          "ocis",
+		Drivers: config.Drivers{
+			EOS: config.EOSDriver{
+				Root:             "/eos/dockertest/reva",
+				ShareFolder:      "/Shares",
+				UserLayout:       "{{substr 0 1 .Username}}/{{.Username}}",
+				ShadowNamespace:  "",
+				UploadsNamespace: "",
+				EosBinary:        "/usr/bin/eos",
+				XrdcopyBinary:    "/usr/bin/xrdcopy",
+				MasterURL:        "root://eos-mgm1.eoscluster.cern.ch:1094",
+				GRPCURI:          "",
+				SlaveURL:         "root://eos-mgm1.eoscluster.cern.ch:1094",
+				CacheDirectory:   os.TempDir(),
+				GatewaySVC:       "127.0.0.1:9142",
+			},
+			Local: config.LocalDriver{
+				Root:        filepath.Join(defaults.BaseDataPath(), "storage", "local", "users"),
+				ShareFolder: "/Shares",
+				UserLayout:  "{{.Username}}",
+			},
+			OwnCloudSQL: config.OwnCloudSQLDriver{
+				Root:          filepath.Join(defaults.BaseDataPath(), "storage", "owncloud"),
+				ShareFolder:   "/Shares",
+				UserLayout:    "{{.Username}}",
+				UploadInfoDir: filepath.Join(defaults.BaseDataPath(), "storage", "uploadinfo"),
+				DBUsername:    "owncloud",
+				DBPassword:    "owncloud",
+				DBHost:        "",
+				DBPort:        3306,
+				DBName:        "owncloud",
+			},
+			S3: config.S3Driver{
+				Region: "default",
+			},
+			S3NG: config.S3NGDriver{
+				Root:                       filepath.Join(defaults.BaseDataPath(), "storage", "users"),
+				ShareFolder:                "/Shares",
+				UserLayout:                 "{{.Id.OpaqueId}}",
+				Region:                     "default",
+				PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}",
+				GeneralSpaceAliasTemplate:  "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
+				PermissionsEndpoint:        "127.0.0.1:9191",
+			},
+			OCIS: config.OCISDriver{
+				Root:                       filepath.Join(defaults.BaseDataPath(), "storage", "users"),
+				ShareFolder:                "/Shares",
+				UserLayout:                 "{{.Id.OpaqueId}}",
+				PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}",
+				GeneralSpaceAliasTemplate:  "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
+				PermissionsEndpoint:        "127.0.0.1:9191",
+			},
+		},
+		Events: config.Events{
+			Addr:      "127.0.0.1:9233",
+			ClusterID: "ocis-cluster",
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

extensions/storage-users/pkg/config/user.go

@@ -0,0 +1,122 @@
+package config
+
+func UserDrivers(cfg *Config) map[string]interface{} {
+	return map[string]interface{}{
+		"eos": map[string]interface{}{
+			"namespace":              cfg.Drivers.EOS.Root,
+			"shadow_namespace":       cfg.Drivers.EOS.ShadowNamespace,
+			"uploads_namespace":      cfg.Drivers.EOS.UploadsNamespace,
+			"share_folder":           cfg.Drivers.EOS.ShareFolder,
+			"eos_binary":             cfg.Drivers.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Drivers.EOS.XrdcopyBinary,
+			"master_url":             cfg.Drivers.EOS.MasterURL,
+			"slave_url":              cfg.Drivers.EOS.SlaveURL,
+			"cache_directory":        cfg.Drivers.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Drivers.EOS.SecProtocol,
+			"keytab":                 cfg.Drivers.EOS.Keytab,
+			"single_username":        cfg.Drivers.EOS.SingleUsername,
+			"enable_logging":         cfg.Drivers.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Drivers.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Drivers.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Drivers.EOS.UseKeytab,
+			"gatewaysvc":             cfg.Drivers.EOS.GatewaySVC,
+		},
+		"eoshome": map[string]interface{}{
+			"namespace":              cfg.Drivers.EOS.Root,
+			"shadow_namespace":       cfg.Drivers.EOS.ShadowNamespace,
+			"uploads_namespace":      cfg.Drivers.EOS.UploadsNamespace,
+			"share_folder":           cfg.Drivers.EOS.ShareFolder,
+			"eos_binary":             cfg.Drivers.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Drivers.EOS.XrdcopyBinary,
+			"master_url":             cfg.Drivers.EOS.MasterURL,
+			"slave_url":              cfg.Drivers.EOS.SlaveURL,
+			"cache_directory":        cfg.Drivers.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Drivers.EOS.SecProtocol,
+			"keytab":                 cfg.Drivers.EOS.Keytab,
+			"single_username":        cfg.Drivers.EOS.SingleUsername,
+			"user_layout":            cfg.Drivers.EOS.UserLayout,
+			"enable_logging":         cfg.Drivers.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Drivers.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Drivers.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Drivers.EOS.UseKeytab,
+			"gatewaysvc":             cfg.Drivers.EOS.GatewaySVC,
+		},
+		"eosgrpc": map[string]interface{}{
+			"namespace":              cfg.Drivers.EOS.Root,
+			"shadow_namespace":       cfg.Drivers.EOS.ShadowNamespace,
+			"share_folder":           cfg.Drivers.EOS.ShareFolder,
+			"eos_binary":             cfg.Drivers.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Drivers.EOS.XrdcopyBinary,
+			"master_url":             cfg.Drivers.EOS.MasterURL,
+			"master_grpc_uri":        cfg.Drivers.EOS.GRPCURI,
+			"slave_url":              cfg.Drivers.EOS.SlaveURL,
+			"cache_directory":        cfg.Drivers.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Drivers.EOS.SecProtocol,
+			"keytab":                 cfg.Drivers.EOS.Keytab,
+			"single_username":        cfg.Drivers.EOS.SingleUsername,
+			"user_layout":            cfg.Drivers.EOS.UserLayout,
+			"enable_logging":         cfg.Drivers.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Drivers.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Drivers.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Drivers.EOS.UseKeytab,
+			"enable_home":            false,
+			"gatewaysvc":             cfg.Drivers.EOS.GatewaySVC,
+		},
+		"local": map[string]interface{}{
+			"root":         cfg.Drivers.Local.Root,
+			"share_folder": cfg.Drivers.Local.ShareFolder,
+		},
+		"localhome": map[string]interface{}{
+			"root":         cfg.Drivers.Local.Root,
+			"share_folder": cfg.Drivers.Local.ShareFolder,
+			"user_layout":  cfg.Drivers.Local.UserLayout,
+		},
+		"owncloudsql": map[string]interface{}{
+			"datadirectory":   cfg.Drivers.OwnCloudSQL.Root,
+			"upload_info_dir": cfg.Drivers.OwnCloudSQL.UploadInfoDir,
+			"share_folder":    cfg.Drivers.OwnCloudSQL.ShareFolder,
+			"user_layout":     cfg.Drivers.OwnCloudSQL.UserLayout,
+			"enable_home":     false,
+			"dbusername":      cfg.Drivers.OwnCloudSQL.DBUsername,
+			"dbpassword":      cfg.Drivers.OwnCloudSQL.DBPassword,
+			"dbhost":          cfg.Drivers.OwnCloudSQL.DBHost,
+			"dbport":          cfg.Drivers.OwnCloudSQL.DBPort,
+			"dbname":          cfg.Drivers.OwnCloudSQL.DBName,
+			"userprovidersvc": cfg.Drivers.OwnCloudSQL.UsersProviderEndpoint,
+		},
+		"ocis": map[string]interface{}{
+			"root":                        cfg.Drivers.OCIS.Root,
+			"user_layout":                 cfg.Drivers.OCIS.UserLayout,
+			"share_folder":                cfg.Drivers.OCIS.ShareFolder,
+			"personalspacealias_template": cfg.Drivers.OCIS.PersonalSpaceAliasTemplate,
+			"generalspacealias_template":  cfg.Drivers.OCIS.GeneralSpaceAliasTemplate,
+			"treetime_accounting":         true,
+			"treesize_accounting":         true,
+			"permissionssvc":              cfg.Drivers.OCIS.PermissionsEndpoint,
+		},
+		"s3": map[string]interface{}{
+			"enable_home": false,
+			"region":      cfg.Drivers.S3.Region,
+			"access_key":  cfg.Drivers.S3.AccessKey,
+			"secret_key":  cfg.Drivers.S3.SecretKey,
+			"endpoint":    cfg.Drivers.S3.Endpoint,
+			"bucket":      cfg.Drivers.S3.Bucket,
+			"prefix":      cfg.Drivers.S3.Root,
+		},
+		"s3ng": map[string]interface{}{
+			"root":                        cfg.Drivers.S3NG.Root,
+			"user_layout":                 cfg.Drivers.S3NG.UserLayout,
+			"share_folder":                cfg.Drivers.S3NG.ShareFolder,
+			"personalspacealias_template": cfg.Drivers.S3NG.PersonalSpaceAliasTemplate,
+			"generalspacealias_template":  cfg.Drivers.S3NG.GeneralSpaceAliasTemplate,
+			"treetime_accounting":         true,
+			"treesize_accounting":         true,
+			"permissionssvc":              cfg.Drivers.S3NG.PermissionsEndpoint,
+			"s3.region":                   cfg.Drivers.S3NG.Region,
+			"s3.access_key":               cfg.Drivers.S3NG.AccessKey,
+			"s3.secret_key":               cfg.Drivers.S3NG.SecretKey,
+			"s3.endpoint":                 cfg.Drivers.S3NG.Endpoint,
+			"s3.bucket":                   cfg.Drivers.S3NG.Bucket,
+		},
+	}
+}

extensions/storage/pkg/command/health.go

@@ -14,9 +14,6 @@ func Health(cfg *config.Config) *cli.Command {
 		Name:     "health",
 		Usage:    "check health status",
 		Category: "info",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage")
-		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

extensions/storage/pkg/command/ldapcfg.go

@@ -1,60 +0,0 @@
-package command
-
-import (
-	"errors"
-	"os"
-	"time"
-
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/log"
-)
-
-const caTimeout = 5
-
-func ldapConfigFromString(cfg *config.Config) map[string]interface{} {
-	return map[string]interface{}{
-		"uri":               cfg.Reva.LDAP.URI,
-		"cacert":            cfg.Reva.LDAP.CACert,
-		"insecure":          cfg.Reva.LDAP.Insecure,
-		"bind_username":     cfg.Reva.LDAP.BindDN,
-		"bind_password":     cfg.Reva.LDAP.BindPassword,
-		"user_base_dn":      cfg.Reva.LDAP.UserBaseDN,
-		"group_base_dn":     cfg.Reva.LDAP.GroupBaseDN,
-		"user_filter":       cfg.Reva.LDAP.UserFilter,
-		"group_filter":      cfg.Reva.LDAP.GroupFilter,
-		"user_objectclass":  cfg.Reva.LDAP.UserObjectClass,
-		"group_objectclass": cfg.Reva.LDAP.GroupObjectClass,
-		"login_attributes":  cfg.Reva.LDAP.LoginAttributes,
-		"idp":               cfg.Reva.LDAP.IDP,
-		"gatewaysvc":        cfg.Reva.Gateway.Endpoint,
-		"user_schema": map[string]interface{}{
-			"id":              cfg.Reva.LDAP.UserSchema.ID,
-			"idIsOctetString": cfg.Reva.LDAP.UserSchema.IDIsOctetString,
-			"mail":            cfg.Reva.LDAP.UserSchema.Mail,
-			"displayName":     cfg.Reva.LDAP.UserSchema.DisplayName,
-			"userName":        cfg.Reva.LDAP.UserSchema.Username,
-		},
-		"group_schema": map[string]interface{}{
-			"id":              cfg.Reva.LDAP.GroupSchema.ID,
-			"idIsOctetString": cfg.Reva.LDAP.GroupSchema.IDIsOctetString,
-			"mail":            cfg.Reva.LDAP.GroupSchema.Mail,
-			"displayName":     cfg.Reva.LDAP.GroupSchema.DisplayName,
-			"groupName":       cfg.Reva.LDAP.GroupSchema.Groupname,
-			"member":          cfg.Reva.LDAP.GroupSchema.Member,
-		},
-	}
-}
-
-func waitForLDAPCA(log log.Logger, cfg *config.LDAP) error {
-	if !cfg.Insecure && cfg.CACert != "" {
-		if _, err := os.Stat(cfg.CACert); errors.Is(err, os.ErrNotExist) {
-			log.Warn().Str("LDAP CACert", cfg.CACert).Msgf("File does not exist. Waiting %d seconds for it to appear.", caTimeout)
-			time.Sleep(caTimeout * time.Second)
-			if _, err := os.Stat(cfg.CACert); errors.Is(err, os.ErrNotExist) {
-				log.Warn().Str("LDAP CACert", cfg.CACert).Msgf("File does still not exist after Timeout")
-				return err
-			}
-		}
-	}
-	return nil
-}

extensions/storage/pkg/command/ocdav.go

@@ -1,134 +0,0 @@
-package command
-
-import (
-	"context"
-	"flag"
-
-	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
-	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/sync"
-	"github.com/thejerf/suture/v4"
-	"github.com/urfave/cli/v2"
-)
-
-// OCDav is the entrypoint for the ocdav command.
-// TODO move ocdav cmd to a separate service
-func OCDav(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "ocdav",
-		Usage: "start ocdav service",
-		Before: func(c *cli.Context) error {
-			if err := loadUserAgent(c, cfg); err != nil {
-				return err
-			}
-			return ParseConfig(c, cfg, "ocdav")
-		},
-		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
-			gr := run.Group{}
-			ctx, cancel := context.WithCancel(context.Background())
-			//metrics     = metrics.New()
-
-			defer cancel()
-
-			gr.Add(func() error {
-				s, err := ocdav.Service(
-					ocdav.Context(ctx),
-					ocdav.Logger(logger.Logger),
-					ocdav.Address(cfg.OCDav.Addr),
-					ocdav.FilesNamespace(cfg.OCDav.FilesNamespace),
-					ocdav.WebdavNamespace(cfg.OCDav.WebdavNamespace),
-					ocdav.SharesNamespace(cfg.OCDav.SharesNamespace),
-					ocdav.Timeout(cfg.OCDav.Timeout),
-					ocdav.Insecure(cfg.OCDav.Insecure),
-					ocdav.PublicURL(cfg.OCDav.PublicURL),
-					ocdav.Prefix(cfg.OCDav.Prefix),
-					ocdav.GatewaySvc(cfg.OCDav.GatewaySVC),
-					ocdav.JWTSecret(cfg.OCDav.JWTSecret),
-					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation
-					// ocdav.LockSystem(), // will default to the CS3 lock system
-					// ocdav.TLSConfig() // tls config for the http server
-				)
-				if err != nil {
-					return err
-				}
-
-				return s.Run()
-			}, func(err error) {
-				logger.Info().Err(err).Str("server", c.Command.Name).Msg("Shutting down server")
-				cancel()
-			})
-
-			{
-				server, err := debug.Server(
-					debug.Name(c.Command.Name+"-debug"),
-					debug.Addr(cfg.OCDav.DebugAddr),
-					debug.Logger(logger),
-					debug.Context(ctx),
-					debug.Config(cfg),
-				)
-
-				if err != nil {
-					logger.Info().
-						Err(err).
-						Str("server", "debug").
-						Msg("Failed to initialize server")
-
-					return err
-				}
-
-				gr.Add(server.ListenAndServe, func(_ error) {
-					cancel()
-				})
-			}
-
-			if !cfg.Reva.Frontend.Supervised {
-				sync.Trap(&gr, cancel)
-			}
-
-			return gr.Run()
-		},
-	}
-}
-
-// OCDavSutureService allows for the ocdav command to be embedded and supervised by a suture supervisor tree.
-type OCDavSutureService struct {
-	cfg *config.Config
-}
-
-// NewOCDav creates a new ocdav.OCDavSutureService
-func NewOCDav(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
-	return OCDavSutureService{
-		cfg: cfg.Storage,
-	}
-}
-
-func (s OCDavSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Frontend.Context = ctx
-	f := &flag.FlagSet{}
-	cmdFlags := OCDav(s.cfg).Flags
-	for k := range cmdFlags {
-		if err := cmdFlags[k].Apply(f); err != nil {
-			return err
-		}
-	}
-	cliCtx := cli.NewContext(nil, f, nil)
-	if OCDav(s.cfg).Before != nil {
-		if err := OCDav(s.cfg).Before(cliCtx); err != nil {
-			return err
-		}
-	}
-	if err := OCDav(s.cfg).Action(cliCtx); err != nil {
-		return err
-	}
-
-	return nil
-}

extensions/storage/pkg/command/root.go

@@ -12,19 +12,6 @@ import (
 // GetCommands provides all commands for this service
 func GetCommands(cfg *config.Config) cli.Commands {
 	return []*cli.Command{
-		Frontend(cfg),
-		Gateway(cfg),
-		Users(cfg),
-		Groups(cfg),
-		AppProvider(cfg),
-		AuthBasic(cfg),
-		AuthBearer(cfg),
-		AuthMachine(cfg),
-		Sharing(cfg),
-		StoragePublicLink(cfg),
-		StorageShares(cfg),
-		StorageUsers(cfg),
-		StorageMetadata(cfg),
 		Health(cfg),
 	}
 }
@@ -35,10 +22,6 @@ func Execute(cfg *config.Config) error {
 		Name:  "storage",
 		Usage: "Storage service for oCIS",
 
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage")
-		},
-
 		Commands: GetCommands(cfg),
 	})
 

extensions/storage/pkg/command/sharing.go

@@ -1,240 +0,0 @@
-package command
-
-import (
-	"context"
-	"flag"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
-
-	"github.com/owncloud/ocis/ocis-pkg/sync"
-
-	"github.com/cs3org/reva/v2/cmd/revad/runtime"
-	"github.com/gofrs/uuid"
-	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/thejerf/suture/v4"
-	"github.com/urfave/cli/v2"
-)
-
-// Sharing is the entrypoint for the sharing command.
-func Sharing(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "sharing",
-		Usage: "start sharing service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-sharing")
-		},
-		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
-			gr := run.Group{}
-			ctx, cancel := context.WithCancel(context.Background())
-
-			defer cancel()
-
-			// precreate folders
-			if cfg.Reva.Sharing.UserDriver == "json" && cfg.Reva.Sharing.UserJSONFile != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Sharing.UserJSONFile), os.FileMode(0700)); err != nil {
-					return err
-				}
-			}
-			if cfg.Reva.Sharing.PublicDriver == "json" && cfg.Reva.Sharing.PublicJSONFile != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Sharing.PublicJSONFile), os.FileMode(0700)); err != nil {
-					return err
-				}
-			}
-
-			uuid := uuid.Must(uuid.NewV4())
-			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
-
-			rcfg := sharingConfigFromStruct(c, cfg)
-
-			gr.Add(func() error {
-				runtime.RunWithOptions(
-					rcfg,
-					pidFile,
-					runtime.WithLogger(&logger.Logger),
-				)
-				return nil
-			}, func(_ error) {
-				logger.Info().
-					Str("server", c.Command.Name).
-					Msg("Shutting down server")
-
-				cancel()
-			})
-
-			debug, err := debug.Server(
-				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.Sharing.DebugAddr),
-				debug.Logger(logger),
-				debug.Context(ctx),
-				debug.Config(cfg),
-			)
-
-			if err != nil {
-				logger.Info().Err(err).Str("server", c.Command.Name+"-debug").Msg("Failed to initialize server")
-				return err
-			}
-
-			gr.Add(debug.ListenAndServe, func(_ error) {
-				cancel()
-			})
-
-			if !cfg.Reva.Sharing.Supervised {
-				sync.Trap(&gr, cancel)
-			}
-
-			return gr.Run()
-		},
-	}
-}
-
-// sharingConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
-func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
-	rcfg := map[string]interface{}{
-		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Sharing.MaxCPUs,
-			"tracing_enabled":      cfg.Tracing.Enabled,
-			"tracing_endpoint":     cfg.Tracing.Endpoint,
-			"tracing_collector":    cfg.Tracing.Collector,
-			"tracing_service_name": c.Command.Name,
-		},
-		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
-		},
-		"grpc": map[string]interface{}{
-			"network": cfg.Reva.Sharing.GRPCNetwork,
-			"address": cfg.Reva.Sharing.GRPCAddr,
-			// TODO build services dynamically
-			"services": map[string]interface{}{
-				"usershareprovider": map[string]interface{}{
-					"driver": cfg.Reva.Sharing.UserDriver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"file":         cfg.Reva.Sharing.UserJSONFile,
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
-						},
-						"sql": map[string]interface{}{ // cernbox sql
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"owncloudsql": map[string]interface{}{
-							"gateway_addr":     cfg.Reva.Gateway.Endpoint,
-							"storage_mount_id": cfg.Reva.Sharing.UserStorageMountID,
-							"db_username":      cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":      cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":          cfg.Reva.Sharing.UserSQLHost,
-							"db_port":          cfg.Reva.Sharing.UserSQLPort,
-							"db_name":          cfg.Reva.Sharing.UserSQLName,
-						},
-						"cs3": map[string]interface{}{
-							"gateway_addr":        cfg.Reva.Gateway.Endpoint,
-							"provider_addr":       cfg.Reva.Sharing.CS3ProviderAddr,
-							"service_user_id":     cfg.Reva.Sharing.CS3ServiceUser,
-							"service_user_idp":    cfg.Reva.Sharing.CS3ServiceUserIdp,
-							"machine_auth_apikey": cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-						},
-					},
-				},
-				"publicshareprovider": map[string]interface{}{
-					"driver": cfg.Reva.Sharing.PublicDriver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"file":         cfg.Reva.Sharing.PublicJSONFile,
-							"gateway_addr": cfg.Reva.Gateway.Endpoint,
-						},
-						"sql": map[string]interface{}{
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"owncloudsql": map[string]interface{}{
-							"gateway_addr":                  cfg.Reva.Gateway.Endpoint,
-							"storage_mount_id":              cfg.Reva.Sharing.UserStorageMountID,
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-						"cs3": map[string]interface{}{
-							"gateway_addr":        cfg.Reva.Gateway.Endpoint,
-							"provider_addr":       cfg.Reva.Sharing.CS3ProviderAddr,
-							"service_user_id":     cfg.Reva.Sharing.CS3ServiceUser,
-							"service_user_idp":    cfg.Reva.Sharing.CS3ServiceUserIdp,
-							"machine_auth_apikey": cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
-						},
-					},
-				},
-			},
-			"interceptors": map[string]interface{}{
-				"eventsmiddleware": map[string]interface{}{
-					"group":     "sharing",
-					"type":      "nats",
-					"address":   cfg.Reva.Sharing.Events.Address,
-					"clusterID": cfg.Reva.Sharing.Events.ClusterID,
-				},
-			},
-		},
-	}
-	return rcfg
-}
-
-// SharingSutureService allows for the storage-sharing command to be embedded and supervised by a suture supervisor tree.
-type SharingSutureService struct {
-	cfg *config.Config
-}
-
-// NewSharingSutureService creates a new store.SharingSutureService
-func NewSharing(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
-	return SharingSutureService{
-		cfg: cfg.Storage,
-	}
-}
-
-func (s SharingSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Sharing.Context = ctx
-	f := &flag.FlagSet{}
-	cmdFlags := Sharing(s.cfg).Flags
-	for k := range cmdFlags {
-		if err := cmdFlags[k].Apply(f); err != nil {
-			return err
-		}
-	}
-	cliCtx := cli.NewContext(nil, f, nil)
-	if Sharing(s.cfg).Before != nil {
-		if err := Sharing(s.cfg).Before(cliCtx); err != nil {
-			return err
-		}
-	}
-	if err := Sharing(s.cfg).Action(cliCtx); err != nil {
-		return err
-	}
-
-	return nil
-}

extensions/storage/pkg/command/storagedrivers/metadata.go

@@ -1,79 +0,0 @@
-package storagedrivers
-
-import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-)
-
-func MetadataDrivers(cfg *config.Config) map[string]interface{} {
-	return map[string]interface{}{
-		"eos": map[string]interface{}{
-			"namespace":              cfg.Reva.MetadataStorage.EOS.Root,
-			"shadow_namespace":       cfg.Reva.MetadataStorage.EOS.ShadowNamespace,
-			"uploads_namespace":      cfg.Reva.MetadataStorage.EOS.UploadsNamespace,
-			"eos_binary":             cfg.Reva.MetadataStorage.EOS.EosBinary,
-			"xrdcopy_binary":         cfg.Reva.MetadataStorage.EOS.XrdcopyBinary,
-			"master_url":             cfg.Reva.MetadataStorage.EOS.MasterURL,
-			"slave_url":              cfg.Reva.MetadataStorage.EOS.SlaveURL,
-			"cache_directory":        cfg.Reva.MetadataStorage.EOS.CacheDirectory,
-			"sec_protocol":           cfg.Reva.MetadataStorage.EOS.SecProtocol,
-			"keytab":                 cfg.Reva.MetadataStorage.EOS.Keytab,
-			"single_username":        cfg.Reva.MetadataStorage.EOS.SingleUsername,
-			"enable_logging":         cfg.Reva.MetadataStorage.EOS.EnableLogging,
-			"show_hidden_sys_files":  cfg.Reva.MetadataStorage.EOS.ShowHiddenSysFiles,
-			"force_single_user_mode": cfg.Reva.MetadataStorage.EOS.ForceSingleUserMode,
-			"use_keytab":             cfg.Reva.MetadataStorage.EOS.UseKeytab,
-			"gatewaysvc":             cfg.Reva.MetadataStorage.EOS.GatewaySVC,
-			"enable_home":            false,
-		},
-		"eosgrpc": map[string]interface{}{
-			"namespace":              cfg.Reva.MetadataStorage.EOS.Root,
-			"shadow_namespace":       cfg.Reva.MetadataStorage.EOS.ShadowNamespace,
-			"eos_binary":             cfg.Reva.MetadataStorage.EOS.EosBinary,
-			"xrdcopy_binary":         cfg.Reva.MetadataStorage.EOS.XrdcopyBinary,
-			"master_url":             cfg.Reva.MetadataStorage.EOS.MasterURL,
-			"master_grpc_uri":        cfg.Reva.MetadataStorage.EOS.GrpcURI,
-			"slave_url":              cfg.Reva.MetadataStorage.EOS.SlaveURL,
-			"cache_directory":        cfg.Reva.MetadataStorage.EOS.CacheDirectory,
-			"sec_protocol":           cfg.Reva.MetadataStorage.EOS.SecProtocol,
-			"keytab":                 cfg.Reva.MetadataStorage.EOS.Keytab,
-			"single_username":        cfg.Reva.MetadataStorage.EOS.SingleUsername,
-			"user_layout":            cfg.Reva.MetadataStorage.EOS.UserLayout,
-			"enable_logging":         cfg.Reva.MetadataStorage.EOS.EnableLogging,
-			"show_hidden_sys_files":  cfg.Reva.MetadataStorage.EOS.ShowHiddenSysFiles,
-			"force_single_user_mode": cfg.Reva.MetadataStorage.EOS.ForceSingleUserMode,
-			"use_keytab":             cfg.Reva.MetadataStorage.EOS.UseKeytab,
-			"enable_home":            false,
-			"gatewaysvc":             cfg.Reva.MetadataStorage.EOS.GatewaySVC,
-		},
-		"local": map[string]interface{}{
-			"root": cfg.Reva.MetadataStorage.Local.Root,
-		},
-		"ocis": map[string]interface{}{
-			"root":                cfg.Reva.MetadataStorage.OCIS.Root,
-			"user_layout":         cfg.Reva.MetadataStorage.OCIS.UserLayout,
-			"treetime_accounting": false,
-			"treesize_accounting": false,
-			"permissionssvc":      cfg.Reva.Permissions.Endpoint,
-		},
-		"s3": map[string]interface{}{
-			"region":     cfg.Reva.MetadataStorage.S3.Region,
-			"access_key": cfg.Reva.MetadataStorage.S3.AccessKey,
-			"secret_key": cfg.Reva.MetadataStorage.S3.SecretKey,
-			"endpoint":   cfg.Reva.MetadataStorage.S3.Endpoint,
-			"bucket":     cfg.Reva.MetadataStorage.S3.Bucket,
-		},
-		"s3ng": map[string]interface{}{
-			"root":                cfg.Reva.MetadataStorage.S3NG.Root,
-			"enable_home":         false,
-			"user_layout":         cfg.Reva.MetadataStorage.S3NG.UserLayout,
-			"treetime_accounting": false,
-			"treesize_accounting": false,
-			"permissionssvc":      cfg.Reva.Permissions.Endpoint,
-			"s3.region":           cfg.Reva.MetadataStorage.S3NG.Region,
-			"s3.access_key":       cfg.Reva.MetadataStorage.S3NG.AccessKey,
-			"s3.secret_key":       cfg.Reva.MetadataStorage.S3NG.SecretKey,
-			"s3.endpoint":         cfg.Reva.MetadataStorage.S3NG.Endpoint,
-			"s3.bucket":           cfg.Reva.MetadataStorage.S3NG.Bucket,
-		},
-	}
-}

extensions/storage/pkg/command/storagedrivers/user.go

@@ -1,126 +0,0 @@
-package storagedrivers
-
-import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-)
-
-func UserDrivers(cfg *config.Config) map[string]interface{} {
-	return map[string]interface{}{
-		"eos": map[string]interface{}{
-			"namespace":              cfg.Reva.UserStorage.EOS.Root,
-			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
-			"uploads_namespace":      cfg.Reva.UserStorage.EOS.UploadsNamespace,
-			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
-			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
-			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
-			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
-			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
-			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
-			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
-			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
-			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
-			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
-			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
-			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
-			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
-			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
-		},
-		"eoshome": map[string]interface{}{
-			"namespace":              cfg.Reva.UserStorage.EOS.Root,
-			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
-			"uploads_namespace":      cfg.Reva.UserStorage.EOS.UploadsNamespace,
-			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
-			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
-			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
-			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
-			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
-			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
-			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
-			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
-			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
-			"user_layout":            cfg.Reva.UserStorage.EOS.UserLayout,
-			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
-			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
-			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
-			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
-			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
-		},
-		"eosgrpc": map[string]interface{}{
-			"namespace":              cfg.Reva.UserStorage.EOS.Root,
-			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
-			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
-			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
-			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
-			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
-			"master_grpc_uri":        cfg.Reva.UserStorage.EOS.GrpcURI,
-			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
-			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
-			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
-			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
-			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
-			"user_layout":            cfg.Reva.UserStorage.EOS.UserLayout,
-			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
-			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
-			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
-			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
-			"enable_home":            false,
-			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
-		},
-		"local": map[string]interface{}{
-			"root":         cfg.Reva.UserStorage.Local.Root,
-			"share_folder": cfg.Reva.UserStorage.Local.ShareFolder,
-		},
-		"localhome": map[string]interface{}{
-			"root":         cfg.Reva.UserStorage.Local.Root,
-			"share_folder": cfg.Reva.UserStorage.Local.ShareFolder,
-			"user_layout":  cfg.Reva.UserStorage.Local.UserLayout,
-		},
-		"owncloudsql": map[string]interface{}{
-			"datadirectory":   cfg.Reva.UserStorage.OwnCloudSQL.Root,
-			"upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir,
-			"share_folder":    cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
-			"user_layout":     cfg.Reva.UserStorage.OwnCloudSQL.UserLayout,
-			"enable_home":     false,
-			"dbusername":      cfg.Reva.UserStorage.OwnCloudSQL.DBUsername,
-			"dbpassword":      cfg.Reva.UserStorage.OwnCloudSQL.DBPassword,
-			"dbhost":          cfg.Reva.UserStorage.OwnCloudSQL.DBHost,
-			"dbport":          cfg.Reva.UserStorage.OwnCloudSQL.DBPort,
-			"dbname":          cfg.Reva.UserStorage.OwnCloudSQL.DBName,
-			"userprovidersvc": cfg.Reva.Users.Endpoint,
-		},
-		"ocis": map[string]interface{}{
-			"root":                        cfg.Reva.UserStorage.OCIS.Root,
-			"user_layout":                 cfg.Reva.UserStorage.OCIS.UserLayout,
-			"share_folder":                cfg.Reva.UserStorage.OCIS.ShareFolder,
-			"personalspacealias_template": cfg.Reva.UserStorage.OCIS.PersonalSpaceAliasTemplate,
-			"generalspacealias_template":  cfg.Reva.UserStorage.OCIS.GeneralSpaceAliasTemplate,
-			"treetime_accounting":         true,
-			"treesize_accounting":         true,
-			"permissionssvc":              cfg.Reva.Permissions.Endpoint,
-		},
-		"s3": map[string]interface{}{
-			"enable_home": false,
-			"region":      cfg.Reva.UserStorage.S3.Region,
-			"access_key":  cfg.Reva.UserStorage.S3.AccessKey,
-			"secret_key":  cfg.Reva.UserStorage.S3.SecretKey,
-			"endpoint":    cfg.Reva.UserStorage.S3.Endpoint,
-			"bucket":      cfg.Reva.UserStorage.S3.Bucket,
-			"prefix":      cfg.Reva.UserStorage.S3.Root,
-		},
-		"s3ng": map[string]interface{}{
-			"root":                        cfg.Reva.UserStorage.S3NG.Root,
-			"user_layout":                 cfg.Reva.UserStorage.S3NG.UserLayout,
-			"share_folder":                cfg.Reva.UserStorage.S3NG.ShareFolder,
-			"personalspacealias_template": cfg.Reva.UserStorage.S3NG.PersonalSpaceAliasTemplate,
-			"generalspacealias_template":  cfg.Reva.UserStorage.S3NG.GeneralSpaceAliasTemplate,
-			"treetime_accounting":         true,
-			"treesize_accounting":         true,
-			"permissionssvc":              cfg.Reva.Permissions.Endpoint,
-			"s3.region":                   cfg.Reva.UserStorage.S3NG.Region,
-			"s3.access_key":               cfg.Reva.UserStorage.S3NG.AccessKey,
-			"s3.secret_key":               cfg.Reva.UserStorage.S3NG.SecretKey,
-			"s3.endpoint":                 cfg.Reva.UserStorage.S3NG.Endpoint,
-			"s3.bucket":                   cfg.Reva.UserStorage.S3NG.Bucket,
-		},
-	}
-}

extensions/storage/pkg/command/users.go

@@ -1,197 +0,0 @@
-package command
-
-import (
-	"context"
-	"flag"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/cs3org/reva/v2/cmd/revad/runtime"
-	"github.com/gofrs/uuid"
-	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/storage/pkg/config"
-	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
-	"github.com/owncloud/ocis/extensions/storage/pkg/tracing"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/sync"
-	"github.com/thejerf/suture/v4"
-	"github.com/urfave/cli/v2"
-)
-
-// Users is the entrypoint for the users command.
-func Users(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "users",
-		Usage: "start users service",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg, "storage-users")
-		},
-		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
-			tracing.Configure(cfg, logger)
-
-			gr := run.Group{}
-			ctx, cancel := context.WithCancel(context.Background())
-
-			defer cancel()
-
-			// precreate folders
-			if cfg.Reva.Users.Driver == "json" && cfg.Reva.Users.JSON != "" {
-				if err := os.MkdirAll(filepath.Dir(cfg.Reva.Users.JSON), os.FileMode(0700)); err != nil {
-					return err
-				}
-			}
-
-			uuid := uuid.Must(uuid.NewV4())
-			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
-
-			rcfg := usersConfigFromStruct(c, cfg)
-
-			logger.Debug().
-				Str("server", "users").
-				Interface("reva-config", rcfg).
-				Msg("config")
-
-			if cfg.Reva.Users.Driver == "ldap" {
-				if err := waitForLDAPCA(logger, &cfg.Reva.LDAP); err != nil {
-					logger.Error().Err(err).Msg("The configured LDAP CA cert does not exist")
-					return err
-				}
-			}
-
-			gr.Add(func() error {
-				runtime.RunWithOptions(
-					rcfg,
-					pidFile,
-					runtime.WithLogger(&logger.Logger),
-				)
-				return nil
-			}, func(_ error) {
-				logger.Info().
-					Str("server", c.Command.Name).
-					Msg("Shutting down server")
-
-				cancel()
-			})
-
-			debugServer, err := debug.Server(
-				debug.Name(c.Command.Name+"-debug"),
-				debug.Addr(cfg.Reva.Users.DebugAddr),
-				debug.Logger(logger),
-				debug.Context(ctx),
-				debug.Config(cfg),
-			)
-
-			if err != nil {
-				logger.Info().Err(err).Str("server", c.Command.Name+"-debug").Msg("Failed to initialize server")
-				return err
-			}
-
-			gr.Add(debugServer.ListenAndServe, func(_ error) {
-				cancel()
-			})
-
-			if !cfg.Reva.Users.Supervised {
-				sync.Trap(&gr, cancel)
-			}
-
-			return gr.Run()
-		},
-	}
-}
-
-// usersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
-func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
-	rcfg := map[string]interface{}{
-		"core": map[string]interface{}{
-			"max_cpus":             cfg.Reva.Users.MaxCPUs,
-			"tracing_enabled":      cfg.Tracing.Enabled,
-			"tracing_endpoint":     cfg.Tracing.Endpoint,
-			"tracing_collector":    cfg.Tracing.Collector,
-			"tracing_service_name": c.Command.Name,
-		},
-		"shared": map[string]interface{}{
-			"jwt_secret":                cfg.Reva.JWTSecret,
-			"gatewaysvc":                cfg.Reva.Gateway.Endpoint,
-			"skip_user_groups_in_token": cfg.Reva.SkipUserGroupsInToken,
-		},
-		"grpc": map[string]interface{}{
-			"network": cfg.Reva.Users.GRPCNetwork,
-			"address": cfg.Reva.Users.GRPCAddr,
-			// TODO build services dynamically
-			"services": map[string]interface{}{
-				"userprovider": map[string]interface{}{
-					"driver": cfg.Reva.Users.Driver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"users": cfg.Reva.Users.JSON,
-						},
-						"ldap": ldapConfigFromString(cfg),
-						"rest": map[string]interface{}{
-							"client_id":                    cfg.Reva.UserGroupRest.ClientID,
-							"client_secret":                cfg.Reva.UserGroupRest.ClientSecret,
-							"redis_address":                cfg.Reva.UserGroupRest.RedisAddress,
-							"redis_username":               cfg.Reva.UserGroupRest.RedisUsername,
-							"redis_password":               cfg.Reva.UserGroupRest.RedisPassword,
-							"user_groups_cache_expiration": cfg.Reva.Users.UserGroupsCacheExpiration,
-							"id_provider":                  cfg.Reva.UserGroupRest.IDProvider,
-							"api_base_url":                 cfg.Reva.UserGroupRest.APIBaseURL,
-							"oidc_token_endpoint":          cfg.Reva.UserGroupRest.OIDCTokenEndpoint,
-							"target_api":                   cfg.Reva.UserGroupRest.TargetAPI,
-						},
-						"owncloudsql": map[string]interface{}{
-							"dbusername":           cfg.Reva.UserOwnCloudSQL.DBUsername,
-							"dbpassword":           cfg.Reva.UserOwnCloudSQL.DBPassword,
-							"dbhost":               cfg.Reva.UserOwnCloudSQL.DBHost,
-							"dbport":               cfg.Reva.UserOwnCloudSQL.DBPort,
-							"dbname":               cfg.Reva.UserOwnCloudSQL.DBName,
-							"idp":                  cfg.Reva.UserOwnCloudSQL.Idp,
-							"nobody":               cfg.Reva.UserOwnCloudSQL.Nobody,
-							"join_username":        cfg.Reva.UserOwnCloudSQL.JoinUsername,
-							"join_ownclouduuid":    cfg.Reva.UserOwnCloudSQL.JoinOwnCloudUUID,
-							"enable_medial_search": cfg.Reva.UserOwnCloudSQL.EnableMedialSearch,
-						},
-					},
-				},
-			},
-		},
-	}
-	return rcfg
-}
-
-// UserProviderSutureService allows for the storage-userprovider command to be embedded and supervised by a suture supervisor tree.
-type UserProviderSutureService struct {
-	cfg *config.Config
-}
-
-// NewUserProviderSutureService creates a new storage.UserProvider
-func NewUserProvider(cfg *ociscfg.Config) suture.Service {
-	cfg.Storage.Commons = cfg.Commons
-	return UserProviderSutureService{
-		cfg: cfg.Storage,
-	}
-}
-
-func (s UserProviderSutureService) Serve(ctx context.Context) error {
-	s.cfg.Reva.Users.Context = ctx
-	f := &flag.FlagSet{}
-	cmdFlags := Users(s.cfg).Flags
-	for k := range cmdFlags {
-		if err := cmdFlags[k].Apply(f); err != nil {
-			return err
-		}
-	}
-	cliCtx := cli.NewContext(nil, f, nil)
-	if Users(s.cfg).Before != nil {
-		if err := Users(s.cfg).Before(cliCtx); err != nil {
-			return err
-		}
-	}
-	if err := Users(s.cfg).Action(cliCtx); err != nil {
-		return err
-	}
-
-	return nil
-}

extensions/storage/pkg/server/debug/option.go

@@ -17,6 +17,9 @@ type Options struct {
 	Logger  log.Logger
 	Context context.Context
 	Config  *config.Config
+	Pprof   bool
+	Zpages  bool
+	Token   string
 }
 
 // newOptions initializes the available default options.
@@ -64,3 +67,24 @@ func Config(val *config.Config) Option {
 		o.Config = val
 	}
 }
+
+// Pprof provides a function to set the pprof option.
+func Pprof(val bool) Option {
+	return func(o *Options) {
+		o.Pprof = val
+	}
+}
+
+// Zpages provides a function to set the zpages option.
+func Zpages(val bool) Option {
+	return func(o *Options) {
+		o.Zpages = val
+	}
+}
+
+// Token provides a function to set the token option.
+func Token(val string) Option {
+	return func(o *Options) {
+		o.Token = val
+	}
+}

extensions/storage/pkg/server/debug/server.go

@@ -18,9 +18,9 @@ func Server(opts ...Option) (*http.Server, error) {
 		debug.Name(options.Name),
 		debug.Version(version.String),
 		debug.Address(options.Addr),
-		debug.Token(options.Config.Debug.Token),
-		debug.Pprof(options.Config.Debug.Pprof),
-		debug.Zpages(options.Config.Debug.Zpages),
+		debug.Token(options.Token),
+		debug.Pprof(options.Pprof),
+		debug.Zpages(options.Zpages),
 		debug.Health(health(options.Config)),
 		debug.Ready(ready(options.Config)),
 	), nil

extensions/storage/pkg/tracing/tracing.go

@@ -9,25 +9,25 @@ import (
 // to Reva services.
 func Configure(cfg *config.Config, logger log.Logger) {
 	if cfg.Tracing.Enabled {
-		switch t := cfg.Tracing.Type; t {
+		switch cfg.Tracing.Type {
 		case "agent":
 			logger.Error().
-				Str("type", t).
+				Str("type", cfg.Tracing.Type).
 				Msg("Reva only supports the jaeger tracing backend")
 
 		case "jaeger":
 			logger.Info().
-				Str("type", t).
+				Str("type", cfg.Tracing.Type).
 				Msg("configuring storage to use the jaeger tracing backend")
 
 		case "zipkin":
 			logger.Error().
-				Str("type", t).
+				Str("type", cfg.Tracing.Type).
 				Msg("Reva only supports the jaeger tracing backend")
 
 		default:
 			logger.Warn().
-				Str("type", t).
+				Str("type", cfg.Tracing.Type).
 				Msg("Unknown tracing backend")
 		}
 

extensions/user/pkg/command/command.go

@@ -0,0 +1,234 @@
+package command
+
+import (
+	"context"
+	"flag"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/cs3org/reva/v2/cmd/revad/runtime"
+	"github.com/gofrs/uuid"
+	"github.com/oklog/run"
+	"github.com/owncloud/ocis/extensions/storage/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/user/pkg/config"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/ldap"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/owncloud/ocis/ocis-pkg/tracing"
+	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
+)
+
+// User is the entrypoint for the user command.
+func User(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "users",
+		Usage: "start users service",
+		Action: func(c *cli.Context) error {
+			logCfg := cfg.Logging
+			logger := log.NewLogger(
+				log.Level(logCfg.Level),
+				log.File(logCfg.File),
+				log.Pretty(logCfg.Pretty),
+				log.Color(logCfg.Color),
+			)
+			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
+			gr := run.Group{}
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			// precreate folders
+			if cfg.Driver == "json" && cfg.Drivers.JSON.File != "" {
+				if err := os.MkdirAll(filepath.Dir(cfg.Drivers.JSON.File), os.FileMode(0700)); err != nil {
+					return err
+				}
+			}
+
+			uuid := uuid.Must(uuid.NewV4())
+			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid")
+
+			rcfg := usersConfigFromStruct(c, cfg)
+
+			logger.Debug().
+				Str("server", "users").
+				Interface("reva-config", rcfg).
+				Msg("config")
+
+			if cfg.Driver == "ldap" {
+				if err := ldap.WaitForCA(logger, cfg.Drivers.LDAP.Insecure, cfg.Drivers.LDAP.CACert); err != nil {
+					logger.Error().Err(err).Msg("The configured LDAP CA cert does not exist")
+					return err
+				}
+			}
+
+			gr.Add(func() error {
+				runtime.RunWithOptions(
+					rcfg,
+					pidFile,
+					runtime.WithLogger(&logger.Logger),
+				)
+				return nil
+			}, func(_ error) {
+				logger.Info().
+					Str("server", c.Command.Name).
+					Msg("Shutting down server")
+
+				cancel()
+			})
+
+			debugServer, err := debug.Server(
+				debug.Name(c.Command.Name+"-debug"),
+				debug.Addr(cfg.Debug.Addr),
+				debug.Logger(logger),
+				debug.Context(ctx),
+				debug.Pprof(cfg.Debug.Pprof),
+				debug.Zpages(cfg.Debug.Zpages),
+				debug.Token(cfg.Debug.Token),
+			)
+
+			if err != nil {
+				logger.Info().Err(err).Str("server", c.Command.Name+"-debug").Msg("Failed to initialize server")
+				return err
+			}
+
+			gr.Add(debugServer.ListenAndServe, func(_ error) {
+				cancel()
+			})
+
+			if !cfg.Supervised {
+				sync.Trap(&gr, cancel)
+			}
+
+			return gr.Run()
+		},
+	}
+}
+
+// usersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
+func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interface{} {
+	rcfg := map[string]interface{}{
+		"core": map[string]interface{}{
+			"tracing_enabled":      cfg.Tracing.Enabled,
+			"tracing_endpoint":     cfg.Tracing.Endpoint,
+			"tracing_collector":    cfg.Tracing.Collector,
+			"tracing_service_name": c.Command.Name,
+		},
+		"shared": map[string]interface{}{
+			"jwt_secret":                cfg.JWTSecret,
+			"gatewaysvc":                cfg.GatewayEndpoint,
+			"skip_user_groups_in_token": cfg.SkipUserGroupsInToken,
+		},
+		"grpc": map[string]interface{}{
+			"network": cfg.GRPC.Protocol,
+			"address": cfg.GRPC.Addr,
+			// TODO build services dynamically
+			"services": map[string]interface{}{
+				"userprovider": map[string]interface{}{
+					"driver": cfg.Driver,
+					"drivers": map[string]interface{}{
+						"json": map[string]interface{}{
+							"users": cfg.Drivers.JSON.File,
+						},
+						"ldap": ldapConfigFromString(cfg.Drivers.LDAP),
+						"rest": map[string]interface{}{
+							"client_id":                    cfg.Drivers.REST.ClientID,
+							"client_secret":                cfg.Drivers.REST.ClientSecret,
+							"redis_address":                cfg.Drivers.REST.RedisAddr,
+							"redis_username":               cfg.Drivers.REST.RedisUsername,
+							"redis_password":               cfg.Drivers.REST.RedisPassword,
+							"user_groups_cache_expiration": cfg.UsersCacheExpiration,
+							"id_provider":                  cfg.Drivers.REST.IDProvider,
+							"api_base_url":                 cfg.Drivers.REST.APIBaseURL,
+							"oidc_token_endpoint":          cfg.Drivers.REST.OIDCTokenEndpoint,
+							"target_api":                   cfg.Drivers.REST.TargetAPI,
+						},
+						"owncloudsql": map[string]interface{}{
+							"dbusername":           cfg.Drivers.OwnCloudSQL.DBUsername,
+							"dbpassword":           cfg.Drivers.OwnCloudSQL.DBPassword,
+							"dbhost":               cfg.Drivers.OwnCloudSQL.DBHost,
+							"dbport":               cfg.Drivers.OwnCloudSQL.DBPort,
+							"dbname":               cfg.Drivers.OwnCloudSQL.DBName,
+							"idp":                  cfg.Drivers.OwnCloudSQL.IDP,
+							"nobody":               cfg.Drivers.OwnCloudSQL.Nobody,
+							"join_username":        cfg.Drivers.OwnCloudSQL.JoinUsername,
+							"join_ownclouduuid":    cfg.Drivers.OwnCloudSQL.JoinOwnCloudUUID,
+							"enable_medial_search": cfg.Drivers.OwnCloudSQL.EnableMedialSearch,
+						},
+					},
+				},
+			},
+		},
+	}
+	return rcfg
+}
+
+// UserProviderSutureService allows for the storage-userprovider command to be embedded and supervised by a suture supervisor tree.
+type UserProviderSutureService struct {
+	cfg *config.Config
+}
+
+// NewUserProviderSutureService creates a new storage.UserProvider
+func NewUserProvider(cfg *ociscfg.Config) suture.Service {
+	cfg.User.Commons = cfg.Commons
+	return UserProviderSutureService{
+		cfg: cfg.User,
+	}
+}
+
+func (s UserProviderSutureService) Serve(ctx context.Context) error {
+	// s.cfg.Reva.Users.Context = ctx
+	cmd := User(s.cfg)
+	f := &flag.FlagSet{}
+	cmdFlags := cmd.Flags
+	for k := range cmdFlags {
+		if err := cmdFlags[k].Apply(f); err != nil {
+			return err
+		}
+	}
+	cliCtx := cli.NewContext(nil, f, nil)
+	if cmd.Before != nil {
+		if err := cmd.Before(cliCtx); err != nil {
+			return err
+		}
+	}
+	if err := cmd.Action(cliCtx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func ldapConfigFromString(cfg config.LDAPDriver) map[string]interface{} {
+	return map[string]interface{}{
+		"uri":               cfg.URI,
+		"cacert":            cfg.CACert,
+		"insecure":          cfg.Insecure,
+		"bind_username":     cfg.BindDN,
+		"bind_password":     cfg.BindPassword,
+		"user_base_dn":      cfg.UserBaseDN,
+		"group_base_dn":     cfg.GroupBaseDN,
+		"user_filter":       cfg.UserFilter,
+		"group_filter":      cfg.GroupFilter,
+		"user_objectclass":  cfg.UserObjectClass,
+		"group_objectclass": cfg.GroupObjectClass,
+		"login_attributes":  cfg.LoginAttributes,
+		"idp":               cfg.IDP,
+		"user_schema": map[string]interface{}{
+			"id":              cfg.UserSchema.ID,
+			"idIsOctetString": cfg.UserSchema.IDIsOctetString,
+			"mail":            cfg.UserSchema.Mail,
+			"displayName":     cfg.UserSchema.DisplayName,
+			"userName":        cfg.UserSchema.Username,
+		},
+		"group_schema": map[string]interface{}{
+			"id":              cfg.GroupSchema.ID,
+			"idIsOctetString": cfg.GroupSchema.IDIsOctetString,
+			"mail":            cfg.GroupSchema.Mail,
+			"displayName":     cfg.GroupSchema.DisplayName,
+			"groupName":       cfg.GroupSchema.Groupname,
+			"member":          cfg.GroupSchema.Member,
+		},
+	}
+}

extensions/user/pkg/config/config.go

@@ -0,0 +1,121 @@
+package config
+
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+type Config struct {
+	*shared.Commons `yaml:"-"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
+	Supervised      bool
+
+	GRPC GRPCConfig `yaml:"grpc"`
+
+	JWTSecret             string
+	GatewayEndpoint       string
+	SkipUserGroupsInToken bool
+	UsersCacheExpiration  int
+	Driver                string
+	Drivers               Drivers
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;USERS_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;USERS_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;USERS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;USERS_TRACING_COLLECTOR"`
+}
+
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;USERS_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;USERS_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;USERS_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;USERS_LOG_FILE" desc:"The target log file."`
+}
+
+type Service struct {
+	Name string `yaml:"-"`
+}
+
+type Debug struct {
+	Addr   string `yaml:"addr" env:"USERS_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"USERS_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"USERS_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"USERS_DEBUG_ZPAGES"`
+}
+
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"USERS_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"USERS_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type Drivers struct {
+	JSON        JSONDriver
+	LDAP        LDAPDriver
+	OwnCloudSQL OwnCloudSQLDriver
+	REST        RESTProvider
+}
+
+type JSONDriver struct {
+	File string
+}
+type LDAPDriver struct {
+	URI              string   `env:"LDAP_URI;USERS_LDAP_URI"`
+	CACert           string   `env:"LDAP_CACERT;USERS_LDAP_CACERT"`
+	Insecure         bool     `env:"LDAP_INSECURE;USERS_LDAP_INSECURE"`
+	BindDN           string   `env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"`
+	BindPassword     string   `env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
+	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"`
+	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"`
+	UserFilter       string   `env:"LDAP_USERFILTER;USERS_LDAP_USERFILTER"`
+	GroupFilter      string   `env:"LDAP_GROUPFILTER;USERS_LDAP_USERFILTER"`
+	UserObjectClass  string   `env:"LDAP_USER_OBJECTCLASS;USERS_LDAP_USER_OBJECTCLASS"`
+	GroupObjectClass string   `env:"LDAP_GROUP_OBJECTCLASS;USERS_LDAP_GROUP_OBJECTCLASS"`
+	LoginAttributes  []string `env:"LDAP_LOGIN_ATTRIBUTES;USERS_LDAP_LOGIN_ATTRIBUTES"`
+	IDP              string   `env:"OCIS_URL;USERS_IDP_URL"` // TODO what is this for?
+	GatewayEndpoint  string   // TODO do we need this here?
+	UserSchema       LDAPUserSchema
+	GroupSchema      LDAPGroupSchema
+}
+
+type LDAPUserSchema struct {
+	ID              string `env:"LDAP_USER_SCHEMA_ID;USERS_LDAP_USER_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_USER_SCHEMA_MAIL;USERS_LDAP_USER_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_USER_SCHEMA_DISPLAYNAME;USERS_LDAP_USER_SCHEMA_DISPLAYNAME"`
+	Username        string `env:"LDAP_USER_SCHEMA_USERNAME;USERS_LDAP_USER_SCHEMA_USERNAME"`
+}
+
+type LDAPGroupSchema struct {
+	ID              string `env:"LDAP_GROUP_SCHEMA_ID;USERS_LDAP_GROUP_SCHEMA_ID"`
+	IDIsOctetString bool   `env:"LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING"`
+	Mail            string `env:"LDAP_GROUP_SCHEMA_MAIL;USERS_LDAP_GROUP_SCHEMA_MAIL"`
+	DisplayName     string `env:"LDAP_GROUP_SCHEMA_DISPLAYNAME;USERS_LDAP_GROUP_SCHEMA_DISPLAYNAME"`
+	Groupname       string `env:"LDAP_GROUP_SCHEMA_GROUPNAME;USERS_LDAP_GROUP_SCHEMA_GROUPNAME"`
+	Member          string `env:"LDAP_GROUP_SCHEMA_MEMBER;USERS_LDAP_GROUP_SCHEMA_MEMBER"`
+}
+
+type OwnCloudSQLDriver struct {
+	DBUsername         string
+	DBPassword         string
+	DBHost             string
+	DBPort             int
+	DBName             string
+	IDP                string // TODO do we need this?
+	Nobody             int64  // TODO what is this?
+	JoinUsername       bool
+	JoinOwnCloudUUID   bool
+	EnableMedialSearch bool
+}
+
+type RESTProvider struct {
+	ClientID          string
+	ClientSecret      string
+	RedisAddr         string
+	RedisUsername     string
+	RedisPassword     string
+	IDProvider        string
+	APIBaseURL        string
+	OIDCTokenEndpoint string
+	TargetAPI         string
+}

extensions/user/pkg/config/defaults/defaultconfig.go

@@ -0,0 +1,113 @@
+package defaults
+
+import (
+	"path/filepath"
+
+	"github.com/owncloud/ocis/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+)
+
+func FullDefaultConfig() *config.Config {
+	cfg := DefaultConfig()
+
+	EnsureDefaults(cfg)
+
+	return cfg
+}
+
+func DefaultConfig() *config.Config {
+	return &config.Config{
+		Debug: config.Debug{
+			Addr:   "127.0.0.1:9145",
+			Token:  "",
+			Pprof:  false,
+			Zpages: false,
+		},
+		GRPC: config.GRPCConfig{
+			Addr:     "127.0.0.1:9144",
+			Protocol: "tcp",
+		},
+		Service: config.Service{
+			Name: "user",
+		},
+		UsersCacheExpiration: 5,
+		GatewayEndpoint:      "127.0.0.1:9142",
+		JWTSecret:            "Pive-Fumkiu4",
+		Driver:               "ldap",
+		Drivers: config.Drivers{
+			LDAP: config.LDAPDriver{
+				URI:              "ldaps://localhost:9126",
+				CACert:           filepath.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
+				Insecure:         false,
+				UserBaseDN:       "dc=ocis,dc=test",
+				GroupBaseDN:      "dc=ocis,dc=test",
+				LoginAttributes:  []string{"cn", "mail"},
+				UserFilter:       "",
+				GroupFilter:      "",
+				UserObjectClass:  "posixAccount",
+				GroupObjectClass: "posixGroup",
+				BindDN:           "cn=reva,ou=sysusers,dc=ocis,dc=test",
+				BindPassword:     "reva",
+				IDP:              "https://localhost:9200",
+				UserSchema: config.LDAPUserSchema{
+					ID:          "ownclouduuid",
+					Mail:        "mail",
+					DisplayName: "displayname",
+					Username:    "cn",
+				},
+				GroupSchema: config.LDAPGroupSchema{
+					ID:          "cn",
+					Mail:        "mail",
+					DisplayName: "cn",
+					Groupname:   "cn",
+					Member:      "cn",
+				},
+			},
+			JSON: config.JSONDriver{},
+			OwnCloudSQL: config.OwnCloudSQLDriver{
+				DBUsername:         "owncloud",
+				DBPassword:         "secret",
+				DBHost:             "mysql",
+				DBPort:             3306,
+				DBName:             "owncloud",
+				IDP:                "https://localhost:9200",
+				Nobody:             90,
+				JoinUsername:       false,
+				JoinOwnCloudUUID:   false,
+				EnableMedialSearch: false,
+			},
+			REST: config.RESTProvider{
+				RedisAddr: "localhost:6379",
+			},
+		},
+	}
+}
+
+func EnsureDefaults(cfg *config.Config) {
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Logging == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Logging = &config.Logging{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Logging == nil {
+		cfg.Logging = &config.Logging{}
+	}
+	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
+	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
+		cfg.Tracing = &config.Tracing{
+			Enabled:   cfg.Commons.Tracing.Enabled,
+			Type:      cfg.Commons.Tracing.Type,
+			Endpoint:  cfg.Commons.Tracing.Endpoint,
+			Collector: cfg.Commons.Tracing.Collector,
+		}
+	} else if cfg.Tracing == nil {
+		cfg.Tracing = &config.Tracing{}
+	}
+}
+
+func Sanitize(cfg *config.Config) {
+	// nothing to sanitize here atm
+}

ocis-pkg/config/config.go

@@ -4,20 +4,33 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/shared"
 
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config"
 	audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
+	authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
+	authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
+	authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
+	frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config"
+	gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
+	group "github.com/owncloud/ocis/extensions/group/pkg/config"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/config"
 	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config"
+	ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config"
 	ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config"
 	proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config"
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/config"
-	storage "github.com/owncloud/ocis/extensions/storage/pkg/config"
+	sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config"
+	storagemetadata "github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
+	storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config"
+	storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config"
+	storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config"
 	thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
+	user "github.com/owncloud/ocis/extensions/user/pkg/config"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config"
 	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config"
 )
@@ -59,21 +72,34 @@ type Config struct {
 	TokenManager TokenManager `yaml:"token_manager"`
 	Runtime      Runtime      `yaml:"runtime"`
 
-	Audit         *audit.Config         `yaml:"audit"`
-	Accounts      *accounts.Config      `yaml:"accounts"`
-	GLAuth        *glauth.Config        `yaml:"glauth"`
-	Graph         *graph.Config         `yaml:"graph"`
-	GraphExplorer *graphExplorer.Config `yaml:"graph_explorer"`
-	IDP           *idp.Config           `yaml:"idp"`
-	IDM           *idm.Config           `yaml:"idm"`
-	Nats          *nats.Config          `yaml:"nats"`
-	Notifications *notifications.Config `yaml:"notifications"`
-	OCS           *ocs.Config           `yaml:"ocs"`
-	Web           *web.Config           `yaml:"web"`
-	Proxy         *proxy.Config         `yaml:"proxy"`
-	Settings      *settings.Config      `yaml:"settings"`
-	Storage       *storage.Config       `yaml:"storage"`
-	Store         *store.Config         `yaml:"store"`
-	Thumbnails    *thumbnails.Config    `yaml:"thumbnails"`
-	WebDAV        *webdav.Config        `yaml:"webdav"`
+	Audit             *audit.Config           `yaml:"audit"`
+	Accounts          *accounts.Config        `yaml:"accounts"`
+	GLAuth            *glauth.Config          `yaml:"glauth"`
+	Graph             *graph.Config           `yaml:"graph"`
+	GraphExplorer     *graphExplorer.Config   `yaml:"graph_explorer"`
+	IDP               *idp.Config             `yaml:"idp"`
+	IDM               *idm.Config             `yaml:"idm"`
+	Nats              *nats.Config            `yaml:"nats"`
+	Notifications     *notifications.Config   `yaml:"notifications"`
+	OCS               *ocs.Config             `yaml:"ocs"`
+	Web               *web.Config             `yaml:"web"`
+	Proxy             *proxy.Config           `yaml:"proxy"`
+	Settings          *settings.Config        `yaml:"settings"`
+	Gateway           *gateway.Config         `yaml:"gateway"`
+	Frontend          *frontend.Config        `yaml:"frontend"`
+	AuthBasic         *authbasic.Config       `yaml:"auth_basic"`
+	AuthBearer        *authbearer.Config      `yaml:"auth_bearer"`
+	AuthMachine       *authmachine.Config     `yaml:"auth_machine"`
+	User              *user.Config            `yaml:"user"`
+	Group             *group.Config           `yaml:"group"`
+	AppProvider       *appprovider.Config     `yaml:"app_provider"`
+	Sharing           *sharing.Config         `yaml:"sharing"`
+	StorageMetadata   *storagemetadata.Config `yaml:"storage_metadata"`
+	StoragePublicLink *storagepublic.Config   `yaml:"storage_public"`
+	StorageUsers      *storageusers.Config    `yaml:"storage_users"`
+	StorageShares     *storageshares.Config   `yaml:"storage_shares"`
+	OCDav             *ocdav.Config           `yaml:"ocdav"`
+	Store             *store.Config           `yaml:"store"`
+	Thumbnails        *thumbnails.Config      `yaml:"thumbnails"`
+	WebDAV            *webdav.Config          `yaml:"webdav"`
 }

ocis-pkg/config/defaultconfig.go

@@ -2,20 +2,33 @@ package config
 
 import (
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
+	appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults"
 	audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
+	authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults"
+	authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults"
+	authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults"
+	frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config/defaults"
+	gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
+	group "github.com/owncloud/ocis/extensions/group/pkg/config/defaults"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
 	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
+	ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config/defaults"
 	ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
 	proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
-	storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults"
+	sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults"
+	storagemetadata "github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/defaults"
+	storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/defaults"
+	storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/defaults"
+	storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config/defaults"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
 	thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
+	user "github.com/owncloud/ocis/extensions/user/pkg/config/defaults"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
 	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
 )
@@ -29,22 +42,35 @@ func DefaultConfig() *Config {
 			Port: "9250",
 			Host: "localhost",
 		},
-		Audit:         audit.DefaultConfig(),
-		Accounts:      accounts.DefaultConfig(),
-		GLAuth:        glauth.DefaultConfig(),
-		Graph:         graph.DefaultConfig(),
-		IDP:           idp.DefaultConfig(),
-		IDM:           idm.DefaultConfig(),
-		Nats:          nats.DefaultConfig(),
-		Notifications: notifications.DefaultConfig(),
-		Proxy:         proxy.DefaultConfig(),
-		GraphExplorer: graphExplorer.DefaultConfig(),
-		OCS:           ocs.DefaultConfig(),
-		Settings:      settings.DefaultConfig(),
-		Web:           web.DefaultConfig(),
-		Store:         store.DefaultConfig(),
-		Thumbnails:    thumbnails.DefaultConfig(),
-		WebDAV:        webdav.DefaultConfig(),
-		Storage:       storage.DefaultConfig(),
+		Audit:             audit.DefaultConfig(),
+		Accounts:          accounts.DefaultConfig(),
+		GLAuth:            glauth.DefaultConfig(),
+		Graph:             graph.DefaultConfig(),
+		IDP:               idp.DefaultConfig(),
+		IDM:               idm.DefaultConfig(),
+		Nats:              nats.DefaultConfig(),
+		Notifications:     notifications.DefaultConfig(),
+		Proxy:             proxy.DefaultConfig(),
+		GraphExplorer:     graphExplorer.DefaultConfig(),
+		OCS:               ocs.DefaultConfig(),
+		Settings:          settings.DefaultConfig(),
+		Web:               web.DefaultConfig(),
+		Store:             store.DefaultConfig(),
+		Thumbnails:        thumbnails.DefaultConfig(),
+		WebDAV:            webdav.DefaultConfig(),
+		Gateway:           gateway.FullDefaultConfig(),
+		AuthBasic:         authbasic.FullDefaultConfig(),
+		AuthBearer:        authbearer.FullDefaultConfig(),
+		AuthMachine:       authmachine.FullDefaultConfig(),
+		User:              user.FullDefaultConfig(),
+		Group:             group.FullDefaultConfig(),
+		Sharing:           sharing.FullDefaultConfig(),
+		StorageMetadata:   storagemetadata.FullDefaultConfig(),
+		StoragePublicLink: storagepublic.FullDefaultConfig(),
+		StorageUsers:      storageusers.FullDefaultConfig(),
+		StorageShares:     storageshares.FullDefaultConfig(),
+		AppProvider:       appprovider.FullDefaultConfig(),
+		Frontend:          frontend.FullDefaultConfig(),
+		OCDav:             ocdav.FullDefaultConfig(),
 	}
 }

ocis-pkg/ldap/ldap.go

@@ -0,0 +1,25 @@
+package ldap
+
+import (
+	"errors"
+	"os"
+	"time"
+
+	"github.com/owncloud/ocis/ocis-pkg/log"
+)
+
+const _caTimeout = 5
+
+func WaitForCA(log log.Logger, insecure bool, caCert string) error {
+	if !insecure && caCert != "" {
+		if _, err := os.Stat(caCert); errors.Is(err, os.ErrNotExist) {
+			log.Warn().Str("LDAP CACert", caCert).Msgf("File does not exist. Waiting %d seconds for it to appear.", _caTimeout)
+			time.Sleep(_caTimeout * time.Second)
+			if _, err := os.Stat(caCert); errors.Is(err, os.ErrNotExist) {
+				log.Warn().Str("LDAP CACert", caCert).Msgf("File still does not exist after Timeout")
+				return err
+			}
+		}
+	}
+	return nil
+}

ocis-pkg/tracing/tracing.go

@@ -5,6 +5,7 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"go.opentelemetry.io/otel/exporters/jaeger"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/resource"
@@ -93,3 +94,35 @@ func parseAgentConfig(ae string) (string, string, error) {
 	}
 	return p[0], p[1], nil
 }
+
+// Configure for Reva serves only as informational / instructive log messages. Tracing config will be delegated directly
+// to Reva services.
+func Configure(enabled bool, tracingType string, logger log.Logger) {
+	if enabled {
+		switch tracingType {
+		case "agent":
+			logger.Error().
+				Str("type", tracingType).
+				Msg("Reva only supports the jaeger tracing backend")
+
+		case "jaeger":
+			logger.Info().
+				Str("type", tracingType).
+				Msg("configuring storage to use the jaeger tracing backend")
+
+		case "zipkin":
+			logger.Error().
+				Str("type", tracingType).
+				Msg("Reva only supports the jaeger tracing backend")
+
+		default:
+			logger.Warn().
+				Str("type", tracingType).
+				Msg("Unknown tracing backend")
+		}
+
+	} else {
+		logger.Debug().
+			Msg("Tracing is not enabled")
+	}
+}

ocis/pkg/command/ocdav.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,11 +13,11 @@ func OCDavCommand(cfg *config.Config) *cli.Command {
 		Name:     "ocdav",
 		Usage:    "start ocdav",
 		Category: "extensions",
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
+		// Before: func(ctx *cli.Context) error {
+		// 	return ParseStorageCommon(ctx, cfg)
+		// },
 		Action: func(c *cli.Context) error {
-			origCmd := command.OCDav(cfg.Storage)
+			origCmd := command.OCDav(cfg.OCDav)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageappprovider.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/appprovider/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageAppProviderCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-app-provider",
 		Usage:    "start storage app-provider service",
 		Category: "extensions",
-		//Flags:    flagset.AppProviderWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.AppProvider(cfg.Storage)
+			origCmd := command.AppProvider(cfg.AppProvider)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageauthbasic.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/auth-basic/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageAuthBasicCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-auth-basic",
 		Usage:    "start storage auth-basic service",
 		Category: "extensions",
-		//Flags:    flagset.AuthBasicWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.AuthBasic(cfg.Storage)
+			origCmd := command.AuthBasic(cfg.AuthBasic)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageauthbearer.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/auth-bearer/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageAuthBearerCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-auth-bearer",
 		Usage:    "Start storage auth-bearer service",
 		Category: "extensions",
-		//Flags:    flagset.AuthBearerWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.AuthBearer(cfg.Storage)
+			origCmd := command.AuthBearer(cfg.AuthBearer)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageauthmachine.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageAuthMachineCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-auth-machine",
 		Usage:    "start storage auth-machine service",
 		Category: "extensions",
-		//Flags:    flagset.AuthMachineWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.AuthMachine(cfg.Storage)
+			origCmd := command.AuthMachine(cfg.AuthMachine)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagefrontend.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/frontend/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageFrontendCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-frontend",
 		Usage:    "start storage frontend",
 		Category: "extensions",
-		//Flags:    flagset.FrontendWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.Frontend(cfg.Storage)
+			origCmd := command.Frontend(cfg.Frontend)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagegateway.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/gateway/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -14,11 +14,11 @@ func StorageGatewayCommand(cfg *config.Config) *cli.Command {
 		Usage:    "start storage gateway",
 		Category: "extensions",
 		//Flags:    flagset.GatewayWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
+		// Before: func(ctx *cli.Context) error {
+		// 	return ParseStorageCommon(ctx, cfg)
+		// },
 		Action: func(c *cli.Context) error {
-			origCmd := command.Gateway(cfg.Storage)
+			origCmd := command.Gateway(cfg.Gateway)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagegroupprovider.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/group/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageGroupProviderCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-groupprovider",
 		Usage:    "start storage groupprovider service",
 		Category: "extensions",
-		//Flags:    flagset.GroupsWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.Groups(cfg.Storage)
+			origCmd := command.Groups(cfg.Group)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagemetadata.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/storage-metadata/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,11 +13,8 @@ func StorageMetadataCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-metadata",
 		Usage:    "start storage and data service for metadata",
 		Category: "extensions",
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.StorageMetadata(cfg.Storage)
+			origCmd := command.StorageMetadata(cfg.StorageMetadata)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagepubliclink.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/storage-publiclink/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-public-link",
 		Usage:    "start storage public link storage",
 		Category: "extensions",
-		//Flags:    flagset.StoragePublicLink(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.StoragePublicLink(cfg.Storage)
+			origCmd := command.StoragePublicLink(cfg.StoragePublicLink)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageshares.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/storage-shares/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,11 +13,8 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-shares",
 		Usage:    "start storage and data provider for shares jail",
 		Category: "extensions",
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.StorageShares(cfg.Storage)
+			origCmd := command.StorageShares(cfg.StorageShares)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storagesharing.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/sharing/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageSharingCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-sharing",
 		Usage:    "start storage sharing service",
 		Category: "extensions",
-		//Flags:    flagset.SharingWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.Sharing(cfg.Storage)
+			origCmd := command.Sharing(cfg.Sharing)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageuserprovider.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/user/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageUserProviderCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-userprovider",
 		Usage:    "start storage userprovider service",
 		Category: "extensions",
-		//Flags:    flagset.UsersWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.Users(cfg.Storage)
+			origCmd := command.User(cfg.User)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/storageusers.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/extensions/storage/pkg/command"
+	"github.com/owncloud/ocis/extensions/storage-users/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
@@ -13,12 +13,8 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
 		Name:     "storage-users",
 		Usage:    "start storage and data provider for /users mount",
 		Category: "extensions",
-		//Flags:    flagset.StorageUsersWithConfig(cfg.Storage),
-		Before: func(ctx *cli.Context) error {
-			return ParseStorageCommon(ctx, cfg)
-		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.StorageUsers(cfg.Storage)
+			origCmd := command.StorageUsers(cfg.StorageUsers)
 			return handleOriginalAction(c, origCmd)
 		},
 	}

ocis/pkg/command/util.go

@@ -1,27 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/config/parser"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
-	"github.com/urfave/cli/v2"
-)
-
-func ParseStorageCommon(ctx *cli.Context, cfg *config.Config) error {
-	if err := parser.ParseConfig(cfg); err != nil {
-		return err
-	}
-
-	if cfg.Storage.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
-		cfg.Storage.Log = &shared.Log{
-			Level:  cfg.Commons.Log.Level,
-			Pretty: cfg.Commons.Log.Pretty,
-			Color:  cfg.Commons.Log.Color,
-			File:   cfg.Commons.Log.File,
-		}
-	} else if cfg.Storage.Log == nil && cfg.Commons == nil {
-		cfg.Storage.Log = &shared.Log{}
-	}
-
-	return nil
-}

ocis/pkg/runtime/service/service.go

@@ -20,22 +20,34 @@ import (
 	"github.com/olekukonko/tablewriter"
 
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command"
+	appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/command"
+	authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command"
+	authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command"
+	authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
+	frontend "github.com/owncloud/ocis/extensions/frontend/pkg/command"
+	gateway "github.com/owncloud/ocis/extensions/gateway/pkg/command"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
+	group "github.com/owncloud/ocis/extensions/group/pkg/command"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/command"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/command"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/command"
 	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/command"
+	ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/command"
 	ocs "github.com/owncloud/ocis/extensions/ocs/pkg/command"
 	proxy "github.com/owncloud/ocis/extensions/proxy/pkg/command"
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/command"
-	storage "github.com/owncloud/ocis/extensions/storage/pkg/command"
+	sharing "github.com/owncloud/ocis/extensions/sharing/pkg/command"
+	storagemetadata "github.com/owncloud/ocis/extensions/storage-metadata/pkg/command"
+	storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/command"
+	storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/command"
+	storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/command"
 	store "github.com/owncloud/ocis/extensions/store/pkg/command"
 	thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/command"
+	user "github.com/owncloud/ocis/extensions/user/pkg/command"
 	web "github.com/owncloud/ocis/extensions/web/pkg/command"
 	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command"
-	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/rs/zerolog"
@@ -96,7 +108,7 @@ func NewService(options ...Option) (*Service, error) {
 
 	s.ServicesRegistry["settings"] = settings.NewSutureService
 	s.ServicesRegistry["nats"] = nats.NewSutureService
-	s.ServicesRegistry["storage-metadata"] = storage.NewStorageMetadata
+	s.ServicesRegistry["storage-metadata"] = storagemetadata.NewStorageMetadata
 	s.ServicesRegistry["glauth"] = glauth.NewSutureService
 	s.ServicesRegistry["graph"] = graph.NewSutureService
 	s.ServicesRegistry["graph-explorer"] = graphExplorer.NewSutureService
@@ -107,24 +119,24 @@ func NewService(options ...Option) (*Service, error) {
 	s.ServicesRegistry["thumbnails"] = thumbnails.NewSutureService
 	s.ServicesRegistry["web"] = web.NewSutureService
 	s.ServicesRegistry["webdav"] = webdav.NewSutureService
-	s.ServicesRegistry["storage-frontend"] = storage.NewFrontend
-	s.ServicesRegistry["ocdav"] = storage.NewOCDav
-	s.ServicesRegistry["storage-gateway"] = storage.NewGateway
-	s.ServicesRegistry["storage-userprovider"] = storage.NewUserProvider
-	s.ServicesRegistry["storage-groupprovider"] = storage.NewGroupProvider
-	s.ServicesRegistry["storage-authbasic"] = storage.NewAuthBasic
-	s.ServicesRegistry["storage-authbearer"] = storage.NewAuthBearer
-	s.ServicesRegistry["storage-authmachine"] = storage.NewAuthMachine
-	s.ServicesRegistry["storage-users"] = storage.NewStorageUsers
-	s.ServicesRegistry["storage-shares"] = storage.NewStorageShares
-	s.ServicesRegistry["storage-public-link"] = storage.NewStoragePublicLink
-	s.ServicesRegistry["storage-appprovider"] = storage.NewAppProvider
+	s.ServicesRegistry["storage-frontend"] = frontend.NewFrontend
+	s.ServicesRegistry["storage-gateway"] = gateway.NewGateway
+	s.ServicesRegistry["storage-userprovider"] = user.NewUserProvider
+	s.ServicesRegistry["storage-groupprovider"] = group.NewGroupProvider
+	s.ServicesRegistry["storage-authbasic"] = authbasic.NewAuthBasic
+	s.ServicesRegistry["storage-authbearer"] = authbearer.NewAuthBearer
+	s.ServicesRegistry["storage-authmachine"] = authmachine.NewAuthMachine
+	s.ServicesRegistry["storage-users"] = storageusers.NewStorageUsers
+	s.ServicesRegistry["storage-shares"] = storageshares.NewStorageShares
+	s.ServicesRegistry["storage-public-link"] = storagepublic.NewStoragePublicLink
+	s.ServicesRegistry["storage-appprovider"] = appprovider.NewAppProvider
 	s.ServicesRegistry["notifications"] = notifications.NewSutureService
 
 	// populate delayed services
-	s.Delayed["storage-sharing"] = storage.NewSharing
+	s.Delayed["storage-sharing"] = sharing.NewSharing
 	s.Delayed["accounts"] = accounts.NewSutureService
 	s.Delayed["proxy"] = proxy.NewSutureService
+	s.Delayed["ocdav"] = ocdav.NewOCDav
 
 	return s, nil
 }
@@ -172,15 +184,6 @@ func Start(o ...Option) error {
 		}
 	}
 
-	if s.cfg.Storage.Log == nil {
-		s.cfg.Storage.Log = &shared.Log{}
-	}
-
-	s.cfg.Storage.Log.Color = s.cfg.Commons.Log.Color
-	s.cfg.Storage.Log.Level = s.cfg.Commons.Log.Level
-	s.cfg.Storage.Log.Pretty = s.cfg.Commons.Log.Pretty
-	s.cfg.Storage.Log.File = s.cfg.Commons.Log.File
-
 	if err = rpc.Register(s); err != nil {
 		if s != nil {
 			s.Log.Fatal().Err(err)
@@ -241,7 +244,7 @@ func scheduleServiceTokens(s *Service, funcSet serviceFuncMap) {
 
 // generateRunSet interprets the cfg.Runtime.Extensions config option to cherry-pick which services to start using
 // the runtime.
-func (s *Service) generateRunSet(cfg *config.Config) {
+func (s *Service) generateRunSet(cfg *ociscfg.Config) {
 	if cfg.Runtime.Extensions != "" {
 		e := strings.Split(strings.ReplaceAll(cfg.Runtime.Extensions, " ", ""), ",")
 		for i := range e {