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

Jump to bottom

replace all rmdir by a recursive variant #508

Closed
wants to merge 13 commits into from
Closed

replace all rmdir by a recursive variant #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0aa2bde
Strong type properties and functions in the updater
come-nc Jun 12, 2023
d8ebe00
Fix all psalm warnings in lib/Updater.php
come-nc Jun 13, 2023
3c1866b
Improve typing and remove PHP 5.4 hacks
come-nc Jun 13, 2023
614f954
Update phar and index.php
come-nc Jun 12, 2023
97eea49
Fix getUpdateStepFileLocation return type and call
come-nc Aug 3, 2023
107bae0
Create pr-feedback.yml
Altahrim Aug 18, 2023
8be4970
fix(integrity): expect pkg mgmt files
blizzz Sep 12, 2023
f53fba3
replace all rmdir by a recursive variant
caco3 Oct 22, 2023
b130b1a
add rmdir to lib/updater.php
caco3 Oct 24, 2023
beba742
move function into class
caco3 Oct 26, 2023
ebf7989
replace all rmdir by a recursive variant
caco3 Oct 22, 2023
2154e6b
move function into class
caco3 Oct 26, 2023
0addfdc
Merge branch 'master' of https://github.com/caco3/updater
Oct 26, 2023
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
30 changes: 25 additions & 5 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,26 @@ public function __construct(string $baseDir) {
$this->buildTime = $buildTime;
}

/**
* Deletes a directory recursively
*/
private function rrmdir(string $src): void {
$dir = opendir($src);
while(false !== ( $file = readdir($dir)) ) {
if (( $file != '.' ) && ( $file != '..' )) {
$full = $src . '/' . $file;
if ( is_dir($full) ) {
rrmdir($full);
}
else {
unlink($full);
}
}
}
closedir($dir);
rmdir($src);
}

/**
* Returns whether the web updater is disabled
*
Expand Down Expand Up @@ -844,10 +864,10 @@ private function recursiveDelete(string $folder): void {
unlink($file);
}
foreach ($directories as $dir) {
rmdir($dir);
rrmdir($dir);
}

$state = rmdir($folder);
$state = rrmdir($folder);
if ($state === false) {
throw new \Exception('Could not rmdir ' . $folder);
}
Expand Down Expand Up @@ -953,7 +973,7 @@ public function deleteOldFiles(): void {
throw new \Exception('Could not unlink: '.$path);
}
} elseif ($fileInfo->isDir()) {
$state = rmdir($path);
$state = rrmdir($path);
if ($state === false) {
throw new \Exception('Could not rmdir: '.$path);
}
Expand Down Expand Up @@ -1007,7 +1027,7 @@ private function moveWithExclusions(string $dataLocation, array $excludedElement
}
}
if ($fileInfo->isDir()) {
$state = rmdir($path);
$state = rrmdir($path);
if ($state === false) {
throw new \Exception('Could not rmdir ' . $path);
}
Expand Down Expand Up @@ -1052,7 +1072,7 @@ public function finalize(): void {
$storageLocation = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOptionMandatoryString('instanceid') . '/downloads/nextcloud/';
$this->silentLog('[info] storage location: ' . $storageLocation);
$this->moveWithExclusions($storageLocation, []);
$state = rmdir($storageLocation);
$state = rrmdir($storageLocation);
if ($state === false) {
throw new \Exception('Could not rmdir $storagelocation');
}
Expand Down
31 changes: 26 additions & 5 deletions lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,27 @@ private function getRecursiveDirectoryIterator(?string $folder = null): \Recursi
);
}

/**
* Deletes a directory recursively
*/
private function rrmdir(string $src): void {
$dir = opendir($src);
while(false !== ( $file = readdir($dir)) ) {
if (( $file != '.' ) && ( $file != '..' )) {
$full = $src . '/' . $file;
if ( is_dir($full) ) {
rrmdir($full);
}
else {
unlink($full);
}
}
}
closedir($dir);
rmdir($src);
}


/**
* Checks for files that are unexpected.
*/
Expand Down Expand Up @@ -806,10 +827,10 @@ private function recursiveDelete(string $folder): void {
unlink($file);
}
foreach ($directories as $dir) {
rmdir($dir);
rrmdir($dir);
}

$state = rmdir($folder);
$state = rrmdir($folder);
if ($state === false) {
throw new \Exception('Could not rmdir ' . $folder);
}
Expand Down Expand Up @@ -915,7 +936,7 @@ public function deleteOldFiles(): void {
throw new \Exception('Could not unlink: '.$path);
}
} elseif ($fileInfo->isDir()) {
$state = rmdir($path);
$state = rrmdir($path);
if ($state === false) {
throw new \Exception('Could not rmdir: '.$path);
}
Expand Down Expand Up @@ -969,7 +990,7 @@ private function moveWithExclusions(string $dataLocation, array $excludedElement
}
}
if ($fileInfo->isDir()) {
$state = rmdir($path);
$state = rrmdir($path);
if ($state === false) {
throw new \Exception('Could not rmdir ' . $path);
}
Expand Down Expand Up @@ -1014,7 +1035,7 @@ public function finalize(): void {
$storageLocation = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOptionMandatoryString('instanceid') . '/downloads/nextcloud/';
$this->silentLog('[info] storage location: ' . $storageLocation);
$this->moveWithExclusions($storageLocation, []);
$state = rmdir($storageLocation);
$state = rrmdir($storageLocation);
if ($state === false) {
throw new \Exception('Could not rmdir $storagelocation');
}
Expand Down
Loading