Skip to content
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

[stable31] fix: prevent generate a path without existing folder #4565

Merged
merged 2 commits into from
Jan 29, 2025
Merged

[stable31] fix: prevent generate a path without existing folder #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afac1f
fix: prevent generate a path without existing folder
vitormattos Jan 29, 2025
28321b5
fix: prevent error when run at integration tests
vitormattos Jan 29, 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
160 changes: 78 additions & 82 deletions lib/Service/Install/InstallService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,13 @@ private function getFolder(string $path = '', ?ISimpleFolder $folder = null, $ne
throw new LibresignException(
$e->getMessage() . '. ' .
'Permission problems. ' .
'Maybe this could fix: chown -R ' . $user['name'] . ' ' . $this->getDataDir()
'Maybe this could fix: chown -R ' . $user['name'] . ' ' . $this->getInternalPathOfFolder($folder)
);
}
}
return $folder;
}

private function getEmptyFolder(string $path): ISimpleFolder {
return $this->getFolder($path, null, true);
}

/**
* @todo check a best solution to don't use reflection
*/
Expand All @@ -137,7 +133,7 @@ private function getInternalPathOfFolder(ISimpleFolder $node): string {
$reflectionProperty->setAccessible(true);
$folder = $reflectionProperty->getValue($node);
$path = $folder->getInternalPath();
return $path;
return $this->getDataDir() . '/' . $path;
}

/**
Expand All @@ -156,19 +152,14 @@ private function getInternalPathOfFile(ISimpleFile $node): string {
$file = $reflectionProperty->getValue($node);
$path = $file->getPath();
}
return $path;
return $this->getDataDir() . '/' . $path;
}

private function getDataDir(): string {
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
return $dataDir;
}

private function getFullPath(): string {
$folder = $this->getFolder();
return $this->getDataDir() . '/' . $this->getInternalPathOfFolder($folder);
}

private function runAsync(): void {
$resource = $this->resource;
$process = new Process([OC::$SERVERROOT . '/occ', 'libresign:install', '--' . $resource]);
Expand Down Expand Up @@ -380,12 +371,16 @@ public function installJava(?bool $async = false): void {
if (PHP_OS_FAMILY !== 'Linux') {
throw new RuntimeException(sprintf('OS_FAMILY %s is incompatible with LibreSign.', PHP_OS_FAMILY));
}
$linuxDistribution = $this->getLinuxDistributionToDownloadJava();
$extractDir = $this->getFullPath() . '/' . $linuxDistribution . '/' . $this->resource;

$downloadOk = $this->isDownloadedFilesOk();
if (!$downloadOk) {
$folder = $this->getEmptyFolder($this->resource);
if ($this->isDownloadedFilesOk()) {
// The binaries files could exists but not saved at database
if (!$this->appConfig->getValueString(Application::APP_ID, 'java_path')) {
$linuxDistribution = $this->getLinuxDistributionToDownloadJava();
$folder = $this->getFolder('/' . $linuxDistribution . '/' . $this->resource);
$extractDir = $this->getInternalPathOfFolder($folder);
$this->appConfig->setValueString(Application::APP_ID, 'java_path', $extractDir . '/jdk-' . self::JAVA_URL_PATH_NAME . '-jre/bin/java');
}
} else {
/**
* Steps to update:
* Check the compatible version of Java to use JSignPdf
Expand All @@ -394,6 +389,7 @@ public function installJava(?bool $async = false): void {
* URL used to get the MD5 and URL to download:
* https://jdk.java.net/java-se-ri/8-MR3
*/
$linuxDistribution = $this->getLinuxDistributionToDownloadJava();
$slugfyVersionNumber = str_replace('+', '_', self::JAVA_URL_PATH_NAME);
if ($this->architecture === 'x86_64') {
$compressedFileName = 'OpenJDK21U-jre_x64_' . $linuxDistribution . '_hotspot_' . $slugfyVersionNumber . '.tar.gz';
Expand All @@ -402,26 +398,24 @@ public function installJava(?bool $async = false): void {
$compressedFileName = 'OpenJDK21U-jre_aarch64_' . $linuxDistribution . '_hotspot_' . $slugfyVersionNumber . '.tar.gz';
$url = 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-' . self::JAVA_URL_PATH_NAME . '/' . $compressedFileName;
}
$checksumUrl = $url . '.sha256.txt';
$hash = $this->getHash($compressedFileName, $checksumUrl);
$folder = $this->getFolder('/' . $linuxDistribution . '/' . $this->resource);
try {
$compressedFile = $folder->getFile($compressedFileName);
} catch (NotFoundException $th) {
$compressedFile = $folder->newFile($compressedFileName);
}
$comporessedInternalFileName = $this->getDataDir() . '/' . $this->getInternalPathOfFile($compressedFile);

$comporessedInternalFileName = $this->getInternalPathOfFile($compressedFile);
$dependencyName = 'java ' . $this->architecture . ' ' . $linuxDistribution;
$checksumUrl = $url . '.sha256.txt';
$hash = $this->getHash($compressedFileName, $checksumUrl);
$this->download($url, $dependencyName, $comporessedInternalFileName, $hash, 'sha256');

$extractor = new TAR($comporessedInternalFileName);
$extractDir = $this->getInternalPathOfFolder($folder);
$extractor->extract($extractDir);
unlink($comporessedInternalFileName);
$downloadOk = true;
}

$this->appConfig->setValueString(Application::APP_ID, 'java_path', $extractDir . '/jdk-' . self::JAVA_URL_PATH_NAME . '-jre/bin/java');
if ($downloadOk) {
$this->appConfig->setValueString(Application::APP_ID, 'java_path', $extractDir . '/jdk-' . self::JAVA_URL_PATH_NAME . '-jre/bin/java');
$this->writeAppSignature();
}
$this->removeDownloadProgress();
Expand Down Expand Up @@ -471,35 +465,39 @@ public function installJSignPdf(?bool $async = false): void {
$this->runAsync();
return;
}
$extractDir = $this->getFullPath() . '/' . $this->resource;

$downloadOk = $this->isDownloadedFilesOk();
if (!$downloadOk) {
$folder = $this->getEmptyFolder($this->resource);
if ($this->isDownloadedFilesOk()) {
// The binaries files could exists but not saved at database
if (!$this->appConfig->getValueString(Application::APP_ID, 'jsignpdf_jar_path')) {
$folder = $this->getFolder($this->resource);
$extractDir = $this->getInternalPathOfFolder($folder);
$fullPath = $extractDir . '/jsignpdf-' . JSignPdfHandler::VERSION . '/JSignPdf.jar';
$this->appConfig->setValueString(Application::APP_ID, 'jsignpdf_jar_path', $fullPath);
}
} else {
$folder = $this->getFolder($this->resource);
$compressedFileName = 'jsignpdf-' . JSignPdfHandler::VERSION . '.zip';
try {
$compressedFile = $folder->getFile($compressedFileName);
} catch (\Throwable $th) {
$compressedFile = $folder->newFile($compressedFileName);
}
$comporessedInternalFileName = $this->getDataDir() . '/' . $this->getInternalPathOfFile($compressedFile);
$comporessedInternalFileName = $this->getInternalPathOfFile($compressedFile);
$url = 'https://github.com/intoolswetrust/jsignpdf/releases/download/JSignPdf_' . str_replace('.', '_', JSignPdfHandler::VERSION) . '/jsignpdf-' . JSignPdfHandler::VERSION . '.zip';
/** WHEN UPDATE version: generate this hash handmade and update here */
$hash = 'd239658ea50a39eb35169d8392feaffb';

$this->download($url, 'JSignPdf', $comporessedInternalFileName, $hash);

$extractDir = $this->getInternalPathOfFolder($folder);
$zip = new ZIP($extractDir . '/' . $compressedFileName);
$zip->extract($extractDir);
unlink($extractDir . '/' . $compressedFileName);
$downloadOk = true;
}

$fullPath = $extractDir . '/jsignpdf-' . JSignPdfHandler::VERSION . '/JSignPdf.jar';
$this->appConfig->setValueString(Application::APP_ID, 'jsignpdf_jar_path', $fullPath);
if ($downloadOk) {
$fullPath = $extractDir . '/jsignpdf-' . JSignPdfHandler::VERSION . '/JSignPdf.jar';
$this->appConfig->setValueString(Application::APP_ID, 'jsignpdf_jar_path', $fullPath);
$this->writeAppSignature();
}

$this->removeDownloadProgress();
}

Expand All @@ -524,29 +522,28 @@ public function installPdftk(?bool $async = false): void {
return;
}

$downloadOk = $this->isDownloadedFilesOk();
if ($downloadOk) {
$folder = $this->getFolder($this->resource);
$file = $folder->getFile('pdftk.jar');
$fullPath = $this->getDataDir() . '/' . $this->getInternalPathOfFile($file);
if ($this->isDownloadedFilesOk()) {
// The binaries files could exists but not saved at database
if (!$this->appConfig->getValueString(Application::APP_ID, 'pdftk_path')) {
$folder = $this->getFolder($this->resource);
$file = $folder->getFile('pdftk.jar');
$fullPath = $this->getInternalPathOfFile($file);
$this->appConfig->setValueString(Application::APP_ID, 'pdftk_path', $fullPath);
}
} else {
$folder = $this->getEmptyFolder($this->resource);
$folder = $this->getFolder($this->resource);
try {
$file = $folder->getFile('pdftk.jar');
} catch (\Throwable $th) {
$file = $folder->newFile('pdftk.jar');
}
$fullPath = $this->getDataDir() . '/' . $this->getInternalPathOfFile($file);
$fullPath = $this->getInternalPathOfFile($file);
$url = 'https://gitlab.com/api/v4/projects/5024297/packages/generic/pdftk-java/v' . self::PDFTK_VERSION . '/pdftk-all.jar';
/** WHEN UPDATE version: generate this hash handmade and update here */
/** @todo WHEN UPDATE version: generate this hash handmade and update here */
$hash = '59a28bed53b428595d165d52988bf4cf';

$this->download($url, 'pdftk', $fullPath, $hash);
$downloadOk = true;
}

$this->appConfig->setValueString(Application::APP_ID, 'pdftk_path', $fullPath);
if ($downloadOk) {
$this->appConfig->setValueString(Application::APP_ID, 'pdftk_path', $fullPath);
$this->writeAppSignature();
}
$this->removeDownloadProgress();
Expand Down Expand Up @@ -586,43 +583,42 @@ public function installCfssl(?bool $async = false): void {
}

private function installCfsslByArchitecture(string $architecture): void {
$downloadOk = $this->isDownloadedFilesOk();
if ($downloadOk) {
$folder = $this->getFolder($this->resource);
} else {
$folder = $this->getEmptyFolder($this->resource);
$downloads = [
[
'file' => 'cfssl_' . self::CFSSL_VERSION . '_linux_' . $architecture,
'destination' => 'cfssl',
],
[
'file' => 'cfssljson_' . self::CFSSL_VERSION . '_linux_' . $architecture,
'destination' => 'cfssljson',
],
];
$baseUrl = 'https://github.com/cloudflare/cfssl/releases/download/v' . self::CFSSL_VERSION . '/';
$checksumUrl = 'https://github.com/cloudflare/cfssl/releases/download/v' . self::CFSSL_VERSION . '/cfssl_' . self::CFSSL_VERSION . '_checksums.txt';
foreach ($downloads as $download) {
$hash = $this->getHash($download['file'], $checksumUrl);

$file = $folder->newFile($download['destination']);
$fullPath = $this->getDataDir() . '/' . $this->getInternalPathOfFile($file);

$dependencyName = $download['destination'] . ' ' . $architecture;
$this->download($baseUrl . $download['file'], $dependencyName, $fullPath, $hash, 'sha256');

chmod($fullPath, 0700);
if ($this->isDownloadedFilesOk()) {
// The binaries files could exists but not saved at database
if (!$this->isCfsslBinInstalled()) {
$folder = $this->getFolder($this->resource);
$cfsslBinPath = $this->getInternalPathOfFolder($folder) . '/cfssl';
$this->appConfig->setValueString(Application::APP_ID, 'cfssl_bin', $cfsslBinPath);
}
$downloadOk = true;
return;
}
$folder = $this->getFolder($this->resource);
$downloads = [
[
'file' => 'cfssl_' . self::CFSSL_VERSION . '_linux_' . $architecture,
'destination' => 'cfssl',
],
[
'file' => 'cfssljson_' . self::CFSSL_VERSION . '_linux_' . $architecture,
'destination' => 'cfssljson',
],
];
$baseUrl = 'https://github.com/cloudflare/cfssl/releases/download/v' . self::CFSSL_VERSION . '/';
$checksumUrl = 'https://github.com/cloudflare/cfssl/releases/download/v' . self::CFSSL_VERSION . '/cfssl_' . self::CFSSL_VERSION . '_checksums.txt';
foreach ($downloads as $download) {
$hash = $this->getHash($download['file'], $checksumUrl);

$cfsslBinPath = $this->getDataDir() . '/' .
$this->getInternalPathOfFolder($folder) . '/cfssl';
$this->appConfig->setValueString(Application::APP_ID, 'cfssl_bin', $cfsslBinPath);
if ($downloadOk) {
$this->writeAppSignature();
$file = $folder->newFile($download['destination']);
$fullPath = $this->getInternalPathOfFile($file);

$dependencyName = $download['destination'] . ' ' . $architecture;
$this->download($baseUrl . $download['file'], $dependencyName, $fullPath, $hash, 'sha256');

chmod($fullPath, 0700);
}
$cfsslBinPath = $this->getInternalPathOfFolder($folder) . '/cfssl';
$this->appConfig->setValueString(Application::APP_ID, 'cfssl_bin', $cfsslBinPath);
$this->writeAppSignature();
}

public function uninstallCfssl(): void {
Expand Down
25 changes: 18 additions & 7 deletions tests/Unit/Service/InstallServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,29 @@ public static function providerDownloadCli(): array {
* @dataProvider providerGetFolder
* @runInSeparateProcess
*/
public function testGetFolder(string $path): void {
public function testGetFolder(string $architecture, string $path, string $expectedFolderName): void {
$install = \OCP\Server::get(\OCA\Libresign\Service\Install\InstallService::class);
self::invokePrivate($install, 'getFolder', [$path]);
$this->expectNotToPerformAssertions();
if (!empty($architecture)) {
$install->setArchitecture($architecture);
}
$folder = self::invokePrivate($install, 'getFolder', [$path]);
$this->assertEquals($folder->getName(), $expectedFolderName);
}

public static function providerGetFolder(): array {
return [
[''],
['test'],
['test/folder1'],
['test/folder1/folder2'],
['', '', php_uname('m')],
['', 'test', 'test'],
['', 'test/folder1', 'folder1'],
['', 'test/folder1/folder2', 'folder2'],
['aarch64', '', 'aarch64'],
['aarch64', 'test', 'test'],
['aarch64', 'test/folder1', 'folder1'],
['aarch64', 'test/folder1/folder2', 'folder2'],
['x86_64', '', 'x86_64'],
['x86_64', 'test', 'test'],
['x86_64', 'test/folder1', 'folder1'],
['x86_64', 'test/folder1/folder2', 'folder2'],
];
}
}
Loading