Merge branch 'master' into master

Author: JanisPlayer

apps/dav/lib/Connector/PublicAuth.php

@@ -29,9 +29,9 @@
  */
 namespace OCA\DAV\Connector;
 
-use OC\Security\Bruteforce\Throttler;
 use OCP\IRequest;
 use OCP\ISession;
+use OCP\Security\Bruteforce\IThrottler;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
@@ -48,12 +48,12 @@ class PublicAuth extends AbstractBasic {
 	private IManager $shareManager;
 	private ISession $session;
 	private IRequest $request;
-	private Throttler $throttler;
+	private IThrottler $throttler;
 
 	public function __construct(IRequest $request,
 								IManager $shareManager,
 								ISession $session,
-								Throttler $throttler) {
+								IThrottler $throttler) {
 		$this->request = $request;
 		$this->shareManager = $shareManager;
 		$this->session = $session;

apps/dav/lib/Connector/Sabre/Auth.php

@@ -36,12 +36,12 @@
 use Exception;
 use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
 use OC\Authentication\TwoFactorAuth\Manager;
-use OC\Security\Bruteforce\Throttler;
 use OC\User\Session;
 use OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden;
 use OCA\DAV\Connector\Sabre\Exception\TooManyRequests;
 use OCP\IRequest;
 use OCP\ISession;
+use OCP\Security\Bruteforce\IThrottler;
 use OCP\Security\Bruteforce\MaxDelayReached;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Auth\Backend\AbstractBasic;
@@ -58,13 +58,13 @@ class Auth extends AbstractBasic {
 	private IRequest $request;
 	private ?string $currentUser = null;
 	private Manager $twoFactorManager;
-	private Throttler $throttler;
+	private IThrottler $throttler;
 
 	public function __construct(ISession $session,
 								Session $userSession,
 								IRequest $request,
 								Manager $twoFactorManager,
-								Throttler $throttler,
+								IThrottler $throttler,
 								string $principalPrefix = 'principals/users/') {
 		$this->session = $session;
 		$this->userSession = $userSession;

apps/dav/lib/Direct/DirectHome.php

@@ -26,13 +26,13 @@
  */
 namespace OCA\DAV\Direct;
 
-use OC\Security\Bruteforce\Throttler;
 use OCA\DAV\Db\DirectMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
+use OCP\Security\Bruteforce\IThrottler;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
@@ -49,18 +49,20 @@ class DirectHome implements ICollection {
 	/** @var ITimeFactory */
 	private $timeFactory;
 
-	/** @var Throttler */
+	/** @var IThrottler */
 	private $throttler;
 
 	/** @var IRequest */
 	private $request;
+
+	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
 	public function __construct(
 		IRootFolder $rootFolder,
 		DirectMapper $mapper,
 		ITimeFactory $timeFactory,
-		Throttler $throttler,
+		IThrottler $throttler,
 		IRequest $request,
 		IEventDispatcher $eventDispatcher
 	) {

apps/dav/lib/Direct/ServerFactory.php

@@ -27,7 +27,6 @@
  */
 namespace OCA\DAV\Direct;
 
-use OC\Security\Bruteforce\Throttler;
 use OCA\DAV\Connector\Sabre\MaintenancePlugin;
 use OCA\DAV\Db\DirectMapper;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -37,12 +36,14 @@
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\L10N\IFactory;
+use OCP\Security\Bruteforce\IThrottler;
 
 class ServerFactory {
 	/** @var IConfig */
 	private $config;
 	/** @var IL10N */
 	private $l10n;
+	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
 	public function __construct(IConfig $config, IFactory $l10nFactory, IEventDispatcher $eventDispatcher) {
@@ -56,7 +57,7 @@ public function createServer(string $baseURI,
 								 IRootFolder $rootFolder,
 								 DirectMapper $mapper,
 								 ITimeFactory $timeFactory,
-								 Throttler $throttler,
+								 IThrottler $throttler,
 								 IRequest $request): Server {
 		$home = new DirectHome($rootFolder, $mapper, $timeFactory, $throttler, $request, $this->eventDispatcher);
 		$server = new Server($home);

apps/dav/tests/unit/Connector/PublicAuthTest.php

@@ -26,9 +26,9 @@
  */
 namespace OCA\DAV\Tests\unit\Connector;
 
-use OC\Security\Bruteforce\Throttler;
 use OCP\IRequest;
 use OCP\ISession;
+use OCP\Security\Bruteforce\IThrottler;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
@@ -50,7 +50,7 @@ class PublicAuthTest extends \Test\TestCase {
 	private $shareManager;
 	/** @var \OCA\DAV\Connector\PublicAuth */
 	private $auth;
-	/** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IThrottler|\PHPUnit\Framework\MockObject\MockObject */
 	private $throttler;
 
 	/** @var string */
@@ -68,7 +68,7 @@ protected function setUp(): void {
 		$this->shareManager = $this->getMockBuilder(IManager::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$this->throttler = $this->getMockBuilder(Throttler::class)
+		$this->throttler = $this->getMockBuilder(IThrottler::class)
 			->disableOriginalConstructor()
 			->getMock();
 

apps/dav/tests/unit/Connector/Sabre/AuthTest.php

@@ -30,11 +30,11 @@
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OC\Authentication\TwoFactorAuth\Manager;
-use OC\Security\Bruteforce\Throttler;
 use OC\User\Session;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUser;
+use OCP\Security\Bruteforce\IThrottler;
 use Sabre\DAV\Server;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -57,7 +57,7 @@ class AuthTest extends TestCase {
 	private $request;
 	/** @var Manager */
 	private $twoFactorManager;
-	/** @var Throttler */
+	/** @var IThrottler */
 	private $throttler;
 
 	protected function setUp(): void {
@@ -71,7 +71,7 @@ protected function setUp(): void {
 		$this->twoFactorManager = $this->getMockBuilder(Manager::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$this->throttler = $this->getMockBuilder(Throttler::class)
+		$this->throttler = $this->getMockBuilder(IThrottler::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->auth = new \OCA\DAV\Connector\Sabre\Auth(

apps/dav/tests/unit/Direct/DirectHomeTest.php

@@ -27,7 +27,6 @@
  */
 namespace OCA\DAV\Tests\Unit\Direct;
 
-use OC\Security\Bruteforce\Throttler;
 use OCA\DAV\Db\Direct;
 use OCA\DAV\Db\DirectMapper;
 use OCA\DAV\Direct\DirectFile;
@@ -37,6 +36,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
+use OCP\Security\Bruteforce\IThrottler;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
@@ -53,7 +53,7 @@ class DirectHomeTest extends TestCase {
 	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
 	private $timeFactory;
 
-	/** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IThrottler|\PHPUnit\Framework\MockObject\MockObject */
 	private $throttler;
 
 	/** @var IRequest */
@@ -71,7 +71,7 @@ protected function setUp(): void {
 		$this->directMapper = $this->createMock(DirectMapper::class);
 		$this->rootFolder = $this->createMock(IRootFolder::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->throttler = $this->createMock(Throttler::class);
+		$this->throttler = $this->createMock(IThrottler::class);
 		$this->request = $this->createMock(IRequest::class);
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 

apps/files_sharing/lib/AppInfo/Application.php

@@ -65,12 +65,14 @@
 use OCP\Files\Events\BeforeZipCreatedEvent;
 use OCP\Files\IRootFolder;
 use OCP\Group\Events\GroupChangedEvent;
+use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Group\Events\UserAddedEvent;
 use OCP\IDBConnection;
 use OCP\IGroup;
 use OCP\IUserSession;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\User\Events\UserChangedEvent;
+use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\EventDispatcher\GenericEvent as OldGenericEvent;
@@ -104,7 +106,9 @@ function () use ($c) {
 
 		$context->registerNotifierService(Notifier::class);
 		$context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
+		$context->registerEventListener(UserDeletedEvent::class, DisplayNameCache::class);
 		$context->registerEventListener(GroupChangedEvent::class, GroupDisplayNameCache::class);
+		$context->registerEventListener(GroupDeletedEvent::class, GroupDisplayNameCache::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/files_sharing/lib/Cache.php

@@ -41,6 +41,7 @@
 use OCP\Files\StorageNotAvailableException;
 use OCP\ICacheFactory;
 use OCP\IUserManager;
+use OCP\Share\IShare;
 
 /**
  * Metadata cache for shared files
@@ -55,15 +56,22 @@ class Cache extends CacheJail {
 	private ?string $ownerDisplayName = null;
 	private $numericId;
 	private DisplayNameCache $displayNameCache;
+	private IShare $share;
 
 	/**
 	 * @param SharedStorage $storage
 	 */
-	public function __construct($storage, ICacheEntry $sourceRootInfo, DisplayNameCache $displayNameCache) {
+	public function __construct(
+		$storage,
+		ICacheEntry $sourceRootInfo,
+		DisplayNameCache $displayNameCache,
+		IShare $share
+	) {
 		$this->storage = $storage;
 		$this->sourceRootInfo = $sourceRootInfo;
 		$this->numericId = $sourceRootInfo->getStorageId();
 		$this->displayNameCache = $displayNameCache;
+		$this->share = $share;
 
 		parent::__construct(
 			null,
@@ -150,7 +158,7 @@ protected function formatCacheEntry($entry, $path = null) {
 
 		try {
 			if (isset($entry['permissions'])) {
-				$entry['permissions'] &= $this->storage->getShare()->getPermissions();
+				$entry['permissions'] &= $this->share->getPermissions();
 			} else {
 				$entry['permissions'] = $this->storage->getPermissions($entry['path']);
 			}
@@ -159,7 +167,7 @@ protected function formatCacheEntry($entry, $path = null) {
 			// (IDE may say the exception is never thrown – false negative)
 			$sharePermissions = 0;
 		}
-		$entry['uid_owner'] = $this->storage->getOwner('');
+		$entry['uid_owner'] = $this->share->getShareOwner();
 		$entry['displayname_owner'] = $this->getOwnerDisplayName();
 		if ($path === '') {
 			$entry['is_share_mount_point'] = true;
@@ -169,7 +177,7 @@ protected function formatCacheEntry($entry, $path = null) {
 
 	private function getOwnerDisplayName() {
 		if (!$this->ownerDisplayName) {
-			$uid = $this->storage->getOwner('');
+			$uid = $this->share->getShareOwner();
 			$this->ownerDisplayName = $this->displayNameCache->getDisplayName($uid) ?? $uid;
 		}
 		return $this->ownerDisplayName;

apps/files_sharing/lib/SharedStorage.php

@@ -413,7 +413,8 @@ public function getCache($path = '', $storage = null) {
 		$this->cache = new \OCA\Files_Sharing\Cache(
 			$storage,
 			$sourceRoot,
-			\OC::$server->get(DisplayNameCache::class)
+			\OC::$server->get(DisplayNameCache::class),
+			$this->getShare()
 		);
 		return $this->cache;
 	}