Skip to content

Adapt to OCM spec for remote shares #57153

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.

Sign up for GitHub

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

Closed
enriquepablo wants to merge 8 commits into from
Closed

Adapt to OCM spec for remote shares #57153

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c800b0e
Bearer auth aware Sabre client
enriquepablo Dec 17, 2025
85f7db3
Add token endpoint to exchange refresh tokens for access tokens
enriquepablo Dec 17, 2025
e13296a
Add Bearer auth backend for webdav requests
enriquepablo Dec 17, 2025
023906a
New method doTryTokenLogin to allow to try token login with token rat…
enriquepablo Dec 17, 2025
a031caf
Create permanent refresh token when creating a remote share
enriquepablo Dec 17, 2025
18982b4
When a remote requests a share with a token, it may be an access token
enriquepablo Dec 17, 2025
bcf7ea1
When requesting a remote share with bearer auth, get an access token …
enriquepablo Dec 17, 2025
dd1642c
Merge branch 'master' into master
enriquepablo Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions lib/private/Files/Storage/DAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,41 @@
use Sabre\HTTP\ClientException;
use Sabre\HTTP\ClientHttpException;
use Sabre\HTTP\RequestInterface;
Copy link
Author

@enriquepablo enriquepablo Dec 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Mistake breaking up the code into commits, the missing open-comment is added in a later commit:

bcf7ea1#diff-53ee4c908f9ae3a27e45d03c57ac5ed83c5916d7260561a03f279880671f6155R42

Sorry about this, I'll re-arrange a fixed pr asap.

* Class BearerAuthAwareSabreClient
*
* This is an extension of the Sabre HTTP Client
* to provide it with the ability to make bearer authn requests.
*
* @package OC\Files\Storage
*/
class BearerAuthAwareSabreClient extends Client
{
/**
* Bearer authentication.
*/
const AUTH_BEARER = 8;

/**
* Constructor.
*
* See Sabre\DAV\Client
*
*/
public function __construct(array $settings)
{
parent::__construct($settings);

if (isset($settings['userName']) && isset($settings['authType']) && ($settings['authType'] & self::AUTH_BEARER)) {
$userName = $settings['userName'];

$curlType = $this->curlSettings[CURLOPT_HTTPAUTH];
$curlType |= CURLAUTH_BEARER;

$this->addCurlSetting(CURLOPT_HTTPAUTH, $curlType);
$this->addCurlSetting(CURLOPT_XOAUTH2_BEARER, $userName);
}
}
}

/**
* Class DAV
Expand Down