remove trailing slash while validating origin (#29)

0xsequence · Feb 21, 2024 · 922ba22 · 922ba22
1 parent 530afc3
commit 922ba22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/proto/proto.go b/proto/proto.go
@@ -51,15 +51,21 @@ func (t *AccessKey) ValidateOrigin(rawOrigin string) bool {
 		return true
 	}
 
-	origin := strings.ToLower(rawOrigin)
+	origin := normalizeOrigin(rawOrigin)
 	for _, o := range t.AllowedOrigins {
-		if matchDomain(origin, o) {
+		if matchDomain(origin, normalizeOrigin(o)) {
 			return true
 		}
 	}
 	return false
 }
 
+func normalizeOrigin(rawOrigin string) string {
+	origin := strings.ToLower(rawOrigin)
+	origin = strings.TrimRight(origin, "/")
+	return origin
+}
+
 func (t *AccessKey) ValidateService(service *Service) bool {
 	if len(t.AllowedServices) == 0 {
 		return true

diff --git a/proto/proto_test.go b/proto/proto_test.go
@@ -18,11 +18,12 @@ func TestAccessKeyValidateOrigin(t *testing.T) {
 
 	t.Run("allowed origins", func(t *testing.T) {
 		tk := &proto.AccessKey{
-			AllowedOrigins: []string{"http://localhost:8080", "http://localhost:8081"},
+			AllowedOrigins: []string{"http://localhost:8080", "http://localhost:8081", "http://localhost:8082/"},
 		}
 		assert.True(t, tk.ValidateOrigin("http://localhost:8080"))
 		assert.True(t, tk.ValidateOrigin("http://localhost:8081"))
-		assert.False(t, tk.ValidateOrigin("http://localhost:8082"))
+		assert.True(t, tk.ValidateOrigin("http://localhost:8082"))
+		assert.False(t, tk.ValidateOrigin("http://localhost:8083"))
 	})
 
 	t.Run("match any", func(t *testing.T) {