diff options
-rw-r--r-- | apps/sharebymail/lib/Capabilities.php | 9 | ||||
-rw-r--r-- | apps/sharebymail/tests/CapabilitiesTest.php | 10 | ||||
-rw-r--r-- | lib/private/Files/Cache/Cache.php | 16 | ||||
-rw-r--r-- | lib/private/Files/Cache/CacheQueryBuilder.php | 4 | ||||
-rw-r--r-- | lib/private/Share20/Manager.php | 2 | ||||
-rw-r--r-- | resources/codesigning/root.crl | 63 |
6 files changed, 64 insertions, 40 deletions
diff --git a/apps/sharebymail/lib/Capabilities.php b/apps/sharebymail/lib/Capabilities.php index eda8df9db5e..39d7172bb76 100644 --- a/apps/sharebymail/lib/Capabilities.php +++ b/apps/sharebymail/lib/Capabilities.php @@ -27,6 +27,7 @@ declare(strict_types=1); */ namespace OCA\ShareByMail; +use OCA\ShareByMail\Settings\SettingsManager; use OCP\Capabilities\ICapability; use OCP\Share\IManager; @@ -35,8 +36,13 @@ class Capabilities implements ICapability { /** @var IManager */ private $manager; - public function __construct(IManager $manager) { + /** @var SettingsManager */ + private $settingsManager; + + public function __construct(IManager $manager, + SettingsManager $settingsManager) { $this->manager = $manager; + $this->settingsManager = $settingsManager; } public function getCapabilities(): array { @@ -46,6 +52,7 @@ class Capabilities implements ICapability { 'sharebymail' => [ 'enabled' => $this->manager->shareApiAllowLinks(), + 'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(), 'upload_files_drop' => [ 'enabled' => true, ], diff --git a/apps/sharebymail/tests/CapabilitiesTest.php b/apps/sharebymail/tests/CapabilitiesTest.php index 35b6bb6a919..19e91ab51e4 100644 --- a/apps/sharebymail/tests/CapabilitiesTest.php +++ b/apps/sharebymail/tests/CapabilitiesTest.php @@ -26,6 +26,7 @@ namespace OCA\ShareByMail\Tests; use OCA\ShareByMail\Capabilities; +use OCA\ShareByMail\Settings\SettingsManager; use OCP\Share\IManager; use Test\TestCase; @@ -36,12 +37,16 @@ class CapabilitiesTest extends TestCase { /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ private $manager; + /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ + private $settingsManager; + protected function setUp(): void { parent::setUp(); $this->manager = $this::createMock(IManager::class); - $this->capabilities = new Capabilities($this->manager); + $this->settingsManager = $this::createMock(SettingsManager::class); + $this->capabilities = new Capabilities($this->manager, $this->settingsManager); } public function testGetCapabilities() { @@ -51,6 +56,8 @@ class CapabilitiesTest extends TestCase { ->willReturn(false); $this->manager->method('shareApiLinkDefaultExpireDateEnforced') ->willReturn(false); + $this->settingsManager->method('sendPasswordByMail') + ->willReturn(true); $capabilities = [ 'files_sharing' => @@ -58,6 +65,7 @@ class CapabilitiesTest extends TestCase { 'sharebymail' => [ 'enabled' => true, + 'send_password_by_mail' => true, 'upload_files_drop' => [ 'enabled' => true, ], diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 1c30a5953c6..5420fb73d7f 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -589,8 +589,12 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->delete('filecache_extended') - ->where($query->expr()->in('fileid', $query->createNamedParameter($childIds, IQueryBuilder::PARAM_INT_ARRAY))); - $query->execute(); + ->where($query->expr()->in('fileid', $query->createParameter('childIds'))); + + foreach (array_chunk($childIds, 1000) as $childIdChunk) { + $query->setParameter('childIds', $childIdChunk, IQueryBuilder::PARAM_INT_ARRAY); + $query->execute(); + } /** @var ICacheEntry[] $childFolders */ $childFolders = array_filter($children, function ($child) { @@ -604,8 +608,12 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->delete('filecache') - ->whereParentIn($parentIds); - $query->execute(); + ->whereParentInParameter('parentIds'); + + foreach (array_chunk($parentIds, 1000) as $parentIdChunk) { + $query->setParameter('parentIds', $parentIdChunk, IQueryBuilder::PARAM_INT_ARRAY); + $query->execute(); + } } /** diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php index 774691ebc31..87a1f940f20 100644 --- a/lib/private/Files/Cache/CacheQueryBuilder.php +++ b/lib/private/Files/Cache/CacheQueryBuilder.php @@ -91,7 +91,7 @@ class CacheQueryBuilder extends QueryBuilder { return $this; } - public function whereParentIn(array $parents) { + public function whereParentInParameter(string $parameter) { $alias = $this->alias; if ($alias) { $alias .= '.'; @@ -99,7 +99,7 @@ class CacheQueryBuilder extends QueryBuilder { $alias = ''; } - $this->andWhere($this->expr()->in("{$alias}parent", $this->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY))); + $this->andWhere($this->expr()->in("{$alias}parent", $this->createParameter($parameter))); return $this; } diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index b5e1b944bc5..84d23e1b087 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1658,7 +1658,7 @@ class Manager implements IManager { if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) { $nodes = $userFolder->getById($path->getId()); $path = array_shift($nodes); - if ($path->getOwner() === null) { + if ($path === null || $path->getOwner() === null) { return []; } $owner = $path->getOwner()->getUID(); diff --git a/resources/codesigning/root.crl b/resources/codesigning/root.crl index 0f938e89499..d825b73e7ef 100644 --- a/resources/codesigning/root.crl +++ b/resources/codesigning/root.crl @@ -1,38 +1,39 @@ -----BEGIN X509 CRL----- -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 -/dakdyqbPJfp1EYXk3HnE/up5ZyonD5I2JynyA== +ECMXDTE5MTIxMjA5MzUzMVowEwICECYXDTIxMTAyNzIxMzExNVowEwICECgXDTIw +MDgyNDEwMjgzN1owEwICEE0XDTE4MTIyMTE1MzIxOFowEwICEE4XDTIwMDEwNzEz +NTc0NlowEwICEGoXDTE5MDIxMjA5MDgxNFowEwICEG4XDTE5MTEyMDE5NDYyOFow +EwICEG8XDTE4MDQxNzA5MzkzNlowEwICEHQXDTE3MTEyMzE2NTQ1OVowEwICEHUX +DTE5MTIxMjA5MzkwNVowEwICEHYXDTE5MTIxMjA5MzkxMlowEwICEJAXDTE4MDIw +OTA4Mzg1OFowEwICEJkXDTIxMTAxNTA4MzkxNFowEwICEKcXDTE4MDgxMzA3NTIw +OFowEwICEK8XDTE4MDgxMzA4MjYyMFowEwICELIXDTIxMDkxNjIyMDAwNVowEwIC +ELUXDTE4MTAwOTA5NTMxMVowEwICELcXDTE4MTIyMTE1MzAyN1owEwICEMIXDTE4 +MTAxNzE5MjAyNFowEwICEMMXDTE4MTAxNzE5MjUzM1owEwICEMQXDTIxMDcxNTE4 +NDA0NlowEwICEMwXDTIxMDExODEyNDUxM1owEwICENcXDTE5MDIxNDEwMzMwNlow +EwICENwXDTIwMDkxNjEwNDQwNFowEwICEOAXDTE5MDUyMDA5MzAxMFowEwICEPgX +DTIwMDQyODA2MjIzNlowEwICEPkXDTIwMDQyODA2MjI0NVowEwICEPoXDTIwMDQy +ODA2MDQzMFowEwICEPsXDTIwMDQyODA2MDUzMFowEwICEPwXDTIwMDQyODA2MDU0 +MFowEwICEP0XDTE5MTIxMjA5MzUzNlowEwICEP4XDTIwMDQyODA2MDYwNVowEwIC +EP8XDTIwMDQyODA2MDYxM1owEwICEQAXDTIwMDQyODA2MDYyMlowEwICEQEXDTIw +MDQyNzExMjI1NFowEwICEQIXDTIwMDQyODA2MDY0MFowEwICEQMXDTIwMDQyODA2 +MDY0N1owEwICEQQXDTIwMDQyODA2MDY1NFowEwICEQUXDTIwMDQyODA2MDcwMVow +EwICEQYXDTIwMDQyODA2MDcwNlowEwICEQcXDTIwMDQyODA2MDcxM1owEwICES0X +DTIxMDEwNjEyMjEzMVowEwICEUcXDTIxMDIxNTE5MTQwMVowEwICEUgXDTIxMDIx +NTE5MTQxM1owEwICEUkXDTIxMDIxNTE5MTUyNFowEwICEUoXDTIxMDIxNTE5MTQ0 +OFowEwICEUsXDTIxMDIxNTE5MTM0NlowEwICEUwXDTIxMDIxNTE5MTUwOVowEwIC +EU0XDTIxMDIxNTE5MTUxNlowEwICEVIXDTIxMDIxNTE5MTQ1OFowEwICEVMXDTIx +MDIxNTE5MTQzOFowEwICEVQXDTIxMDIxNTE5MTQyMlowEwICEaMXDTIxMTAyNzIx +NTExNFqgMDAuMB8GA1UdIwQYMBaAFG3qbqqpNyw8iS0XPv1G7sOeeO10MAsGA1Ud +FAQEAgIQHTANBgkqhkiG9w0BAQsFAAOCAQEAVHlUJ+g9573rnFUA5MtAZSudYlH3 +nyyI7F1AarUrI0jiqb8lkjCHMcuToA31uNVa+iOl3ZuAQ//To9YZ/Br8dYwSde/H +yDlqEB5Ku/iB9ApCzMjNyayj7fu51pQcNzcgikQ+72Y2YYwmVh3DEeKSsI3axG4P +Ke4bhGkffg/Mlu10VsQHfLxPknqmobGl4jRK4dC0IpWqnSp3U15ZQfFqlG5hFvcK +X/xW149jHbfD1vhKLrTdd25NaqEfMyq4mhnJ3J3ol14RpvYe/j54OrEySPrc5vOP +UWFSXPLyJWFJ72RIo7t5qmezH1pcl0wvgSvsdfIuCfk1eXwJwx1gBQnOWQ== -----END X509 CRL----- |