[WIP] Add support for the oc 10 sql share manager

owncloud · Jul 23, 2021 · 33beee7 · 33beee7
1 parent 1a8c560
commit 33beee7
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 6 deletions.
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
@@ -206,12 +206,12 @@ func rules(cfg *config.Config, logger log.Logger) map[string]map[string]interfac
 
 	// generate rules based on default config
 	return map[string]map[string]interface{}{
-		cfg.Reva.StorageShares.MountPath:     {"address": cfg.Reva.StorageShares.Endpoint},
-		cfg.Reva.StorageHome.MountPath:       {"address": cfg.Reva.StorageHome.Endpoint},
-		cfg.Reva.StorageHome.MountID:         {"address": cfg.Reva.StorageHome.Endpoint},
-		cfg.Reva.StorageUsers.MountPath:      {"address": cfg.Reva.StorageUsers.Endpoint},
-		cfg.Reva.StorageUsers.MountID + ".*": {"address": cfg.Reva.StorageUsers.Endpoint},
-		cfg.Reva.StoragePublicLink.MountPath: {"address": cfg.Reva.StoragePublicLink.Endpoint},
+		cfg.Reva.StorageShares.MountPath:         {"address": cfg.Reva.StorageShares.Endpoint},
+		cfg.Reva.StorageHome.MountPath:           {"address": cfg.Reva.StorageHome.Endpoint},
+		cfg.Reva.StorageHome.MountID:             {"address": cfg.Reva.StorageHome.Endpoint},
+		cfg.Reva.StorageUsers.MountPath:          {"address": cfg.Reva.StorageUsers.Endpoint},
+		cfg.Reva.StorageUsers.MountID + "\\!?.*": {"address": cfg.Reva.StorageUsers.Endpoint},
+		cfg.Reva.StoragePublicLink.MountPath:     {"address": cfg.Reva.StoragePublicLink.Endpoint},
 		// public link storage returns the mount id of the actual storage
 		// medatada storage not part of the global namespace
 	}

diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
@@ -126,6 +126,8 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
 							"file": cfg.Reva.Sharing.UserJSONFile,
 						},
 						"sql": 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,

diff --git a/storage/pkg/command/storageshares.go b/storage/pkg/command/storageshares.go
@@ -107,6 +107,8 @@ func storageSharesConfigFromStruct(c *cli.Context, cfg *config.Config) map[strin
 							"file": cfg.Reva.Sharing.UserJSONFile,
 						},
 						"sql": 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,

diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go
@@ -44,6 +44,7 @@ type Sharing struct {
 	Port
 	UserDriver                       string
 	UserJSONFile                     string
+	UserStorageMountId               string
 	UserSQLUsername                  string
 	UserSQLPassword                  string
 	UserSQLHost                      string

diff --git a/storage/pkg/flagset/sharing.go b/storage/pkg/flagset/sharing.go
@@ -43,6 +43,13 @@ func SharingWithConfig(cfg *config.Config) []cli.Flag {
 			Usage:   "--service usershareprovider [--service publicshareprovider]",
 			EnvVars: []string{"STORAGE_SHARING_SERVICES"},
 		},
+		&cli.StringFlag{
+			Name:        "gateway-endpoint",
+			Value:       flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"),
+			Usage:       "endpoint to use for the storage gateway service",
+			EnvVars:     []string{"STORAGE_GATEWAY_ENDPOINT"},
+			Destination: &cfg.Reva.Gateway.Endpoint,
+		},
 		&cli.StringFlag{
 			Name:        "user-driver",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserDriver, "json"),

diff --git a/storage/pkg/flagset/sharingsql.go b/storage/pkg/flagset/sharingsql.go
@@ -9,6 +9,13 @@ import (
 // SharingSQLWithConfig applies the Shring SQL driver cfg to the flagset
 func SharingSQLWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "storage-mount-id",
+			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserStorageMountId, "1284d238-aa92-42ce-bdc4-0b0000009157"),
+			Usage:       "mount id of the storage that is used for accessing the shares",
+			EnvVars:     []string{"STORAGE_SHARING_USER_STORAGE_MOUNT_ID"},
+			Destination: &cfg.Reva.Sharing.UserStorageMountId,
+		},
 		&cli.StringFlag{
 			Name:        "user-sql-username",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserSQLUsername, ""),

diff --git a/storage/pkg/flagset/storageshares.go b/storage/pkg/flagset/storageshares.go
@@ -49,6 +49,14 @@ func StorageShares(cfg *config.Config) []cli.Flag {
 			Destination: &cfg.Reva.Gateway.Endpoint,
 		},
 
+		&cli.StringFlag{
+			Name:        "storage-mount-id",
+			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserStorageMountId, "1284d238-aa92-42ce-bdc4-0b0000009157"),
+			Usage:       "mount id of the storage that is used for accessing the shares",
+			EnvVars:     []string{"STORAGE_SHARING_USER_STORAGE_MOUNT_ID"},
+			Destination: &cfg.Reva.Sharing.UserStorageMountId,
+		},
+
 		&cli.StringFlag{
 			Name:        "user-driver",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserDriver, "json"),