feat(ocis): bump reva

Signed-off-by: jkoberg <jkoberg@owncloud.com>

changelog/unreleased/bump-reva.md

@@ -3,3 +3,4 @@ Enhancement: Bump Reva
 Bumps the reva version
 
 https://github.com/owncloud/ocis/pull/10830
+https://github.com/owncloud/ocis/pull/10842

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1
-	github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e
+	github.com/cs3org/reva/v2 v2.27.1-0.20250109115603-fe9caac22593
 	github.com/davidbyttow/govips/v2 v2.15.0
 	github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

go.sum

@@ -253,8 +253,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1 h1:RU6LT6mkD16xZs011+8foU7T3LrPvTTSWeTQ9OgfhkA=
 github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1/go.mod h1:DedpcqXl193qF/08Y04IO0PpxyyMu8+GrkD6kWK2MEQ=
-github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e h1:9gyNznHfnoMuBWxF+xuGyoMVXeGFDRjfDNdu8qaBZuw=
-github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e/go.mod h1:OrCNgIFkp3ROHiEjNCj8eZHACmYCD4owtFRuYFlYZkU=
+github.com/cs3org/reva/v2 v2.27.1-0.20250109115603-fe9caac22593 h1:bzRnLxh2Vj/Buy2AYv0KRmpxgkIYSpfs9ELbR7fhasY=
+github.com/cs3org/reva/v2 v2.27.1-0.20250109115603-fe9caac22593/go.mod h1:OrCNgIFkp3ROHiEjNCj8eZHACmYCD4owtFRuYFlYZkU=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

vendor/github.com/cs3org/reva/v2/pkg/events/notifications.go

@@ -0,0 +1,17 @@
+package events
+
+import (
+	"encoding/json"
+)
+
+// SendEmailsEvent instructs the notification service to send grouped emails
+type SendEmailsEvent struct {
+	Interval string
+}
+
+// Unmarshal to fulfill umarshaller interface
+func (SendEmailsEvent) Unmarshal(v []byte) (interface{}, error) {
+	e := SendEmailsEvent{}
+	err := json.Unmarshal(v, &e)
+	return e, err
+}

vendor/github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/json/json.go

@@ -114,9 +114,22 @@ func (a *authorizer) GetInfoByDomain(_ context.Context, domain string) (*ocmprov
 		return nil, err
 	}
 	for _, p := range a.providers {
+		// we can exit early if this an exact match
 		if strings.Contains(p.Domain, normalizedDomain) {
 			return p, nil
 		}
+
+		// check if the domain matches a regex
+		if ok, err := regexp.MatchString(p.Domain, normalizedDomain); ok && err == nil {
+			// overwrite wildcards with the actual domain
+			for i, s := range p.Services {
+				s.Endpoint.Path = strings.ReplaceAll(s.Endpoint.Path, p.Domain, normalizedDomain)
+				s.Host = strings.ReplaceAll(s.Host, p.Domain, normalizedDomain)
+				p.Services[i] = s
+			}
+			p.Domain = normalizedDomain
+			return p, nil
+		}
 	}
 	return nil, errtypes.NotFound(domain)
 }

vendor/modules.txt

@@ -367,7 +367,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
 github.com/cs3org/go-cs3apis/cs3/types/v1beta1
-# github.com/cs3org/reva/v2 v2.27.1-0.20250108145244-9d64adf0696e
+# github.com/cs3org/reva/v2 v2.27.1-0.20250109115603-fe9caac22593
 ## explicit; go 1.22.0
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime