upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

feat: add more encryption checks to info:file

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2025-05-09 16:34:58 +02:00
parent c7430d5cb8
commit d9c53ef748
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/Command/Info/File.php
View file

@ -8,6 +8,7 @@ declare(strict_types=1);
namespace OC\Core\Command\Info;
use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OCA\Files_External\Config\ExternalMountPoint;
use OCA\GroupFolders\Mount\GroupMountPoint;
@ -71,6 +72,15 @@ class File extends Command {
} else {
$output->writeln(' <error>encryption key not found</error> should be located at: ' . $keyPath);
}
$storage = $node->getStorage();
if ($storage->instanceOfStorage(Encryption::class)) {
/** @var Encryption $storage */
if (!$storage->hasValidHeader($node->getInternalPath())) {
$output->writeln(' <error>file doesn\'t have a valid encryption header</error>');
}
} else {
$output->writeln(' <error>file is marked as encrypted, but encryption doesn\'t seem to be setup</error>');
}
}
if ($node instanceof Folder && $node->isEncrypted() || $node instanceof OCPFile && $node->getParent()->isEncrypted()) {

12
lib/private/Files/Storage/Wrapper/Encryption.php
View file

@ -894,4 +894,16 @@ class Encryption extends Wrapper {
public function setEnabled(bool $enabled): void {
$this->enabled = $enabled;
}
/**
* Check if the on-disk data for a file has a valid encrypted header
*
* @param string $path
* @return bool
*/
public function hasValidHeader(string $path): bool {
$firstBlock = $this->readFirstBlock($path);
$header = $this->util->parseRawHeader($firstBlock);
return (count($header) > 0);
}
}