ocm provider authorizer: configuration to disable check takes precedence

This is preliminary to be able to support OCM without ScienceMesh
cs3org · Dec 18, 2023 · b87b80b · b87b80b
1 parent fab3678
commit b87b80b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go
@@ -130,10 +130,10 @@ func (a *authorizer) IsProviderAllowed(ctx context.Context, pi *ocmprovider.Prov
 	}
 
 	switch {
-	case !providerAuthorized:
-		return errtypes.NotFound(pi.GetDomain())
 	case !a.conf.VerifyRequestHostname:
 		return nil
+	case !providerAuthorized:
+		return errtypes.NotFound(pi.GetDomain())
 	case len(pi.Services) == 0:
 		return errtypes.NotSupported("No IP provided")
 	}

diff --git a/pkg/ocm/provider/authorizer/mentix/mentix.go b/pkg/ocm/provider/authorizer/mentix/mentix.go
@@ -185,10 +185,10 @@ func (a *authorizer) IsProviderAllowed(ctx context.Context, pi *ocmprovider.Prov
 	}
 
 	switch {
-	case !providerAuthorized:
-		return errtypes.NotFound(pi.GetDomain())
 	case !a.conf.VerifyRequestHostname:
 		return nil
+	case !providerAuthorized:
+		return errtypes.NotFound(pi.GetDomain())
 	case len(pi.Services) == 0:
 		return errtypes.NotSupported(
 			fmt.Sprintf("mentix: provider %s has no supported services", pi.GetDomain()))