Skip to content

Nmc/master/3534 movecopy remove files and enrypted folders #282

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

Open
memurats wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Nmc/master/3534 movecopy remove files and enrypted folders #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db86cf8
fix: skip caching lastSeenQuotaUsage for remote shares
kesselb Mar 11, 2025
a601701
ci: Update 3rdparty actions
nickvergessen Mar 17, 2025
ac4d805
Merge pull request #51389 from nextcloud/bug/noid/skip-quote-cache-fo…
come-nc Mar 17, 2025
f80fdbf
Merge pull request #51520 from nextcloud/ci/noid/3rdparty
nickvergessen Mar 17, 2025
d7f885b
fix(files_sharing): skip expiration notify for invalid share record
luka-nextcloud Jan 29, 2025
f83d7bc
introduced filter in move/copy action to remove files and encrypted f…
memurats Mar 17, 2025
5170c73
Merge pull request #50542 from nextcloud/fix-sharing-expiration-notify
provokateurin Mar 17, 2025
3f603af
Merge branch 'nextcloud:master' into nmc/master/3534-movecopy-remove-…
memurats Mar 17, 2025
123f961
Update moveOrCopyAction.ts
memurats Mar 18, 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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 4 files
+21 −3 .github/workflows/block-merge-freeze.yml
+10 −5 .github/workflows/composer-auto.yml
+7 −2 .github/workflows/composer.yml
+3 −1 .github/workflows/lint-php.yml
2 changes: 2 additions & 0 deletions apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public function testGetQuotaInfoUnlimited(): void {
->willReturnMap([
['\OCA\Files_Sharing\SharedStorage', false],
['\OC\Files\Storage\Wrapper\Quota', false],
[\OCA\Files_Sharing\External\Storage::class, false],
]);

$storage->expects($this->once())
Expand Down Expand Up @@ -341,6 +342,7 @@ public function testGetQuotaInfoSpecific(): void {
->willReturnMap([
['\OCA\Files_Sharing\SharedStorage', false],
['\OC\Files\Storage\Wrapper\Quota', true],
[\OCA\Files_Sharing\External\Storage::class, false],
]);

$storage->expects($this->once())
Expand Down
1 change: 1 addition & 0 deletions apps/files/src/actions/moveOrCopyAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ async function openFilePickerForAction(
// We don't want to show the current nodes in the file picker
return !fileIDs.includes(n.fileid)
})
.setFilter((n: Node) => (n.permissions & Permission.CREATE) === Permission.CREATE)
.setMimeTypeFilter([])
.setMultiSelect(false)
.startAt(dir)
Expand Down
5 changes: 4 additions & 1 deletion apps/files_sharing/lib/Command/ExiprationNotification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/
namespace OCA\Files_Sharing\Command;

use OCA\Files_Sharing\OrphanHelper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IDBConnection;
use OCP\Notification\IManager as NotificationManager;
Expand All @@ -23,6 +24,7 @@ public function __construct(
private NotificationManager $notificationManager,
private IDBConnection $connection,
private ShareManager $shareManager,
private OrphanHelper $orphanHelper,
) {
parent::__construct();
}
Expand Down Expand Up @@ -50,7 +52,8 @@ public function execute(InputInterface $input, OutputInterface $output): int {
foreach ($shares as $share) {
if ($share->getExpirationDate() === null
|| $share->getExpirationDate()->getTimestamp() < $minTime->getTimestamp()
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()) {
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()
|| !$this->orphanHelper->isShareValid($share->getSharedBy(), $share->getNodeId())) {
continue;
}

Expand Down
11 changes: 9 additions & 2 deletions lib/private/legacy/OC_Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,16 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
$relative = 0;
}

/*
* \OCA\Files_Sharing\External\Storage returns the cloud ID as the owner for the storage.
* It is unnecessary to query the user manager for the display name, as it won't have this information.
*/
$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);

$ownerId = $storage->getOwner($path);
$ownerDisplayName = '';
if ($ownerId !== false) {

if ($isRemoteShare === false && $ownerId !== false) {
$ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
}

Expand All @@ -565,7 +572,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
'mountPoint' => trim($mountPoint, '/'),
];

if ($ownerId && $path === '/') {
if ($isRemoteShare === false && $ownerId !== false && $path === '/') {
// If path is root, store this as last known quota usage for this user
\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string)$relative);
}
Expand Down