Skip to content

fix(setup): normalize canonical webroot consistently #56853

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

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(setup): normalize canonical webroot consistently #56853

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
39 changes: 27 additions & 12 deletions lib/private/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,28 +517,43 @@
}

/**
* Find webroot from config
* Determine the canonical web base path for the installation.
*
* @throws InvalidArgumentException when invalid value for overwrite.cli.url
* Returns '' for root installs or '/subpath' (leading slash, no trailing slash) for subdir installs.
*
* When running in CLI the value is derived from 'overwrite.cli.url'.
*
* @return string Canonical webroot ('' or '/subpath')
* @throws \InvalidArgumentException If running in CLI and overwrite.cli.url is empty or invalid
*/
private static function findWebRoot(SystemConfig $config): string {
// For CLI read the value from overwrite.cli.url
if (\OC::$CLI) {
$webRoot = $config->getValue('overwrite.cli.url', '');
if ($webRoot === '') {
throw new InvalidArgumentException('overwrite.cli.url is empty');
}
if (!filter_var($webRoot, FILTER_VALIDATE_URL)) {
throw new InvalidArgumentException('invalid value for overwrite.cli.url');
}
$webRoot = rtrim((parse_url($webRoot, PHP_URL_PATH) ?? ''), '/');
$rawPath = self::getWebRootFromCliConfig($config);
} else {
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
$rawPath = (string)\OC::$WEBROOT;

Check failure on line 533 in lib/private/Setup.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

RedundantCast 

lib/private/Setup.php:533:15: RedundantCast: Redundant cast to string (see https://psalm.dev/262)
}

// normalize to canonical form regardless of source and initial form
$webRoot = rtrim((string)$rawPath, '/');

Check failure on line 537 in lib/private/Setup.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

RedundantCast 

lib/private/Setup.php:537:20: RedundantCast: Redundant cast to string (see https://psalm.dev/262)

return $webRoot;
}

private static function getWebRootFromCliConfig(SystemConfig $config): string {
$overwriteCliUrl = $config->getValue('overwrite.cli.url', '');

if ($overwriteCliUrl === '') {
throw new \InvalidArgumentException('overwrite.cli.url is empty');
}

if (!filter_var($overwriteCliUrl, FILTER_VALIDATE_URL)) {
throw new \InvalidArgumentException('overwrite.cli.url is not a valid URL');
}

// parse_url may return null for no path -> coalesce to ''
return parse_url($overwriteCliUrl, PHP_URL_PATH) ?? '';
}

/**
* Append the correct ErrorDocument path for Apache hosts
*
Expand Down
Loading