From 5a9a9ce86a0b2369004997311a65bee203b2e10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 6 Oct 2020 21:22:44 +0200
Subject: [PATCH] set ocis storage owner on startup, account fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 accounts/pkg/storage/cs3.go            |  7 +++----
 storage/pkg/command/drivers.go         |  1 +
 storage/pkg/flagset/storagemetadata.go | 17 +++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go
index 5fce0839c..6a80972c9 100644
--- a/accounts/pkg/storage/cs3.go
+++ b/accounts/pkg/storage/cs3.go
@@ -206,12 +206,11 @@ func (r CS3Repo) DeleteGroup(ctx context.Context, id string) (err error) {
 
 func (r CS3Repo) authenticate(ctx context.Context) (token string, err error) {
 	u := &user.User{
-		Id:     &user.UserId{},
+		Id: &user.UserId{
+			OpaqueId: r.cfg.ServiceUser.UUID,
+		},
 		Groups: []string{},
 	}
-	if r.cfg.ServiceUser.Username != "" {
-		u.Id.OpaqueId = r.cfg.ServiceUser.UUID
-	}
 	return r.tm.MintToken(ctx, u)
 }
 
diff --git a/storage/pkg/command/drivers.go b/storage/pkg/command/drivers.go
index 914e34b84..8d501e6aa 100644
--- a/storage/pkg/command/drivers.go
+++ b/storage/pkg/command/drivers.go
@@ -91,6 +91,7 @@ func drivers(cfg *config.Config) map[string]interface{} {
 			"user_layout":         cfg.Reva.Storages.Common.UserLayout,
 			"treetime_accounting": true,
 			"treesize_accounting": true,
+			"owner":               "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad", // the accounts service system account uuid
 		},
 		"s3": map[string]interface{}{
 			"region":     cfg.Reva.Storages.S3.Region,
diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go
index d6f90d7fb..f0585c023 100644
--- a/storage/pkg/flagset/storagemetadata.go
+++ b/storage/pkg/flagset/storagemetadata.go
@@ -57,13 +57,6 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER"},
 			Destination: &cfg.Reva.StorageMetadata.Driver,
 		},
-		&cli.StringFlag{
-			Name:        "storage-root",
-			Value:       "/var/tmp/ocis/metadata",
-			Usage:       "the path to the metadata storage root",
-			EnvVars:     []string{"STORAGE_METADATA_ROOT"},
-			Destination: &cfg.Reva.Storages.Common.Root,
-		},
 
 		// some drivers need to look up users at the gateway
 
@@ -95,7 +88,15 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverLocalWithConfig(cfg)...)
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
-
+	flags = append(flags,
+		&cli.StringFlag{
+			Name:        "storage-root",
+			Value:       "/var/tmp/ocis/metadata",
+			Usage:       "the path to the metadata storage root",
+			EnvVars:     []string{"STORAGE_METADATA_ROOT"},
+			Destination: &cfg.Reva.Storages.Common.Root,
+		},
+	)
 	return flags
 
 }