-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Public dav endpoint v2 #32400
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
Merged
Merged
Public dav endpoint v2 #32400
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
7b6a650
feat: public dav endpoint v2
skjnldsv 82b5a19
fix: public dav and files_sharing testing fixes
skjnldsv 18399fc
fix: improve typing and use \OCP\Server::get
skjnldsv 9e4c9b9
fix(psalm): update baseline and suppress unnecessary issues
skjnldsv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016, ownCloud, Inc. | ||
| * | ||
| * @author Bjoern Schiessle <[email protected]> | ||
| * @author Björn Schießle <[email protected]> | ||
| * @author Christoph Wurst <[email protected]> | ||
| * @author Joas Schilling <[email protected]> | ||
| * @author Julius Härtl <[email protected]> | ||
| * @author Lukas Reschke <[email protected]> | ||
| * @author Morris Jobke <[email protected]> | ||
| * @author Robin Appelman <[email protected]> | ||
| * @author Roeland Jago Douma <[email protected]> | ||
| * @author Thomas Müller <[email protected]> | ||
| * @author Vincent Petry <[email protected]> | ||
| * | ||
| * @license AGPL-3.0 | ||
| * | ||
| * This code is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License, version 3, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License, version 3, | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| * | ||
| */ | ||
|
|
||
| use OC\Files\Filesystem; | ||
| use OC\Files\Storage\Wrapper\PermissionsMask; | ||
| use OC\Files\View; | ||
| use OCA\DAV\Storage\PublicOwnerWrapper; | ||
| use OCA\FederatedFileSharing\FederatedShareProvider; | ||
| use OCP\EventDispatcher\IEventDispatcher; | ||
| use OCP\Files\Mount\IMountManager; | ||
| use OCP\IConfig; | ||
| use OCP\IDBConnection; | ||
| use OCP\IPreview; | ||
| use OCP\IRequest; | ||
| use OCP\ISession; | ||
| use OCP\ITagManager; | ||
| use OCP\IUserSession; | ||
| use OCP\L10N\IFactory; | ||
| use OCP\Security\Bruteforce\IThrottler; | ||
| use OCP\Share\IManager; | ||
| use Psr\Log\LoggerInterface; | ||
| use Sabre\DAV\Exception\NotAuthenticated; | ||
| use Sabre\DAV\Exception\NotFound; | ||
|
|
||
| // load needed apps | ||
| $RUNTIME_APPTYPES = ['filesystem', 'authentication', 'logging']; | ||
| OC_App::loadApps($RUNTIME_APPTYPES); | ||
| OC_Util::obEnd(); | ||
|
|
||
| $session = \OCP\Server::get(ISession::class); | ||
| $request = \OCP\Server::get(IRequest::class); | ||
|
|
||
| $session->close(); | ||
| $requestUri = $request->getRequestUri(); | ||
|
|
||
| // Backends | ||
| $authBackend = new OCA\DAV\Connector\Sabre\PublicAuth( | ||
skjnldsv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $request, | ||
| \OCP\Server::get(IManager::class), | ||
| $session, | ||
| \OCP\Server::get(IThrottler::class), | ||
| \OCP\Server::get(LoggerInterface::class) | ||
| ); | ||
| $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend); | ||
|
|
||
| $l10nFactory = \OCP\Server::get(IFactory::class); | ||
| $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( | ||
skjnldsv marked this conversation as resolved.
Show resolved
Hide resolved
skjnldsv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| \OCP\Server::get(IConfig::class), | ||
| \OCP\Server::get(LoggerInterface::class), | ||
| \OCP\Server::get(IDBConnection::class), | ||
| \OCP\Server::get(IUserSession::class), | ||
| \OCP\Server::get(IMountManager::class), | ||
| \OCP\Server::get(ITagManager::class), | ||
| $request, | ||
| \OCP\Server::get(IPreview::class), | ||
| \OCP\Server::get(IEventDispatcher::class), | ||
| $l10nFactory->get('dav'), | ||
| ); | ||
|
|
||
|
|
||
| $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin(); | ||
| $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin(); | ||
|
|
||
| // Define root url with /public.php/dav/files/TOKEN | ||
| /** @var string $baseuri defined in public.php */ | ||
| preg_match('/(^files\/\w+)/i', substr($requestUri, strlen($baseuri)), $match); | ||
| $baseuri = $baseuri . $match[0]; | ||
|
|
||
| $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) { | ||
| $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest'); | ||
| $federatedShareProvider = \OCP\Server::get(FederatedShareProvider::class); | ||
| if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) { | ||
| // this is what is thrown when trying to access a non-existing share | ||
| throw new NotAuthenticated(); | ||
| } | ||
|
|
||
| $share = $authBackend->getShare(); | ||
| $owner = $share->getShareOwner(); | ||
| $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ; | ||
| $fileId = $share->getNodeId(); | ||
|
|
||
| // FIXME: should not add storage wrappers outside of preSetup, need to find a better way | ||
| /** @psalm-suppress InternalMethod */ | ||
| $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false); | ||
|
||
|
|
||
| /** @psalm-suppress MissingClosureParamType */ | ||
| Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) { | ||
|
||
| return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]); | ||
| }); | ||
|
|
||
| /** @psalm-suppress MissingClosureParamType */ | ||
| Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) { | ||
|
||
| return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]); | ||
| }); | ||
|
|
||
| /** @psalm-suppress InternalMethod */ | ||
| Filesystem::logWarningWhenAddingStorageWrapper($previousLog); | ||
|
||
|
|
||
| OC_Util::tearDownFS(); | ||
| OC_Util::setupFS($owner); | ||
| $ownerView = new View('/'. $owner . '/files'); | ||
| $path = $ownerView->getPath($fileId); | ||
| $fileInfo = $ownerView->getFileInfo($path); | ||
|
|
||
| if ($fileInfo === false) { | ||
| throw new NotFound(); | ||
| } | ||
|
|
||
| $linkCheckPlugin->setFileInfo($fileInfo); | ||
|
||
|
|
||
| // If not readble (files_drop) enable the filesdrop plugin | ||
| if (!$isReadable) { | ||
| $filesDropPlugin->enable(); | ||
| } | ||
|
|
||
| $view = new View($ownerView->getAbsolutePath($path)); | ||
| $filesDropPlugin->setView($view); | ||
|
|
||
| return $view; | ||
| }); | ||
|
|
||
| $server->addPlugin($linkCheckPlugin); | ||
| $server->addPlugin($filesDropPlugin); | ||
|
|
||
| // And off we go! | ||
| $server->exec(); | ||
Check noticeCode scanning / Psalm DeprecatedMethod
The method Sabre\DAV\Server::exec has been marked as deprecated
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a question to help me understand, the file still exists and
public.php/webdavalso still prints:But where is it registered now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, hardcoded in
public.phpnowThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similarly as how
remote.phpis doing it :)I tried to get them closer together now