From b87b80b49c754fb48069a9e6c225cd9f037d3c02 Mon Sep 17 00:00:00 2001 From: Giuseppe Lo Presti Date: Fri, 15 Dec 2023 18:38:01 +0100 Subject: [PATCH] ocm provider authorizer: configuration to disable check takes precedence This is preliminary to be able to support OCM without ScienceMesh --- pkg/ocm/provider/authorizer/json/json.go | 4 ++-- pkg/ocm/provider/authorizer/mentix/mentix.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go index 6ff81c494b..405370baa0 100644 --- 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 index e93edf0ac0..ad408dacf2 100644 --- 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()))