when sharing via ocs look up user by username (#1281)

cs3org · Nov 23, 2020 · 90850c5 · 90850c5
1 parent 0484050
commit 90850c5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/changelog/unreleased/ocs-lookup-user-by-username.md b/changelog/unreleased/ocs-lookup-user-by-username.md
@@ -0,0 +1,5 @@
+Bugfix: when sharing via ocs look up user by username
+
+The ocs api returns usernames when listing share recipients, so the lookup when creating the share needs to search the usernames and not the userid.
+
+https://github.com/cs3org/reva/pull/1281
diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -192,8 +192,9 @@ func (h *Handler) createUserShare(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	userRes, err := c.GetUser(ctx, &userpb.GetUserRequest{
-		UserId: &userpb.UserId{OpaqueId: shareWith},
+	userRes, err := c.GetUserByClaim(ctx, &userpb.GetUserByClaimRequest{
+		Claim: "username",
+		Value: shareWith,
 	})
 	if err != nil {
 		response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "error searching recipient", err)

diff --git a/tests/oc-integration-tests/drone/ldap-users.toml b/tests/oc-integration-tests/drone/ldap-users.toml
@@ -14,8 +14,7 @@ auth_manager = "ldap"
 hostname="ldap"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"
@@ -32,8 +31,10 @@ driver = "ldap"
 hostname="ldap"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+userfilter="(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))"
+findfilter="(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))"
+attributefilter="(&(objectclass=posixAccount)({{attr}}={{value}}))"
+groupfilter="(&(objectclass=posixGroup)(cn={{.OpaqueId}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"

diff --git a/tests/oc-integration-tests/local/ldap-users.toml b/tests/oc-integration-tests/local/ldap-users.toml
@@ -14,8 +14,7 @@ auth_manager = "ldap"
 hostname="localhost"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"
@@ -32,8 +31,10 @@ driver = "ldap"
 hostname="localhost"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+userfilter="(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))"
+findfilter="(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))"
+attributefilter="(&(objectclass=posixAccount)({{attr}}={{value}}))"
+groupfilter="(&(objectclass=posixGroup)(cn={{.OpaqueId}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"