From 06c0c28d38aca481efc2a16818b73e344e3d5a25 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Tue, 15 Feb 2022 10:55:40 +0100
Subject: [PATCH] remove base64 encoding of ids

---
 .../unreleased/remove-base64-encoding-of-ids.md      |  5 +++++
 internal/http/services/owncloud/ocdav/ocdav_test.go  |  2 +-
 pkg/utils/resourceid/owncloud.go                     | 12 +++---------
 pkg/utils/resourceid/owncloud_test.go                |  8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 changelog/unreleased/remove-base64-encoding-of-ids.md

diff --git a/changelog/unreleased/remove-base64-encoding-of-ids.md b/changelog/unreleased/remove-base64-encoding-of-ids.md
new file mode 100644
index 00000000000..0337302bd23
--- /dev/null
+++ b/changelog/unreleased/remove-base64-encoding-of-ids.md
@@ -0,0 +1,5 @@
+Change: Do not encode webDAV ids to base64
+
+We removed the encoding of the IDs and use the format <storageID>!<opaqueID> with a delimiter. The used delimiter is url safe anc belongs to the reserved keys.
+
+https://github.com/cs3org/reva/pull/2542
diff --git a/internal/http/services/owncloud/ocdav/ocdav_test.go b/internal/http/services/owncloud/ocdav/ocdav_test.go
index bcf63f63363..b9a2f5d0946 100644
--- a/internal/http/services/owncloud/ocdav/ocdav_test.go
+++ b/internal/http/services/owncloud/ocdav/ocdav_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestWrapResourceID(t *testing.T) {
-	expected := "c3RvcmFnZWlkOm9wYXF1ZWlk"
+	expected := "storageid" + "!" + "opaqueid"
 	wrapped := resourceid.OwnCloudResourceIDWrap(&providerv1beta1.ResourceId{StorageId: "storageid", OpaqueId: "opaqueid"})
 
 	if wrapped != expected {
diff --git a/pkg/utils/resourceid/owncloud.go b/pkg/utils/resourceid/owncloud.go
index 39abc460a40..485d73e0da8 100644
--- a/pkg/utils/resourceid/owncloud.go
+++ b/pkg/utils/resourceid/owncloud.go
@@ -19,7 +19,6 @@
 package resourceid
 
 import (
-	"encoding/base64"
 	"errors"
 	"strings"
 	"unicode/utf8"
@@ -28,7 +27,7 @@ import (
 )
 
 const (
-	idDelimiter string = ":"
+	idDelimiter string = "!"
 )
 
 // OwnCloudResourceIDUnwrap returns the wrapped resource id
@@ -42,12 +41,7 @@ func OwnCloudResourceIDUnwrap(rid string) *provider.ResourceId {
 }
 
 func unwrap(rid string) (*provider.ResourceId, error) {
-	decodedID, err := base64.URLEncoding.DecodeString(rid)
-	if err != nil {
-		return nil, err
-	}
-
-	parts := strings.SplitN(string(decodedID), idDelimiter, 2)
+	parts := strings.SplitN(rid, idDelimiter, 2)
 	if len(parts) != 2 {
 		return nil, errors.New("could not find two parts with given delimiter")
 	}
@@ -73,5 +67,5 @@ func OwnCloudResourceIDWrap(r *provider.ResourceId) string {
 // - url safe, because the id might be used in a url, eg. the /dav/meta nodes
 // which is why we base64 encode it
 func wrap(sid string, oid string) string {
-	return base64.URLEncoding.EncodeToString([]byte(sid + idDelimiter + oid))
+	return sid + idDelimiter + oid
 }
diff --git a/pkg/utils/resourceid/owncloud_test.go b/pkg/utils/resourceid/owncloud_test.go
index 5fc45af94a3..d23574ef588 100644
--- a/pkg/utils/resourceid/owncloud_test.go
+++ b/pkg/utils/resourceid/owncloud_test.go
@@ -31,7 +31,7 @@ func BenchmarkWrap(b *testing.B) {
 }
 
 func TestWrap(t *testing.T) {
-	expected := "c3RvcmFnZWlkOm9wYXF1ZWlk"
+	expected := "storageid" + idDelimiter + "opaqueid"
 	wrapped := wrap("storageid", "opaqueid")
 
 	if wrapped != expected {
@@ -40,7 +40,7 @@ func TestWrap(t *testing.T) {
 }
 
 func TestWrapResourceID(t *testing.T) {
-	expected := "c3RvcmFnZWlkOm9wYXF1ZWlk"
+	expected := "storageid" + idDelimiter + "opaqueid"
 	wrapped := OwnCloudResourceIDWrap(&providerv1beta1.ResourceId{StorageId: "storageid", OpaqueId: "opaqueid"})
 
 	if wrapped != expected {
@@ -50,7 +50,7 @@ func TestWrapResourceID(t *testing.T) {
 
 func BenchmarkUnwrap(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		_, _ = unwrap("c3RvcmFnZWlkOm9wYXF1ZWlk")
+		_, _ = unwrap("storageid" + idDelimiter + "opaqueid")
 	}
 }
 
@@ -60,7 +60,7 @@ func TestUnwrap(t *testing.T) {
 		expected *providerv1beta1.ResourceId
 	}{
 		{
-			"c3RvcmFnZWlkOm9wYXF1ZWlk",
+			"storageid" + idDelimiter + "opaqueid",
 			&providerv1beta1.ResourceId{StorageId: "storageid", OpaqueId: "opaqueid"},
 		},
 		{