fix: [OCM] Specification Compliance

changelog/unreleased/fix-ocm-weddav.md

@@ -0,0 +1,5 @@
+Bugfix: OCM Specification Compliance
+
+OCM Specification Compliance
+
+https://github.com/owncloud/ocis/pull/11773

go.mod

@@ -66,7 +66,7 @@ require (
 	github.com/open-policy-agent/opa v1.6.0
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27
-	github.com/owncloud/reva/v2 v2.0.0-20251017104024-82c22e954c1c
+	github.com/owncloud/reva/v2 v2.0.0-20251105115818-d640a1c632d6
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/xattr v0.4.12
 	github.com/prometheus/client_golang v1.23.2
@@ -333,7 +333,6 @@ require (
 	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	golang.org/x/tools v0.37.0 // indirect
-	golang.org/x/tools/godoc v0.1.0-deprecated // indirect
 	google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
@@ -343,7 +342,7 @@ require (
 	sigs.k8s.io/yaml v1.5.0 // indirect
 )
 
-replace github.com/studio-b12/gowebdav => github.com/kobergj/gowebdav v0.0.0-20250102091030-aa65266db202
+replace github.com/studio-b12/gowebdav => github.com/kobergj/gowebdav v0.0.0-20251030165916-532350997dde
 
 replace github.com/egirna/icap-client => github.com/kobergj/icap-client v0.0.0-20250116172800-8eaa5022532b
 

go.sum

@@ -578,8 +578,8 @@ github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4O
 github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kobergj/go-micro/v4 v4.0.0-20250610135441-d0b187215699 h1:3TOdtI6WPyvBB+uCykapjRtQX8vTHMlyhINzR+58B4k=
 github.com/kobergj/go-micro/v4 v4.0.0-20250610135441-d0b187215699/go.mod h1:eE/tD53n3KbVrzrWxKLxdkGw45Fg1qaNLWjpJMvIUF4=
-github.com/kobergj/gowebdav v0.0.0-20250102091030-aa65266db202 h1:A1xJ2NKgiYFiaHiLl9B5yw/gUBACSs9crDykTS3GuQI=
-github.com/kobergj/gowebdav v0.0.0-20250102091030-aa65266db202/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE=
+github.com/kobergj/gowebdav v0.0.0-20251030165916-532350997dde h1:HYcp4J4xYe2m9KSUVbTccJb14TpSs+ldCfDFgqsXedI=
+github.com/kobergj/gowebdav v0.0.0-20251030165916-532350997dde/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE=
 github.com/kobergj/icap-client v0.0.0-20250116172800-8eaa5022532b h1:NBKEgFtIukCreWOEvtrgNQusqosGyhlxzyiHbba1zEI=
 github.com/kobergj/icap-client v0.0.0-20250116172800-8eaa5022532b/go.mod h1:HpntrRsQA6RKNXy2Nbr4kVj+NO3OYWpAQUVxeya+3sU=
 github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90 h1:pfI8Z5yavO6fU6vDGlWhZ4BgDlvj8c6xB7J57HfTPwA=
@@ -715,8 +715,8 @@ github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HD
 github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27 h1:ID8s5lGBntmrlI6TbDAjTzRyHucn3bVM2wlW+HBplv4=
 github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27/go.mod h1:+gT+x62AS9u2Farh9wE2uYmgdvTg0MQgsSI62D+xoRg=
-github.com/owncloud/reva/v2 v2.0.0-20251017104024-82c22e954c1c h1:8xgW1qAuKNdXgH9P8F4hDI5vU6/VM1PibZhIFj7JSU0=
-github.com/owncloud/reva/v2 v2.0.0-20251017104024-82c22e954c1c/go.mod h1:EgvdLWO1ezgdVqewaAP2GIZJfRRggwZItJnnTBxNNrY=
+github.com/owncloud/reva/v2 v2.0.0-20251105115818-d640a1c632d6 h1:gEgBVPnxrW1R+NBsk7H/5D/EwU5GONzZGPlbAXd7V0g=
+github.com/owncloud/reva/v2 v2.0.0-20251105115818-d640a1c632d6/go.mod h1:9c5qJbKff+lDgtgjOPFi4/b5Cyx5niauCJGSm1b1zqM=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pablodz/inotifywaitgo v0.0.9 h1:njquRbBU7fuwIe5rEvtaniVBjwWzcpdUVptSgzFqZsw=

services/graph/pkg/service/v0/utils.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
+	"path"
 	"reflect"
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
@@ -544,7 +545,7 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
 			// file shares
 			resOpaqueID := "/"
 			if receivedShares[0].GetResourceType() == storageprovider.ResourceType_RESOURCE_TYPE_FILE {
-				resOpaqueID += receivedShares[0].GetName()
+				resOpaqueID = path.Join(resOpaqueID, receivedShares[0].GetName())
 			}
 
 			shareStat, err := gatewayClient.Stat(ctx, &storageprovider.StatRequest{

tests/acceptance/TestHelpers/GraphHelper.php

@@ -143,7 +143,7 @@ public static function getEtagRegex(): string {
 	 * @return string
 	 */
 	public static function getFederatedUserRegex(): string {
-		return '(?=(.{4})*$)[A-Za-z0-9+/]*={0,2}$';
+		return self::getUUIDv4Regex() . '@[a-zA-Z-\\\.]+(:\\\d+)?';
 	}
 
 	/**

tests/acceptance/features/apiOcm/searchFederationUsers.feature

@@ -64,7 +64,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%local_host_port%"
+                        "const": "%local_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -126,7 +126,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%remote_host_port%"
+                        "const": "%remote_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -194,7 +194,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%local_host_port%"
+                        "const": "%local_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -256,7 +256,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%remote_host_port%"
+                        "const": "%remote_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -346,7 +346,7 @@ Feature: search federation users
             },
             "idp": {
               "type": "string",
-              "const": "%remote_host_port%"
+              "const": "%remote_base_url%"
             },
             "mail": {
               "type": "string",
@@ -385,7 +385,7 @@ Feature: search federation users
                   "const": "Alice Hansen"
                 },
                 "idp": {
-                  "const": "%local_host_port%"
+                  "const": "%local_base_url%"
                 },
                 "mail": {
                   "pattern": "[email protected]"
@@ -409,7 +409,7 @@ Feature: search federation users
                   "const": "Carol King"
                 },
                 "idp": {
-                  "const": "%local_host_port%"
+                  "const": "%local_base_url%"
                 },
                 "mail": {
                   "pattern": "[email protected]"
@@ -480,7 +480,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%local_host_port%"
+                        "const": "%local_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -545,7 +545,7 @@ Feature: search federation users
                     ],
                     "properties": {
                       "issuer": {
-                        "const": "%remote_host_port%"
+                        "const": "%remote_base_url%"
                       },
                       "issuerAssignedId": {
                         "type": "string",
@@ -692,7 +692,7 @@ Feature: search federation users
                         ],
                         "properties": {
                           "issuer": {
-                            "const": "%remote_host_port%"
+                            "const": "%remote_base_url%"
                           },
                           "issuerAssignedId": {
                             "type": "string",