Merge pull request #447 from butonic/update-reva-to-dcbf0c8ea187

update reva to v1.1.1-0.20200819100654-dcbf0c8ea187
owncloud · Aug 19, 2020 · d2819c6 · d2819c6
2 parents e8cf262 + 9fa18bf
commit d2819c6
Show file tree

Hide file tree

Showing 20 changed files with 143 additions and 50 deletions.
diff --git a/changelog/unreleased/update-reva-to-20200728.md b/changelog/unreleased/update-reva-to-20200728.md
@@ -0,0 +1,17 @@
+Enhancement: update reva to v1.1.1-0.20200819100654-dcbf0c8ea187
+
+- Update reva to v1.1.1-0.20200819100654-dcbf0c8ea187
+- fix restoring and deleting trash items via ocs [(reva/#1103)](https://github.com/cs3org/reva/pull/1103)
+- Add UID and GID in ldap auth driver [(reva/#1101)](https://github.com/cs3org/reva/pull/1101)
+- Allow listing the trashbin [(reva/#1091)](https://github.com/cs3org/reva/pull/1091)
+- Ignore Stray Public Shares [(reva/#1090)](https://github.com/cs3org/reva/pull/1090)
+- Implement GetUserByClaim for LDAP user driver [(reva/#1088)](https://github.com/cs3org/reva/pull/1088)
+- eosclient: get file info by fxid [(reva/#1079)](https://github.com/cs3org/reva/pull/1079)
+- Ensure stray shares get ignored [(reva/#1064)](https://github.com/cs3org/reva/pull/1064)
+- Improve timestamp precision while logging [(reva/#1059)](https://github.com/cs3org/reva/pull/1059)
+- Ocfs lookup userid (update) [(reva/#1052)](https://github.com/cs3org/reva/pull/1052)
+- Disallow sharing the shares directory [(reva/#1051)](https://github.com/cs3org/reva/pull/1051)
+- Local storage provider: Fixed resolution of fileid [(reva/#1046)](https://github.com/cs3org/reva/pull/1046)
+- List public shares only created by the current user [(reva/#1042)](https://github.com/cs3org/reva/pull/1042)
+
+https://github.com/owncloud/ocis-reva/pull/447
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/owncloud/ocis-reva
 go 1.13
 
 require (
-	github.com/cs3org/reva v1.1.1-0.20200813152025-baea1c67fb87
+	github.com/cs3org/reva v1.1.1-0.20200819100654-dcbf0c8ea187
 	github.com/gofrs/uuid v3.3.0+incompatible
 	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
 	github.com/micro/cli/v2 v2.1.1

diff --git a/go.sum b/go.sum
diff --git a/pkg/command/storageeos.go b/pkg/command/storageeos.go
@@ -105,7 +105,7 @@ func StorageEOS(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -124,6 +124,7 @@ func StorageEOS(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 								},
 								"mount_path":         cfg.Reva.StorageEOS.MountPath,

diff --git a/pkg/command/storageeosdata.go b/pkg/command/storageeosdata.go
@@ -107,7 +107,7 @@ func StorageEOSData(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -126,6 +126,7 @@ func StorageEOSData(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 								},
 								"timeout":     86400,

diff --git a/pkg/command/storagehome.go b/pkg/command/storagehome.go
@@ -105,7 +105,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -124,6 +124,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"local": map[string]interface{}{
 										"root": cfg.Reva.Storages.Local.Root,

diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go
@@ -107,7 +107,7 @@ func StorageHomeData(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -126,6 +126,7 @@ func StorageHomeData(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"local": map[string]interface{}{
 										"root": cfg.Reva.Storages.Local.Root,

diff --git a/pkg/command/storageoc.go b/pkg/command/storageoc.go
@@ -105,7 +105,7 @@ func StorageOC(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -124,6 +124,7 @@ func StorageOC(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"local": map[string]interface{}{
 										"root": cfg.Reva.Storages.Local.Root,

diff --git a/pkg/command/storageocdata.go b/pkg/command/storageocdata.go
@@ -107,7 +107,7 @@ func StorageOCData(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -126,6 +126,7 @@ func StorageOCData(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"local": map[string]interface{}{
 										"root": cfg.Reva.Storages.Local.Root,

diff --git a/pkg/command/storageroot.go b/pkg/command/storageroot.go
@@ -105,7 +105,7 @@ func StorageRoot(cfg *config.Config) *cli.Command {
 										"sec_protocol":           cfg.Reva.Storages.EOS.SecProtocol,
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
-										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"eoshome": map[string]interface{}{
 										"namespace":              cfg.Reva.Storages.EOS.Namespace,
@@ -124,6 +124,7 @@ func StorageRoot(cfg *config.Config) *cli.Command {
 										"keytab":                 cfg.Reva.Storages.EOS.Keytab,
 										"single_username":        cfg.Reva.Storages.EOS.SingleUsername,
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
+										"gatewaysvc":             cfg.Reva.Storages.EOS.GatewaySVC,
 									},
 									"local": map[string]interface{}{
 										"root": cfg.Reva.Storages.Local.Root,

diff --git a/pkg/command/users.go b/pkg/command/users.go
@@ -93,21 +93,24 @@ func Users(cfg *config.Config) *cli.Command {
 										"users": cfg.Reva.Users.JSON,
 									},
 									"ldap": map[string]interface{}{
-										"hostname":      cfg.Reva.LDAP.Hostname,
-										"port":          cfg.Reva.LDAP.Port,
-										"base_dn":       cfg.Reva.LDAP.BaseDN,
-										"userfilter":    cfg.Reva.LDAP.UserFilter,
-										"findfilter":    cfg.Reva.LDAP.FindFilter,
-										"groupfilter":   cfg.Reva.LDAP.GroupFilter,
-										"bind_username": cfg.Reva.LDAP.BindDN,
-										"bind_password": cfg.Reva.LDAP.BindPassword,
-										"idp":           cfg.Reva.LDAP.IDP,
+										"hostname":        cfg.Reva.LDAP.Hostname,
+										"port":            cfg.Reva.LDAP.Port,
+										"base_dn":         cfg.Reva.LDAP.BaseDN,
+										"userfilter":      cfg.Reva.LDAP.UserFilter,
+										"attributefilter": cfg.Reva.LDAP.AttributeFilter,
+										"findfilter":      cfg.Reva.LDAP.FindFilter,
+										"groupfilter":     cfg.Reva.LDAP.GroupFilter,
+										"bind_username":   cfg.Reva.LDAP.BindDN,
+										"bind_password":   cfg.Reva.LDAP.BindPassword,
+										"idp":             cfg.Reva.LDAP.IDP,
 										"schema": map[string]interface{}{
 											"dn":          "dn",
 											"uid":         cfg.Reva.LDAP.Schema.UID,
 											"mail":        cfg.Reva.LDAP.Schema.Mail,
 											"displayName": cfg.Reva.LDAP.Schema.DisplayName,
 											"cn":          cfg.Reva.LDAP.Schema.CN,
+											"uidNumber":   cfg.Reva.LDAP.Schema.UIDNumber,
+											"gidNumber":   cfg.Reva.LDAP.Schema.GIDNumber,
 										},
 									},
 								},

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -168,6 +168,9 @@ type DriverEOS struct {
 
 	// Layout of the users home dir path
 	Layout string
+
+	// gateway service to use for uid lookups
+	GatewaySVC string
 }
 
 // DriverLocal defines the available local storage driver configuration.
@@ -203,17 +206,18 @@ type OIDC struct {
 
 // LDAP defines the available ldap configuration.
 type LDAP struct {
-	Hostname     string
-	Port         int
-	BaseDN       string
-	LoginFilter  string
-	UserFilter   string
-	FindFilter   string
-	GroupFilter  string
-	BindDN       string
-	BindPassword string
-	IDP          string
-	Schema       LDAPSchema
+	Hostname        string
+	Port            int
+	BaseDN          string
+	LoginFilter     string
+	UserFilter      string
+	AttributeFilter string
+	FindFilter      string
+	GroupFilter     string
+	BindDN          string
+	BindPassword    string
+	IDP             string
+	Schema          LDAPSchema
 }
 
 // LDAPSchema defines the available ldap schema configuration.
@@ -222,6 +226,8 @@ type LDAPSchema struct {
 	Mail        string
 	DisplayName string
 	CN          string
+	UIDNumber   string
+	GIDNumber   string
 }
 
 // OCDav defines the available ocdav configuration.

diff --git a/pkg/flagset/storageeos.go b/pkg/flagset/storageeos.go
@@ -281,6 +281,13 @@ func StorageEOSWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storageeosdata.go b/pkg/flagset/storageeosdata.go
@@ -259,6 +259,13 @@ func StorageEOSDataWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storagehome.go b/pkg/flagset/storagehome.go
@@ -286,6 +286,13 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storagehomedata.go b/pkg/flagset/storagehomedata.go
@@ -260,6 +260,13 @@ func StorageHomeDataWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storageoc.go b/pkg/flagset/storageoc.go
@@ -284,6 +284,13 @@ func StorageOCWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storageocdata.go b/pkg/flagset/storageocdata.go
@@ -262,6 +262,13 @@ func StorageOCDataWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/storageroot.go b/pkg/flagset/storageroot.go
@@ -268,6 +268,13 @@ func StorageRootWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.Layout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-eos-gatewaysvc",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVars:     []string{"REVA_STORAGE_EOS_GATEWAYSVC"},
+			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
+		},
 
 		// local
 

diff --git a/pkg/flagset/users.go b/pkg/flagset/users.go
@@ -112,6 +112,13 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_LDAP_USERFILTER"},
 			Destination: &cfg.Reva.LDAP.UserFilter,
 		},
+		&cli.StringFlag{
+			Name:        "ldap-attributefilter",
+			Value:       "(&(objectclass=posixAccount)({{attr}}={{value}}))",
+			Usage:       "LDAP filter used when searching for a user by claim/attribute. {{attr}} will be replaced with the attribute, {{value}} with the value.",
+			EnvVars:     []string{"REVA_LDAP_ATTRIBUTEFILTER"},
+			Destination: &cfg.Reva.LDAP.AttributeFilter,
+		},
 		&cli.StringFlag{
 			Name:        "ldap-findfilter",
 			Value:       "(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
@@ -178,6 +185,20 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_LDAP_SCHEMA_CN"},
 			Destination: &cfg.Reva.LDAP.Schema.CN,
 		},
+		&cli.StringFlag{
+			Name:        "ldap-schema-uidnumber",
+			Value:       "uidnumber",
+			Usage:       "LDAP schema uidnumber",
+			EnvVars:     []string{"REVA_LDAP_SCHEMA_UID_NUMBER"},
+			Destination: &cfg.Reva.LDAP.Schema.UIDNumber,
+		},
+		&cli.StringFlag{
+			Name:        "ldap-schema-gidnumber",
+			Value:       "gidnumber",
+			Usage:       "LDAP schema gidnumber",
+			EnvVars:     []string{"REVA_LDAP_SCHEMA_GIDNUMBER"},
+			Destination: &cfg.Reva.LDAP.Schema.GIDNumber,
+		},
 
 		// Services