Skip to content

Commit 16fae61

Browse files
committed
fix: ocm
1 parent 00dd324 commit 16fae61

File tree

8 files changed

+55
-10
lines changed

8 files changed

+55
-10
lines changed

changelog/unreleased/fix-ocm.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Bugfix: Fix the OCM
2+
3+
Fixed the OCM WebDAV protocol entity mismatch
4+
Fixed OCM invintation restrictions to always allow providers
5+
Fixed the OCM user id decoding
6+
7+
https://github.com/owncloud/ocis/pull/11743
8+
https://github.com/owncloud/reva/pull/426

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,4 @@ replace go-micro.dev/v4 => github.com/kobergj/go-micro/v4 v4.0.0-20250117084952-
354354
// see https://github.com/mattn/go-sqlite3/issues/965 for more details
355355
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
356356

357-
replace github.com/cs3org/reva/v2 => github.com/owncloud/reva/v2 v2.0.0-20250724132414-1d9f38a30619
357+
replace github.com/cs3org/reva/v2 => github.com/owncloud/reva/v2 v2.0.0-20251017085525-7e4af1c66e8e

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,8 @@ github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CF
881881
github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
882882
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27 h1:ID8s5lGBntmrlI6TbDAjTzRyHucn3bVM2wlW+HBplv4=
883883
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27/go.mod h1:+gT+x62AS9u2Farh9wE2uYmgdvTg0MQgsSI62D+xoRg=
884-
github.com/owncloud/reva/v2 v2.0.0-20250724132414-1d9f38a30619 h1:CB8hisJolJSTk+Inu6kJ8NWzU7nr6a7xtFvNnybTC/g=
885-
github.com/owncloud/reva/v2 v2.0.0-20250724132414-1d9f38a30619/go.mod h1:1H26PMXoa1rDrIoZ7lGOerq1Bg07/5srYfRaKfxBSsc=
884+
github.com/owncloud/reva/v2 v2.0.0-20251017085525-7e4af1c66e8e h1:iDgHKP9oJHNGFB+NYe0dy4XrzMYUqYy5yUgNcTDu0Z4=
885+
github.com/owncloud/reva/v2 v2.0.0-20251017085525-7e4af1c66e8e/go.mod h1:1H26PMXoa1rDrIoZ7lGOerq1Bg07/5srYfRaKfxBSsc=
886886
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
887887
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
888888
github.com/pablodz/inotifywaitgo v0.0.7 h1:1ii49dGBnRn0t1Sz7RGZS6/NberPEDQprwKHN49Bv6U=

vendor/github.com/cs3org/reva/v2/internal/grpc/services/ocmshareprovider/ocmshareprovider.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/cs3org/reva/v2/internal/http/services/ocmd/protocols.go

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

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

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

vendor/github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/json/json.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/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
371371
github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
372372
github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
373373
github.com/cs3org/go-cs3apis/cs3/types/v1beta1
374-
# github.com/cs3org/reva/v2 v2.27.7 => github.com/owncloud/reva/v2 v2.0.0-20250724132414-1d9f38a30619
374+
# github.com/cs3org/reva/v2 v2.27.7 => github.com/owncloud/reva/v2 v2.0.0-20251017085525-7e4af1c66e8e
375375
## explicit; go 1.22.7
376376
github.com/cs3org/reva/v2/cmd/revad/internal/grace
377377
github.com/cs3org/reva/v2/cmd/revad/runtime
@@ -2408,4 +2408,4 @@ stash.kopano.io/kgol/rndm
24082408
# github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-20240611112133-abc838fb797c
24092409
# github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90
24102410
# go-micro.dev/v4 => github.com/kobergj/go-micro/v4 v4.0.0-20250117084952-d07d30666b7c
2411-
# github.com/cs3org/reva/v2 => github.com/owncloud/reva/v2 v2.0.0-20250724132414-1d9f38a30619
2411+
# github.com/cs3org/reva/v2 => github.com/owncloud/reva/v2 v2.0.0-20251017085525-7e4af1c66e8e

0 commit comments

Comments
 (0)