Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement historical way of constructing OCM WebDAV URL #3868

Merged
merged 20 commits into from
May 11, 2023

Conversation

gmgigi96
Copy link
Member

@gmgigi96 gmgigi96 commented May 9, 2023

Expose the expected WebDAV endpoint for OCM by OC10 and Nextcloud as described in cs3org/OCM-API#70 (comment) to allow Reva providers to participate to ScienceMesh.

In addition, expose the OCM discovery endpoint as /ocm-provider at the root level.

Closes #3855

@gmgigi96 gmgigi96 force-pushed the webdav_ocm_compliant branch 2 times, most recently from e2d2dd8 to 0e596be Compare May 10, 2023 11:50
@cs3org cs3org deleted a comment from update-docs bot May 10, 2023
@gmgigi96 gmgigi96 marked this pull request as ready for review May 10, 2023 11:54
@gmgigi96 gmgigi96 requested review from a team, labkode and glpatcern as code owners May 10, 2023 11:54
@gmgigi96 gmgigi96 marked this pull request as draft May 10, 2023 12:21
@gmgigi96 gmgigi96 marked this pull request as ready for review May 10, 2023 12:30
@gmgigi96
Copy link
Member Author

@glpatcern can you update the ocmd example adding the new service please?

@glpatcern glpatcern force-pushed the webdav_ocm_compliant branch 2 times, most recently from 00dd78f to 6cac20f Compare May 10, 2023 19:19
Copy link
Member

@glpatcern glpatcern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I tested my part and it's all fine, and I understand that Michiel successfully used the webdav access part, so we are good to go.

The cosmetic changes I propose are just to acknowledge that these are not temporary "fixes" and are there to stay potentially for a long time - at least until there's a OC10 site in ScienceMesh, and NC implements OCM v1.1.

internal/http/services/owncloud/ocdav/propfind.go Outdated Show resolved Hide resolved
internal/http/services/owncloud/ocdav/dav.go Outdated Show resolved Hide resolved
internal/http/services/owncloud/ocdav/dav.go Outdated Show resolved Hide resolved
internal/http/services/owncloud/ocdav/ocdav.go Outdated Show resolved Hide resolved
internal/http/services/owncloud/ocdav/propfind.go Outdated Show resolved Hide resolved
glpatcern and others added 8 commits May 11, 2023 10:47
Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
glpatcern
glpatcern previously approved these changes May 11, 2023
@glpatcern glpatcern merged commit cfcf976 into cs3org:master May 11, 2023
gmgigi96 added a commit to gmgigi96/reva that referenced this pull request Jun 5, 2023
* adapt webdav ocm endpoint according to historical way of contructing webdav url

* add discovery endpoint in the ocm client

* Make root OCM URLs configurable in /ocm-provider

* add changelog

* fix path for old ocm webdav

* Added reverse proxy for /ocm-provider

* Revert "Added reverse proxy for /ocm-provider"

This reverts commit 1ecb6e4.

* Moved ocm-provider to a new http service

* Updated examples

* Linting

* Simplified ocmprovider and documented config

* Further simplification + relaunching the CI

* Regenerated docs

* Expose OCM as disabled if no endpoint is configured for it

* Update internal/http/services/owncloud/ocdav/propfind.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/dav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/dav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/ocdav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/propfind.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* fix support legacy ocm access

---------

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
gmgigi96 added a commit to gmgigi96/reva that referenced this pull request Jun 28, 2023
* adapt webdav ocm endpoint according to historical way of contructing webdav url

* add discovery endpoint in the ocm client

* Make root OCM URLs configurable in /ocm-provider

* add changelog

* fix path for old ocm webdav

* Added reverse proxy for /ocm-provider

* Revert "Added reverse proxy for /ocm-provider"

This reverts commit 1ecb6e4.

* Moved ocm-provider to a new http service

* Updated examples

* Linting

* Simplified ocmprovider and documented config

* Further simplification + relaunching the CI

* Regenerated docs

* Expose OCM as disabled if no endpoint is configured for it

* Update internal/http/services/owncloud/ocdav/propfind.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/dav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/dav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/ocdav.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* Update internal/http/services/owncloud/ocdav/propfind.go

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>

* fix support legacy ocm access

---------

Co-authored-by: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adapt to historical way of constructing WebDAV URL
2 participants