Merge pull request #5025 from kobergj/AllowWildcardsInOCMDomains

Allow Wildcards in OCM Domains
cs3org · Jan 7, 2025 · 7d37996 · 7d37996
2 parents 1373bc2 + cfe6e13
commit 7d37996
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog/unreleased/allow-wildcard-ocm.md b/changelog/unreleased/allow-wildcard-ocm.md
@@ -0,0 +1,5 @@
+Enhancement: Allow wildcards in OCM domains
+
+When verifiying domains, allow wildcards in the domain name. This will not work when using `verify-request-hostname`
+
+https://github.com/cs3org/reva/pull/5025
diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go
@@ -24,6 +24,7 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"regexp"
 	"strings"
 	"sync"
 
@@ -130,7 +131,7 @@ func (a *authorizer) IsProviderAllowed(ctx context.Context, pi *ocmprovider.Prov
 	var providerAuthorized bool
 	if normalizedDomain != "" {
 		for _, p := range a.providers {
-			if p.Domain == normalizedDomain {
+			if ok, err := regexp.MatchString(p.Domain, normalizedDomain); ok && err == nil {
 				providerAuthorized = true
 				break
 			}