Skip to content

fix(auth): confine OCM access token to the masked share endpoint - #61870

Merged
provokateurin merged 1 commit into
masterfrom
kano-ocm-token-confinement
Jul 7, 2026
Merged

fix(auth): confine OCM access token to the masked share endpoint#61870
provokateurin merged 1 commit into
masterfrom
kano-ocm-token-confinement

Conversation

@mickenordin

Copy link
Copy Markdown
Contributor

Summary

We want to gate the temporary-token bearer behind an allowOcmAccessToken flag that only the public, share-masked webdav endpoints set, and drop the BearerAuth backend from the CalDAV/CardDAV entrypoints. The token is now honored only on /public.php/webdav, where per-share masking applies. Bearer auth is never used for contacts and calendar, anyway, so we remove it from there. If we want to move that to bearer auth in the future, we make adjustments that validates the token properly there at that time.

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@mickenordin mickenordin added this to the Nextcloud 35 milestone Jul 7, 2026
@mickenordin
mickenordin requested a review from a team as a code owner July 7, 2026 11:41
@mickenordin mickenordin added the bug label Jul 7, 2026
@mickenordin
mickenordin requested review from ArtificialOwl and leftybournes and removed request for a team July 7, 2026 11:41
@mickenordin mickenordin added the 3. to review Waiting for reviews label Jul 7, 2026
@mickenordin
mickenordin requested a review from provokateurin July 7, 2026 11:41
@mickenordin
mickenordin force-pushed the kano-ocm-token-confinement branch from 331ecd1 to b2342d7 Compare July 7, 2026 11:43
Gate the temporary-token bearer auth behind an allowOcmAccessToken flag
that only the public, share-masked webdav endpoints set, and drop the
BearerAuth backend from the CalDAV/CardDAV entrypoints. The token is now
honored only on /public.php/webdav, where per-share masking applies.

Assisted-by: ClaudeCode:claude-fable-5

Signed-off-by: Micke Nordin <kano@sunet.se>
@mickenordin
mickenordin force-pushed the kano-ocm-token-confinement branch from b2342d7 to db96073 Compare July 7, 2026 11:56
@provokateurin
provokateurin enabled auto-merge July 7, 2026 12:03
@provokateurin
provokateurin merged commit 2eaad34 into master Jul 7, 2026
204 of 213 checks passed
@provokateurin
provokateurin deleted the kano-ocm-token-confinement branch July 7, 2026 13:54
@github-actions

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.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants