sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(encryption): Ignore shared files in encrypt-all command 

Copying and renaming a share will not encrypt it anyway. It will get
 encrypted when the owner’s files get encrypted.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/54263/head
Côme Chilliet 2025-08-04 10:42:04 +07:00
parent 17e97e6f85
commit c022a1a1b1
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/encryption/lib/Crypto/EncryptAll.php
Unescape Escape View File

@ -12,6 +12,7 @@ use OC\Files\View;
use OCA\Encryption\KeyManager; use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup; use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util; use OCA\Encryption\Util;
use OCP\Files\FileInfo;
use OCP\IConfig; use OCP\IConfig;
use OCP\IL10N; use OCP\IL10N;
use OCP\IUser; use OCP\IUser;
@ -247,14 +248,18 @@ class EncryptAll {
$content = $this->rootView->getDirectoryContent($root); $content = $this->rootView->getDirectoryContent($root);
foreach ($content as $file) { foreach ($content as $file) {
$path = $root . '/' . $file['name']; $path = $root . '/' . $file['name'];
if ($this->rootView->is_dir($path)) { if ($file->isShared()) {
$progress->setMessage("Skip shared file/folder $path");
$progress->advance();
continue;
} elseif ($file->getType() === FileInfo::TYPE_FOLDER) {
$directories[] = $path; $directories[] = $path;
continue; continue;
} else { } else {
$progress->setMessage("encrypt files for user $userCount: $path"); $progress->setMessage("encrypt files for user $userCount: $path");
$progress->advance(); $progress->advance();
try { try {
if ($this->encryptFile($path) === false) { if ($this->encryptFile($file, $path) === false) {
$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)"); $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
$progress->advance(); $progress->advance();
} }
@ -275,17 +280,9 @@ class EncryptAll {
} }
} }
/** protected function encryptFile(FileInfo $fileInfo, string $path): bool {
* encrypt file
*
* @param string $path
* @return bool
*/
protected function encryptFile($path) {
// skip already encrypted files // skip already encrypted files
$fileInfo = $this->rootView->getFileInfo($path); if ($fileInfo->isEncrypted()) {
if ($fileInfo !== false && $fileInfo->isEncrypted()) {
return true; return true;
} }