fix merge and rebase dance

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

storage/pkg/command/frontend.go

@@ -201,7 +201,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 					"resource_info_cache_ttl":   cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
 					"prefix":                    cfg.Reva.Frontend.OCSPrefix,
 					"additional_info_attribute": cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
-					"machine_auth_apikey":       "change-me-please", // FIXME make configurable
+					"machine_auth_apikey":       cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
 					"cache_warmup_driver":       cfg.Reva.Frontend.OCSCacheWarmupDriver,
 					"cache_warmup_drivers": map[string]interface{}{
 						"cbox": map[string]interface{}{

storage/pkg/command/gateway.go

@@ -180,8 +180,7 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
 					"driver": cfg.Reva.StorageRegistry.Driver,
 					"drivers": map[string]interface{}{
 						"spaces": map[string]interface{}{
-							"home_template": cfg.Reva.StorageRegistry.HomeProvider,
+							"providers": spacesProviders(cfg, logger),
-							"providers":     spacesProviders(cfg, logger),
 						},
 					},
 				},
@@ -234,14 +233,6 @@ func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[strin
 		},
 		cfg.Reva.StorageShares.Endpoint: {
 			"spaces": map[string]interface{}{
-				/*
-					"share": map[string]interface{}{
-						// The jail needs to be filled with mount points
-						// .Space.Name is a path relative to the mount point
-						"mount_point":   "/users/{{.CurrentUser.Id.OpaqueId}}/Shares",
-						"path_template": "/users/{{.CurrentUser.Id.OpaqueId}}/Shares/{{.Space.Name}}",
-					},
-				*/
 				"virtual": map[string]interface{}{
 					// The root of the share jail is mounted here
 					"mount_point": "/users/{{.CurrentUser.Id.OpaqueId}}/Shares",

storage/pkg/command/storageshares.go

@@ -117,7 +117,7 @@ func storageSharesConfigFromStruct(c *cli.Context, cfg *config.Config) map[strin
 	return rcfg
 }
 
-// StorageSharesSutureService allows for the storage-home command to be embedded and supervised by a suture supervisor tree.
+// StorageSharesSutureService allows for the storage-shares command to be embedded and supervised by a suture supervisor tree.
 type StorageSharesSutureService struct {
 	cfg *config.Config
 }

storage/pkg/config/config.go

@@ -2,10 +2,6 @@ package config
 
 import (
 	"context"
-	"os"
-	"path"
-
-	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 
 	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
@@ -520,441 +516,6 @@ func New() *Config {
 	return &Config{}
 }
 
-func DefaultConfig() *Config {
-	return &Config{
-		// log is inherited
-		Debug: Debug{
-			Addr: "127.0.0.1:9109",
-		},
-		Reva: Reva{
-			JWTSecret:             "Pive-Fumkiu4",
-			SkipUserGroupsInToken: false,
-			TransferSecret:        "replace-me-with-a-transfer-secret",
-			TransferExpires:       24 * 60 * 60,
-			OIDC: OIDC{
-				Issuer:   "https://localhost:9200",
-				Insecure: false,
-				IDClaim:  "preferred_username",
-			},
-			LDAP: LDAP{
-				Hostname:             "localhost",
-				Port:                 9126,
-				CACert:               path.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
-				Insecure:             false,
-				BaseDN:               "dc=ocis,dc=test",
-				LoginFilter:          "(&(objectclass=posixAccount)(|(cn={{login}})(mail={{login}})))",
-				UserFilter:           "(&(objectclass=posixAccount)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
-				UserAttributeFilter:  "(&(objectclass=posixAccount)({{attr}}={{value}}))",
-				UserFindFilter:       "(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
-				UserGroupFilter:      "(&(objectclass=posixGroup)(ownclouduuid={{.OpaqueId}}*))",
-				GroupFilter:          "(&(objectclass=posixGroup)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
-				GroupAttributeFilter: "(&(objectclass=posixGroup)({{attr}}={{value}}))",
-				GroupFindFilter:      "(&(objectclass=posixGroup)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
-				GroupMemberFilter:    "(&(objectclass=posixAccount)(ownclouduuid={{.OpaqueId}}*))",
-				BindDN:               "cn=reva,ou=sysusers,dc=ocis,dc=test",
-				BindPassword:         "reva",
-				IDP:                  "https://localhost:9200",
-				UserSchema: LDAPUserSchema{
-					UID:         "ownclouduuid",
-					Mail:        "mail",
-					DisplayName: "displayname",
-					CN:          "cn",
-					UIDNumber:   "uidnumber",
-					GIDNumber:   "gidnumber",
-				},
-				GroupSchema: LDAPGroupSchema{
-					GID:         "cn",
-					Mail:        "mail",
-					DisplayName: "cn",
-					CN:          "cn",
-					GIDNumber:   "gidnumber",
-				},
-			},
-			UserGroupRest: UserGroupRest{
-				RedisAddress: "localhost:6379",
-			},
-			UserOwnCloudSQL: UserOwnCloudSQL{
-				DBUsername:         "owncloud",
-				DBPassword:         "secret",
-				DBHost:             "mysql",
-				DBPort:             3306,
-				DBName:             "owncloud",
-				Idp:                "https://localhost:9200",
-				Nobody:             90,
-				JoinUsername:       false,
-				JoinOwnCloudUUID:   false,
-				EnableMedialSearch: false,
-			},
-			OCDav: OCDav{
-				WebdavNamespace:   "/home/",
-				DavFilesNamespace: "/users/",
-			},
-			Archiver: Archiver{
-				MaxNumFiles: 10000,
-				MaxSize:     1073741824,
-				ArchiverURL: "/archiver",
-			},
-			UserStorage: StorageConfig{
-				EOS: DriverEOS{
-					DriverCommon: DriverCommon{
-						Root:        "/eos/dockertest/reva",
-						ShareFolder: "/Shares",
-						UserLayout:  "{{substr 0 1 .Username}}/{{.Username}}",
-					},
-					ShadowNamespace:  "", // Defaults to path.Join(c.Namespace, ".shadow")
-					UploadsNamespace: "", // Defaults to path.Join(c.Namespace, ".uploads")
-					EosBinary:        "/usr/bin/eos",
-					XrdcopyBinary:    "/usr/bin/xrdcopy",
-					MasterURL:        "root://eos-mgm1.eoscluster.cern.ch:1094",
-					SlaveURL:         "root://eos-mgm1.eoscluster.cern.ch:1094",
-					CacheDirectory:   os.TempDir(),
-					GatewaySVC:       "127.0.0.1:9142",
-				},
-				Local: DriverCommon{
-					Root:        path.Join(defaults.BaseDataPath(), "storage", "local", "users"),
-					ShareFolder: "/Shares",
-					UserLayout:  "{{.Username}}",
-					EnableHome:  false,
-				},
-				OwnCloud: DriverOwnCloud{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "owncloud"),
-						ShareFolder: "/Shares",
-						UserLayout:  "{{.Id.OpaqueId}}",
-						EnableHome:  false,
-					},
-					UploadInfoDir: path.Join(defaults.BaseDataPath(), "storage", "uploadinfo"),
-					Redis:         ":6379",
-					Scan:          true,
-				},
-				OwnCloudSQL: DriverOwnCloudSQL{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "owncloud"),
-						ShareFolder: "/Shares",
-						UserLayout:  "{{.Username}}",
-						EnableHome:  false,
-					},
-					UploadInfoDir: path.Join(defaults.BaseDataPath(), "storage", "uploadinfo"),
-					DBUsername:    "owncloud",
-					DBPassword:    "owncloud",
-					DBHost:        "",
-					DBPort:        3306,
-					DBName:        "owncloud",
-				},
-				S3: DriverS3{
-					DriverCommon: DriverCommon{},
-					Region:       "default",
-					AccessKey:    "",
-					SecretKey:    "",
-					Endpoint:     "",
-					Bucket:       "",
-				},
-				S3NG: DriverS3NG{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "users"),
-						ShareFolder: "/Shares",
-						UserLayout:  "{{.Id.OpaqueId}}",
-						EnableHome:  false,
-					},
-					ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-					Region:          "default",
-					AccessKey:       "",
-					SecretKey:       "",
-					Endpoint:        "",
-					Bucket:          "",
-				},
-				OCIS: DriverOCIS{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "users"),
-						ShareFolder: "/Shares",
-						UserLayout:  "{{.Id.OpaqueId}}",
-					},
-					ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-				},
-			},
-			MetadataStorage: StorageConfig{
-				EOS: DriverEOS{
-					DriverCommon: DriverCommon{
-						Root:        "/eos/dockertest/reva",
-						ShareFolder: "/Shares",
-						UserLayout:  "{{substr 0 1 .Username}}/{{.Username}}",
-						EnableHome:  false,
-					},
-					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: DriverCommon{
-					Root: path.Join(defaults.BaseDataPath(), "storage", "local", "metadata"),
-				},
-				OwnCloud:    DriverOwnCloud{},
-				OwnCloudSQL: DriverOwnCloudSQL{},
-				S3: DriverS3{
-					DriverCommon: DriverCommon{},
-					Region:       "default",
-				},
-				S3NG: DriverS3NG{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "metadata"),
-						ShareFolder: "",
-						UserLayout:  "{{.Id.OpaqueId}}",
-						EnableHome:  false,
-					},
-					ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-					Region:          "default",
-					AccessKey:       "",
-					SecretKey:       "",
-					Endpoint:        "",
-					Bucket:          "",
-				},
-				OCIS: DriverOCIS{
-					DriverCommon: DriverCommon{
-						Root:        path.Join(defaults.BaseDataPath(), "storage", "metadata"),
-						ShareFolder: "",
-						UserLayout:  "{{.Id.OpaqueId}}",
-						EnableHome:  false,
-					},
-					ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-				},
-			},
-			Frontend: FrontendPort{
-				Port: Port{
-					MaxCPUs:     "",
-					LogLevel:    "",
-					GRPCNetwork: "",
-					GRPCAddr:    "",
-					HTTPNetwork: "tcp",
-					HTTPAddr:    "127.0.0.1:9140",
-					Protocol:    "",
-					Endpoint:    "",
-					DebugAddr:   "127.0.0.1:9141",
-					Services:    []string{"datagateway", "ocdav", "ocs", "appprovider"},
-					Config:      nil,
-					Context:     nil,
-					Supervised:  false,
-				},
-				AppProviderInsecure:        false,
-				AppProviderPrefix:          "",
-				ArchiverInsecure:           false,
-				ArchiverPrefix:             "archiver",
-				DatagatewayPrefix:          "data",
-				Favorites:                  false,
-				OCDavInsecure:              false,
-				OCDavPrefix:                "",
-				OCSPrefix:                  "ocs",
-				OCSSharePrefix:             "/Shares",
-				OCSHomeNamespace:           "/home",
-				PublicURL:                  "https://localhost:9200",
-				OCSCacheWarmupDriver:       "",
-				OCSAdditionalInfoAttribute: "{{.Mail}}",
-				OCSResourceInfoCacheTTL:    0,
-				Middleware:                 Middleware{},
-			},
-			DataGateway: DataGatewayPort{
-				Port:      Port{},
-				PublicURL: "",
-			},
-			Gateway: Gateway{
-				Port: Port{
-					Endpoint:    "127.0.0.1:9142",
-					DebugAddr:   "127.0.0.1:9143",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9142",
-				},
-				CommitShareToStorageGrant:  true,
-				CommitShareToStorageRef:    true,
-				DisableHomeCreationOnLogin: false,
-				ShareFolder:                "Shares",
-				LinkGrants:                 "",
-				HomeMapping:                "",
-				EtagCacheTTL:               0,
-			},
-			StorageRegistry: StorageRegistry{
-				Driver:       "static",
-				HomeProvider: "/home",
-				JSON:         "",
-			},
-			AppRegistry: AppRegistry{
-				Driver:        "static",
-				MimetypesJSON: "",
-			},
-			Users: Users{
-				Port: Port{
-					Endpoint:    "localhost:9144",
-					DebugAddr:   "127.0.0.1:9145",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9144",
-					Services:    []string{"userprovider"},
-				},
-				Driver:                    "ldap",
-				UserGroupsCacheExpiration: 5,
-			},
-			Groups: Groups{
-				Port: Port{
-					Endpoint:    "localhost:9160",
-					DebugAddr:   "127.0.0.1:9161",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9160",
-					Services:    []string{"groupprovider"},
-				},
-				Driver:                      "ldap",
-				GroupMembersCacheExpiration: 5,
-			},
-			AuthProvider: Users{
-				Port:                      Port{},
-				Driver:                    "ldap",
-				UserGroupsCacheExpiration: 0,
-			},
-			AuthBasic: Port{
-				GRPCNetwork: "tcp",
-				GRPCAddr:    "127.0.0.1:9146",
-				DebugAddr:   "127.0.0.1:9147",
-				Services:    []string{"authprovider"},
-				Endpoint:    "localhost:9146",
-			},
-			AuthBearer: Port{
-				GRPCNetwork: "tcp",
-				GRPCAddr:    "127.0.0.1:9148",
-				DebugAddr:   "127.0.0.1:9149",
-				Services:    []string{"authprovider"},
-				Endpoint:    "localhost:9148",
-			},
-			AuthMachine: Port{
-				GRPCNetwork: "tcp",
-				GRPCAddr:    "127.0.0.1:9166",
-				DebugAddr:   "127.0.0.1:9167",
-				Services:    []string{"authprovider"},
-				Endpoint:    "localhost:9166",
-			},
-			AuthMachineConfig: AuthMachineConfig{
-				MachineAuthAPIKey: "change-me-please",
-			},
-			Sharing: Sharing{
-				Port: Port{
-					Endpoint:    "localhost:9150",
-					DebugAddr:   "127.0.0.1:9151",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9150",
-					Services:    []string{"usershareprovider", "publicshareprovider"},
-				},
-				UserDriver:                       "json",
-				UserJSONFile:                     path.Join(defaults.BaseDataPath(), "storage", "shares.json"),
-				UserSQLUsername:                  "",
-				UserSQLPassword:                  "",
-				UserSQLHost:                      "",
-				UserSQLPort:                      1433,
-				UserSQLName:                      "",
-				PublicDriver:                     "json",
-				PublicJSONFile:                   path.Join(defaults.BaseDataPath(), "storage", "publicshares.json"),
-				PublicPasswordHashCost:           11,
-				PublicEnableExpiredSharesCleanup: true,
-				PublicJanitorRunInterval:         60,
-				UserStorageMountID:               "",
-			},
-			StorageHome: StoragePort{
-				Port: Port{
-					Endpoint:    "localhost:9154",
-					DebugAddr:   "127.0.0.1:9156",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9154",
-					HTTPNetwork: "tcp",
-					HTTPAddr:    "127.0.0.1:9155",
-				},
-				Driver:        "ocis",
-				ReadOnly:      false,
-				MountPath:     "/home",
-				AlternativeID: "1284d238-aa92-42ce-bdc4-0b0000009154",
-				MountID:       "1284d238-aa92-42ce-bdc4-0b0000009157",
-				DataServerURL: "http://localhost:9155/data",
-				HTTPPrefix:    "data",
-				TempFolder:    path.Join(defaults.BaseDataPath(), "tmp", "home"),
-			},
-			StorageUsers: StoragePort{
-				Port: Port{
-					Endpoint:    "localhost:9157",
-					DebugAddr:   "127.0.0.1:9159",
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9157",
-					HTTPNetwork: "tcp",
-					HTTPAddr:    "127.0.0.1:9158",
-				},
-				MountPath:     "/users",
-				MountID:       "1284d238-aa92-42ce-bdc4-0b0000009157",
-				Driver:        "ocis",
-				DataServerURL: "http://localhost:9158/data",
-				HTTPPrefix:    "data",
-				TempFolder:    path.Join(defaults.BaseDataPath(), "tmp", "users"),
-			},
-			StoragePublicLink: PublicStorage{
-				StoragePort: StoragePort{
-					Port: Port{
-						Endpoint:    "localhost:9178",
-						DebugAddr:   "127.0.0.1:9179",
-						GRPCNetwork: "tcp",
-						GRPCAddr:    "127.0.0.1:9178",
-					},
-					MountPath: "/public",
-					MountID:   "e1a73ede-549b-4226-abdf-40e69ca8230d",
-				},
-				PublicShareProviderAddr: "",
-				UserProviderAddr:        "",
-			},
-			StorageMetadata: StoragePort{
-				Port: Port{
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9215",
-					HTTPNetwork: "tcp",
-					HTTPAddr:    "127.0.0.1:9216",
-					DebugAddr:   "127.0.0.1:9217",
-				},
-				Driver:           "ocis",
-				ExposeDataServer: false,
-				DataServerURL:    "http://localhost:9216/data",
-				TempFolder:       path.Join(defaults.BaseDataPath(), "tmp", "metadata"),
-				DataProvider:     DataProvider{},
-			},
-			AppProvider: AppProvider{
-				Port: Port{
-					GRPCNetwork: "tcp",
-					GRPCAddr:    "127.0.0.1:9164",
-					DebugAddr:   "127.0.0.1:9165",
-					Endpoint:    "localhost:9164",
-					Services:    []string{"appprovider"},
-				},
-				ExternalAddr: "127.0.0.1:9164",
-				WopiDriver:   WopiDriver{},
-				AppsURL:      "/app/list",
-				OpenURL:      "/app/open",
-				NewURL:       "/app/new",
-			},
-			Configs:                     nil,
-			UploadMaxChunkSize:          1e+8,
-			UploadHTTPMethodOverride:    "",
-			ChecksumSupportedTypes:      []string{"sha1", "md5", "adler32"},
-			ChecksumPreferredUploadType: "",
-			DefaultUploadProtocol:       "tus",
-		},
-		Tracing: Tracing{
-			Service: "storage",
-			Type:    "jaeger",
-		},
-		Asset: Asset{},
-	}
-}
-
 // StructMappings binds a set of environment variables to a destination on cfg. Iterating over this set and editing the
 // Destination value of a binding will alter the original value, as it is a pointer to its memory address. This lets
 // us propagate changes easier.

storage/pkg/config/defaultconfig.go

@@ -33,7 +33,7 @@ func DefaultConfig() *Config {
 				UserFilter:           "(&(objectclass=posixAccount)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
 				UserAttributeFilter:  "(&(objectclass=posixAccount)({{attr}}={{value}}))",
 				UserFindFilter:       "(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
-				UserGroupFilter:      "(&(objectclass=posixGroup)(ownclouduuid={{.OpaqueId}}*))",
+				UserGroupFilter:      "(&(objectclass=posixGroup)(cn={{.}}*))", // FIXME (&(objectclass=posixGroup)(ownclouduuid={{.OpaqueId}}*)) in reva the template is executed with a string. IIRC rhaferkamp mentioned this
 				GroupFilter:          "(&(objectclass=posixGroup)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
 				GroupAttributeFilter: "(&(objectclass=posixGroup)({{attr}}={{value}}))",
 				GroupFindFilter:      "(&(objectclass=posixGroup)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
@@ -239,7 +239,7 @@ func DefaultConfig() *Config {
 				ArchiverPrefix:             "archiver",
 				DatagatewayPrefix:          "data",
 				Favorites:                  false,
-				OCDavInsecure:              false,
+				OCDavInsecure:              false, // true?
 				OCDavPrefix:                "",
 				OCSPrefix:                  "ocs",
 				OCSSharePrefix:             "/Shares",
@@ -271,7 +271,7 @@ func DefaultConfig() *Config {
 			},
 			StorageRegistry: StorageRegistry{
 				Driver:       "spaces",
-				HomeProvider: "/home",
+				HomeProvider: "/home", // unused for spaces, static currently not supported
 				JSON:         "",
 			},
 			AppRegistry: AppRegistry{
@@ -387,7 +387,7 @@ func DefaultConfig() *Config {
 						GRPCNetwork: "tcp",
 						GRPCAddr:    "127.0.0.1:9178",
 					},
-					MountID: "e1a73ede-549b-4226-abdf-40e69ca8230d",
+					MountID: "7993447f-687f-490d-875c-ac95e89a62a4",
 				},
 				PublicShareProviderAddr: "",
 				UserProviderAddr:        "",