Merge pull request #4837 from fschade/oc-normalise-domain-use-host

fix(ocm): use host instead of hostDomain for normalizing ocm providers
cs3org · Sep 5, 2024 · 2de6ff3 · 2de6ff3
2 parents cf5e5eb + f4fefc3
commit 2de6ff3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/changelog/unreleased/ocm-fix-federated-userid.md b/changelog/unreleased/ocm-fix-federated-userid.md
@@ -2,5 +2,6 @@ Bugfix: fix OCM userid encoding
 
 We now base64 encode the remote userid and provider as the local federated user id. This allows us to always differentiate them from local users and unpack the encoded user id and provider when making requests to the remote ocm provider.
 
+https://github.com/cs3org/reva/pull/4837
 https://github.com/cs3org/reva/pull/4833
 https://github.com/owncloud/ocis/issues/9927
diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go
@@ -104,7 +104,7 @@ func normalizeDomain(d string) (string, error) {
 		return "", err
 	}
 
-	return u.Hostname(), nil
+	return u.Host, nil
 }
 
 func (a *authorizer) GetInfoByDomain(_ context.Context, domain string) (*ocmprovider.ProviderInfo, error) {

diff --git a/pkg/ocm/provider/authorizer/json/json_test.go b/pkg/ocm/provider/authorizer/json/json_test.go
@@ -24,9 +24,10 @@ func TestAuthorizer_GetInfoByDomain(t *testing.T) {
 			expectedDomain string
 			expectedError  error
 		}{
-			"domain only":      {givenDomain: "server-one:9200", expectedDomain: "server-one"},
-			"domain with port": {givenDomain: "server-two:9200", expectedDomain: "server-two:9200"},
-			"unknown domain":   {givenDomain: "unknown-domain", expectedError: errtypes.NotFound("unknown-domain")},
+			"domain only":                     {givenDomain: "server-one", expectedDomain: "server-one"},
+			"domain with port":                {givenDomain: "server-two:9200", expectedDomain: "server-two:9200"},
+			"domain only with port in result": {givenDomain: "server-two", expectedDomain: "server-two:9200"},
+			"unknown domain":                  {givenDomain: "unknown-domain", expectedError: errtypes.NotFound("unknown-domain")},
 		} {
 			t.Run(name, func(t *testing.T) {
 				info, err := authorizer.GetInfoByDomain(context.Background(), env.givenDomain)