Skip to content

Commit 85fc748

Browse files
committed
fix: [OCISDEV-471] OCM: User can't change the federated share permission
1 parent 3a3bd00 commit 85fc748

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
github.com/open-policy-agent/opa v1.6.0
6767
github.com/orcaman/concurrent-map v1.0.0
6868
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27
69-
github.com/owncloud/reva/v2 v2.0.0-20251031091821-e32f19d8b321
69+
github.com/owncloud/reva/v2 v2.0.0-20251104220141-c05e0189d4f5
7070
github.com/pkg/errors v0.9.1
7171
github.com/pkg/xattr v0.4.12
7272
github.com/prometheus/client_golang v1.23.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,8 @@ github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HD
715715
github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
716716
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27 h1:ID8s5lGBntmrlI6TbDAjTzRyHucn3bVM2wlW+HBplv4=
717717
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27/go.mod h1:+gT+x62AS9u2Farh9wE2uYmgdvTg0MQgsSI62D+xoRg=
718-
github.com/owncloud/reva/v2 v2.0.0-20251031091821-e32f19d8b321 h1:0280gHTdvrDrts+7zx/PfuK0pu112pNHUKtAlpGj0/Q=
719-
github.com/owncloud/reva/v2 v2.0.0-20251031091821-e32f19d8b321/go.mod h1:9c5qJbKff+lDgtgjOPFi4/b5Cyx5niauCJGSm1b1zqM=
718+
github.com/owncloud/reva/v2 v2.0.0-20251104220141-c05e0189d4f5 h1:M/V8rz8rj8iff1W9KIL1+3hm3fqnh5YNGqyZH7jMktM=
719+
github.com/owncloud/reva/v2 v2.0.0-20251104220141-c05e0189d4f5/go.mod h1:9c5qJbKff+lDgtgjOPFi4/b5Cyx5niauCJGSm1b1zqM=
720720
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
721721
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
722722
github.com/pablodz/inotifywaitgo v0.0.9 h1:njquRbBU7fuwIe5rEvtaniVBjwWzcpdUVptSgzFqZsw=

tests/acceptance/TestHelpers/GraphHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static function getEtagRegex(): string {
143143
* @return string
144144
*/
145145
public static function getFederatedUserRegex(): string {
146-
return '([0-9a-fA-F-]+)@([A-Za-z0-9.-]+(?::\d+)?$)';
146+
return '^[a-zA-Z_][a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]*(?:@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*(?::\d{1,5})?)?$';
147147
}
148148

149149
/**

vendor/github.com/owncloud/reva/v2/internal/grpc/services/ocminvitemanager/ocminvitemanager.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/owncloud/reva/v2/internal/http/services/ocmd/invites.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/owncloud/reva/v2/internal/http/services/ocmd/shares.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/owncloud/reva/v2/pkg/ocm/user/user.go

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ github.com/orcaman/concurrent-map
12351235
# github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27
12361236
## explicit; go 1.18
12371237
github.com/owncloud/libre-graph-api-go
1238-
# github.com/owncloud/reva/v2 v2.0.0-20251031091821-e32f19d8b321
1238+
# github.com/owncloud/reva/v2 v2.0.0-20251104220141-c05e0189d4f5
12391239
## explicit; go 1.24.0
12401240
github.com/owncloud/reva/v2/cmd/revad/internal/grace
12411241
github.com/owncloud/reva/v2/cmd/revad/runtime

0 commit comments

Comments
 (0)