From ef020920e8155d442b5c538ab10a296d4c08da74 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Mon, 8 Aug 2022 17:23:47 +0200
Subject: [PATCH] update authentication tests

---
 .../pkg/middleware/authentication_test.go     | 19 ++++++++++
 .../proxy/pkg/middleware/basic_auth_test.go   | 38 -------------------
 .../pkg/middleware/signed_url_auth_test.go    |  4 +-
 3 files changed, 21 insertions(+), 40 deletions(-)
 create mode 100644 services/proxy/pkg/middleware/authentication_test.go
 delete mode 100644 services/proxy/pkg/middleware/basic_auth_test.go

diff --git a/services/proxy/pkg/middleware/authentication_test.go b/services/proxy/pkg/middleware/authentication_test.go
new file mode 100644
index 0000000000..1188fefa34
--- /dev/null
+++ b/services/proxy/pkg/middleware/authentication_test.go
@@ -0,0 +1,19 @@
+package middleware
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("authentication helpers", func() {
+	DescribeTable("isPublicPath should recognize public paths",
+		func(input string, expected bool) {
+			isPublic := isPublicPath(input)
+			Expect(isPublic).To(Equal(expected))
+		},
+		Entry("public files path", "/remote.php/dav/public-files/", true),
+		Entry("public files path without remote.php", "/remote.php/dav/public-files/", true),
+		Entry("token info path", "/remote.php/ocs/apps/files_sharing/api/v1/tokeninfo/unprotected", true),
+		Entry("capabilities", "/ocs/v1.php/cloud/capabilities", true),
+	)
+})
diff --git a/services/proxy/pkg/middleware/basic_auth_test.go b/services/proxy/pkg/middleware/basic_auth_test.go
deleted file mode 100644
index 77279d66b4..0000000000
--- a/services/proxy/pkg/middleware/basic_auth_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package middleware
-
-import (
-	"net/http/httptest"
-	"testing"
-)
-
-/**/
-
-func TestBasicAuth__isPublicLink(t *testing.T) {
-	tests := []struct {
-		url      string
-		username string
-		expected bool
-	}{
-		{url: "/remote.php/dav/public-files/", username: "", expected: false},
-		{url: "/remote.php/dav/public-files/", username: "abc", expected: false},
-		{url: "/remote.php/dav/public-files/", username: "private", expected: false},
-		{url: "/remote.php/dav/public-files/", username: "public", expected: true},
-		{url: "/ocs/v1.php/cloud/capabilities", username: "", expected: false},
-		{url: "/ocs/v1.php/cloud/capabilities", username: "abc", expected: false},
-		{url: "/ocs/v1.php/cloud/capabilities", username: "private", expected: false},
-		{url: "/ocs/v1.php/cloud/capabilities", username: "public", expected: true},
-		{url: "/ocs/v1.php/cloud/users/admin", username: "public", expected: false},
-	}
-	for _, tt := range tests {
-		req := httptest.NewRequest("", tt.url, nil)
-
-		if tt.username != "" {
-			req.SetBasicAuth(tt.username, "")
-		}
-
-		result := isPublicPath(req.URL.Path)
-		if result != tt.expected {
-			t.Errorf("with %s expected %t got %t", tt.url, tt.expected, result)
-		}
-	}
-}
diff --git a/services/proxy/pkg/middleware/signed_url_auth_test.go b/services/proxy/pkg/middleware/signed_url_auth_test.go
index 01311b731e..35f84e6655 100644
--- a/services/proxy/pkg/middleware/signed_url_auth_test.go
+++ b/services/proxy/pkg/middleware/signed_url_auth_test.go
@@ -20,7 +20,7 @@ func TestSignedURLAuth_shouldServe(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		pua.preSignedURLConfig.Enabled = tt.enabled
+		pua.PreSignedURLConfig.Enabled = tt.enabled
 		r := httptest.NewRequest("", tt.url, nil)
 		result := pua.shouldServe(r)
 
@@ -89,7 +89,7 @@ func TestSignedURLAuth_requestMethodIsAllowed(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		pua.preSignedURLConfig.AllowedHTTPMethods = tt.allowed
+		pua.PreSignedURLConfig.AllowedHTTPMethods = tt.allowed
 		ok, _ := pua.requestMethodIsAllowed(tt.method)
 
 		if ok != tt.expected {