Skip to content

[stable30] chore: deprecate OC_Helper::copyr #54374

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

Closed
wants to merge 1 commit into from
Closed

[stable30] chore: deprecate OC_Helper::copyr #54374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2842,9 +2842,6 @@
<code><![CDATA[$matches[0][$last_match]]]></code>
<code><![CDATA[$matches[1][$last_match]]]></code>
</InvalidArrayOffset>
<InvalidScalarArgument>
<code><![CDATA[$path]]></code>
</InvalidScalarArgument>
<UndefinedInterfaceMethod>
<code><![CDATA[getQuota]]></code>
</UndefinedInterfaceMethod>
Expand Down
42 changes: 39 additions & 3 deletions lib/private/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
use OC\Archive\TAR;
use OC\DB\Connection;
use OC\DB\MigrationService;
use OC\Files\FilenameValidator;
use OC_App;
use OC_Helper;
use OCP\App\IAppManager;
use OCP\HintException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ITempManager;
use OCP\Migration\IOutput;
use OCP\Server;
use phpseclib\File\X509;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -241,6 +242,10 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {

// Download the release
$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
if ($tempFile === false) {
throw new \RuntimeException('Could not create temporary file for downloading app archive.');
}

$timeout = $this->isCLI ? 0 : 120;
$client = $this->clientService->newClient();
$client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
Expand All @@ -252,8 +257,11 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {
if ($verified === true) {
// Seems to match, let's proceed
$extractDir = $this->tempManager->getTemporaryFolder();
$archive = new TAR($tempFile);
if ($extractDir === false) {
throw new \RuntimeException('Could not create temporary directory for unpacking app.');
}

$archive = new TAR($tempFile);
if (!$archive->extract($extractDir)) {
$errorMessage = 'Could not extract app ' . $appId;

Expand Down Expand Up @@ -328,7 +336,6 @@ public function downloadApp(string $appId, bool $allowUnstable = false): void {
// Move to app folder
if (@mkdir($baseDir)) {
$extractDir .= '/' . $folders[0];
OC_Helper::copyr($extractDir, $baseDir);
}
OC_Helper::copyr($extractDir, $baseDir);
OC_Helper::rmdirr($extractDir);
Expand Down Expand Up @@ -590,4 +597,33 @@ private static function includeAppScript(string $script): void {
include $script;
}
}

/**
* Recursive copying of local folders.
*
* @param string $src source folder
* @param string $dest target folder
*/
private function copyRecursive(string $src, string $dest): void {
if (!file_exists($src)) {
return;
}

if (is_dir($src)) {
if (!is_dir($dest)) {
mkdir($dest);
}
$files = scandir($src);
foreach ($files as $file) {
if ($file != '.' && $file != '..') {
$this->copyRecursive("$src/$file", "$dest/$file");
}
}
} else {
$validator = Server::get(FilenameValidator::class);
if (!$validator->isForbidden($src)) {
copy($src, $dest);
}
}
}
}
3 changes: 2 additions & 1 deletion lib/private/legacy/OC_Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ public static function computerFileSize(string $str): false|int|float {
* @param string $src source folder
* @param string $dest target folder
* @return void
* @deprecated 32.0.0 - use \OCP\Files\Folder::copy
*/
public static function copyr($src, $dest) {
if (!file_exists($src)) {
Expand Down Expand Up @@ -206,7 +207,7 @@ public static function canExecute($name, $path = false) {
$exts = [''];
$check_fn = 'is_executable';
// Default check will be done with $path directories :
$dirs = explode(PATH_SEPARATOR, $path);
$dirs = explode(PATH_SEPARATOR, (string)$path);
// WARNING : We have to check if open_basedir is enabled :
$obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
if ($obd != 'none') {
Expand Down