Attempt to support both OCM 1.0 and 1.1 when accessing remote shares

cs3org · May 23, 2024 · 58a3e8f · 58a3e8f
1 parent d22f762
commit 58a3e8f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/pkg/ocm/storage/received/ocm.go b/pkg/ocm/storage/received/ocm.go
@@ -155,8 +155,15 @@ func (d *driver) webdavClient(ctx context.Context, ref *provider.Reference) (*go
 		return nil, nil, "", err
 	}
 
-	// use the secret as bearer authentication according to OCM v1.1+
-	c := gowebdav.NewClient(endpoint, "", "")
+	// inject the secret as 'username' for OCM v1.0 basic auhentication
+	parsedURL, err := url.Parse(endpoint)
+	if err != nil {
+		return nil, nil, "", err
+	}
+	parsedURL.User = url.UserPassword(secret, "")
+
+	// and use it as well as bearer authentication according to OCM v1.1+
+	c := gowebdav.NewClient(parsedURL.String(), "", "")
 	c.SetHeader("Authorization", "Bearer "+secret)
 
 	log := appctx.GetLogger(ctx)