Skip to content

fix(ocm): align discovery process with OCM spec - #55648

Merged
ArtificialOwl merged 1 commit into
masterfrom
fix/ocm-discovery-spec-compliant
Nov 10, 2025
Merged

fix(ocm): align discovery process with OCM spec#55648
ArtificialOwl merged 1 commit into
masterfrom
fix/ocm-discovery-spec-compliant

Conversation

@mickenordin

@mickenordinmickenordin commented Oct 9, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor
  • Attempt discovery at both /.well-known/ocm and /ocm-provider as defined in draft-lopresti-open-cloud-mesh-06 §5.2.
  • Maintains compatibility with existing /ocm-provider behavior.

Without this discovery fails with ownCloud oCIS

@mickenordin
mickenordin requested a review from a team as a code ownerOctober 9, 2025 12:19
@mickenordin
mickenordin requested review from ArtificialOwl, provokateurin and salmart-dev and removed request for a teamOctober 9, 2025 12:19
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch 3 times, most recently from 4b7b3e5 to 810a289CompareOctober 9, 2025 12:29
provokateurin
provokateurin requested changes Oct 9, 2025
View reviewed changes
Comment threadlib/private/OCM/OCMDiscoveryService.php
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 810a289 to 97eb0e9CompareOctober 9, 2025 12:38
provokateurin
provokateurin approved these changes Oct 9, 2025
View reviewed changes
Comment threadlib/private/OCM/OCMDiscoveryService.php Outdated
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 375ca5a to e68a63cCompareOctober 10, 2025 08:56
@mickenordinmickenordin added 4. to release Ready to be released and/or waiting for tests to finish feature: federation 32-feedback labels Oct 10, 2025
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch 3 times, most recently from 40efebc to 1aa8fc3CompareOctober 17, 2025 09:55
nickvergessen
nickvergessen reviewed Oct 17, 2025
View reviewed changes
Comment threadlib/private/OCM/OCMDiscoveryService.php
nickvergessen added a commit to nextcloud/spreed that referenced this pull request Oct 17, 2025
@nickvergessen
test(federation): Run tests againstnextcloud/server#55648
fb7f201
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessennickvergessen mentioned this pull request Oct 17, 2025
Closed
@nickvergessen

nickvergessen commented Oct 17, 2025

Copy link
Copy Markdown
Member

@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 1aa8fc3 to b0a33a0CompareOctober 17, 2025 11:27
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 2d4218f to 018966dCompareOctober 17, 2025 14:51
@mickenordinmickenordin mentioned this pull request Oct 20, 2025
Merged
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 018966d to ee7ac62CompareOctober 21, 2025 14:03
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from ee7ac62 to a582db8CompareOctober 21, 2025 14:51
@github-actions

github-actionsBot commented Oct 24, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from a582db8 to 84ec354CompareOctober 27, 2025 11:26
@blizzzblizzz added this to the Nextcloud 33 milestone Oct 27, 2025
mwinkens
mwinkens reviewed Oct 28, 2025
View reviewed changes
Comment threadlib/private/OCM/OCMDiscoveryService.php
$this->cache->set($remote, $body, 60 * 60 * 24);
$this->remoteProviders[$remote] = $provider;
return $provider;
}

@mwinkensmwinkensOct 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I wonder if an else-case would be good in order to show that some providers were not able to be discovered or did not answer

@ArtificialOwlArtificialOwlOct 28, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

i think this is catched by the OCMProviderException from L142

@mwinkensmwinkensOct 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I am not talking about an exception here, the request might work without an exception, but just return status code 500 or 422 or 404 or does $client->get throw always an exception if the status code is not 200?

@ArtificialOwlArtificialOwlNov 5, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the import() will returns an exception if the data returned from the remote instance are not valid. We could/should add some management regarding the status code, but this is not the purpose of this PR.

@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 84ec354 to 44c2ee3CompareOctober 28, 2025 09:23
@ArtificialOwl

ArtificialOwl commented Oct 28, 2025

Copy link
Copy Markdown
Member

#56047

@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 44c2ee3 to 5739c1dCompareOctober 28, 2025 14:20
@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 5739c1d to 43d56a3CompareNovember 7, 2025 16:32
@nextcloudnextcloud deleted a comment from mickenordinNov 9, 2025
@ArtificialOwl

ArtificialOwl commented Nov 9, 2025

Copy link
Copy Markdown
Member

/backport to stable32

@mickenordin
mickenordinforce-pushed the fix/ocm-discovery-spec-compliant branch from 43d56a3 to ebfb421CompareNovember 9, 2025 20:20
@mickenordin@ArtificialOwl
fix(ocm): align discovery process with OCM spec
bd6aa27
Signed-off-by: Micke Nordin <kano@sunet.se>
@ArtificialOwl
ArtificialOwlforce-pushed the fix/ocm-discovery-spec-compliant branch from ebfb421 to bd6aa27CompareNovember 9, 2025 20:36
@ArtificialOwl

ArtificialOwl commented Nov 9, 2025

Copy link
Copy Markdown
Member

PR was lock by the malformed commit message.
squashed @mickenordin works and forced push.

@ArtificialOwl
ArtificialOwl merged commit 503fda6 into masterNov 10, 2025
219 of 226 checks passed
@ArtificialOwl
ArtificialOwl deleted the fix/ocm-discovery-spec-compliant branch November 10, 2025 09:54
@backportbotbackportbotBot mentioned this pull request Nov 10, 2025
Merged
@nextcloud-botnextcloud-bot mentioned this pull request Jan 6, 2026
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ArtificialOwlArtificialOwlArtificialOwl approved these changes
@mwinkensmwinkensmwinkens left review comments
@provokateurinprovokateurinprovokateurin approved these changes
@salmart-devsalmart-devAwaiting requested review from salmart-devsalmart-dev is a code owner automatically assigned from nextcloud/server-backend
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish32-feedbackfeature: federationfeedback-requested

Projects

None yet

Milestone

Nextcloud 33

Development

Successfully merging this pull request may close these issues.

6 participants

@mickenordin@nickvergessen@ArtificialOwl@provokateurin@mwinkens@blizzz