diff options
Diffstat (limited to 'apps')
13 files changed, 13 insertions, 420 deletions
diff --git a/apps/dav/lib/SetupChecks/WebdavEndpoint.php b/apps/dav/lib/SetupChecks/WebdavEndpoint.php index f5a387836fb..c2574202fcd 100644 --- a/apps/dav/lib/SetupChecks/WebdavEndpoint.php +++ b/apps/dav/lib/SetupChecks/WebdavEndpoint.php @@ -9,11 +9,11 @@ declare(strict_types=1); namespace OCA\DAV\SetupChecks; -use OCA\Settings\SetupChecks\CheckServerResponseTrait; use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; diff --git a/apps/settings/composer/composer/autoload_classmap.php b/apps/settings/composer/composer/autoload_classmap.php index 7a3618ecb51..1b3c4c25552 100644 --- a/apps/settings/composer/composer/autoload_classmap.php +++ b/apps/settings/composer/composer/autoload_classmap.php @@ -82,7 +82,6 @@ return array( 'OCA\\Settings\\SetupChecks\\AllowedAdminRanges' => $baseDir . '/../lib/SetupChecks/AllowedAdminRanges.php', 'OCA\\Settings\\SetupChecks\\AppDirsWithDifferentOwner' => $baseDir . '/../lib/SetupChecks/AppDirsWithDifferentOwner.php', 'OCA\\Settings\\SetupChecks\\BruteForceThrottler' => $baseDir . '/../lib/SetupChecks/BruteForceThrottler.php', - 'OCA\\Settings\\SetupChecks\\CheckServerResponseTrait' => $baseDir . '/../lib/SetupChecks/CheckServerResponseTrait.php', 'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => $baseDir . '/../lib/SetupChecks/CheckUserCertificates.php', 'OCA\\Settings\\SetupChecks\\CodeIntegrity' => $baseDir . '/../lib/SetupChecks/CodeIntegrity.php', 'OCA\\Settings\\SetupChecks\\CronErrors' => $baseDir . '/../lib/SetupChecks/CronErrors.php', diff --git a/apps/settings/composer/composer/autoload_static.php b/apps/settings/composer/composer/autoload_static.php index 18882ed9fc2..5de0bb31fd6 100644 --- a/apps/settings/composer/composer/autoload_static.php +++ b/apps/settings/composer/composer/autoload_static.php @@ -97,7 +97,6 @@ class ComposerStaticInitSettings 'OCA\\Settings\\SetupChecks\\AllowedAdminRanges' => __DIR__ . '/..' . '/../lib/SetupChecks/AllowedAdminRanges.php', 'OCA\\Settings\\SetupChecks\\AppDirsWithDifferentOwner' => __DIR__ . '/..' . '/../lib/SetupChecks/AppDirsWithDifferentOwner.php', 'OCA\\Settings\\SetupChecks\\BruteForceThrottler' => __DIR__ . '/..' . '/../lib/SetupChecks/BruteForceThrottler.php', - 'OCA\\Settings\\SetupChecks\\CheckServerResponseTrait' => __DIR__ . '/..' . '/../lib/SetupChecks/CheckServerResponseTrait.php', 'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => __DIR__ . '/..' . '/../lib/SetupChecks/CheckUserCertificates.php', 'OCA\\Settings\\SetupChecks\\CodeIntegrity' => __DIR__ . '/..' . '/../lib/SetupChecks/CodeIntegrity.php', 'OCA\\Settings\\SetupChecks\\CronErrors' => __DIR__ . '/..' . '/../lib/SetupChecks/CronErrors.php', diff --git a/apps/settings/lib/SetupChecks/CheckServerResponseTrait.php b/apps/settings/lib/SetupChecks/CheckServerResponseTrait.php deleted file mode 100644 index 3080829cb00..00000000000 --- a/apps/settings/lib/SetupChecks/CheckServerResponseTrait.php +++ /dev/null @@ -1,159 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\Settings\SetupChecks; - -use Generator; -use OCP\Http\Client\IClientService; -use OCP\Http\Client\IResponse; -use OCP\IConfig; -use OCP\IL10N; -use OCP\IURLGenerator; -use Psr\Log\LoggerInterface; - -/** - * Common trait for setup checks that need to use requests to the same server and check the response - */ -trait CheckServerResponseTrait { - protected IConfig $config; - protected IURLGenerator $urlGenerator; - protected IClientService $clientService; - protected IL10N $l10n; - protected LoggerInterface $logger; - - /** - * Common helper string in case a check could not fetch any results - */ - protected function serverConfigHelp(): string { - return $this->l10n->t('To allow this check to run you have to make sure that your Web server can connect to itself. Therefore it must be able to resolve and connect to at least one of its `trusted_domains` or the `overwrite.cli.url`. This failure may be the result of a server-side DNS mismatch or outbound firewall rule.'); - } - - /** - * Get all possible URLs that need to be checked for a local request test. - * This takes all `trusted_domains` and the CLI overwrite URL into account. - * - * @param string $url The absolute path (absolute URL without host but with web-root) to test starting with a / - * @param bool $isRootRequest Set to remove the web-root from URL and host (e.g. when requesting a path in the domain root like '/.well-known') - * @return list<string> List of possible absolute URLs - */ - protected function getTestUrls(string $url, bool $isRootRequest = false): array { - $url = '/' . ltrim($url, '/'); - - $webroot = rtrim($this->urlGenerator->getWebroot(), '/'); - if ($isRootRequest === false && $webroot !== '' && str_starts_with($url, $webroot)) { - // The URL contains the web-root but also the base url does so, - // so we need to remove the web-root from the URL. - $url = substr($url, strlen($webroot)); - } - - // Base URLs to test - $baseUrls = []; - - // Try overwrite.cli.url first, it’s supposed to be how the server contacts itself - $cliUrl = $this->config->getSystemValueString('overwrite.cli.url', ''); - if ($cliUrl !== '') { - // The CLI URL already contains the web-root, so we need to normalize it if requested - $baseUrls[] = $this->normalizeUrl( - $cliUrl, - $isRootRequest - ); - } - - // Try URL generator second - // The base URL also contains the webroot so also normalize it - $baseUrls[] = $this->normalizeUrl( - $this->urlGenerator->getBaseUrl(), - $isRootRequest - ); - - /* Last resort: trusted domains */ - $trustedDomains = $this->config->getSystemValue('trusted_domains', []); - foreach ($trustedDomains as $host) { - if (str_contains($host, '*')) { - /* Ignore domains with a wildcard */ - continue; - } - $baseUrls[] = $this->normalizeUrl("https://$host$webroot", $isRootRequest); - $baseUrls[] = $this->normalizeUrl("http://$host$webroot", $isRootRequest); - } - - return array_map(fn (string $host) => $host . $url, array_values(array_unique($baseUrls))); - } - - /** - * Strip a trailing slash and remove the webroot if requested. - * @param string $url The URL to normalize. Should be an absolute URL containing scheme, host and optionally web-root. - * @param bool $removeWebroot If set the web-root is removed from the URL and an absolute URL with only the scheme and host (optional port) is returned - */ - protected function normalizeUrl(string $url, bool $removeWebroot): string { - if ($removeWebroot) { - $segments = parse_url($url); - $port = isset($segments['port']) ? (':' . $segments['port']) : ''; - return $segments['scheme'] . '://' . $segments['host'] . $port; - } - return rtrim($url, '/'); - } - - /** - * Run a HTTP request to check header - * @param string $method The HTTP method to use - * @param string $url The absolute path (URL with webroot but without host) to check, can be the output of `IURLGenerator` - * @param bool $isRootRequest If set the webroot is removed from URLs to make the request target the host's root. Example usage are the /.well-known URLs in the root path. - * @param array{ignoreSSL?: bool, httpErrors?: bool, options?: array} $options HTTP client related options, like - * [ - * // Ignore invalid SSL certificates (e.g. self signed) - * 'ignoreSSL' => true, - * // Ignore requests with HTTP errors (will not yield if request has a 4xx or 5xx response) - * 'httpErrors' => true, - * // Additional options for the HTTP client (see `IClient`) - * 'options' => [], - * ] - * - * @return Generator<int, IResponse> - */ - protected function runRequest(string $method, string $url, array $options = [], bool $isRootRequest = false): Generator { - $options = array_merge(['ignoreSSL' => true, 'httpErrors' => true], $options); - - $client = $this->clientService->newClient(); - $requestOptions = $this->getRequestOptions($options['ignoreSSL'], $options['httpErrors']); - $requestOptions = array_merge($requestOptions, $options['options'] ?? []); - - foreach ($this->getTestUrls($url, $isRootRequest) as $testURL) { - try { - yield $client->request($method, $testURL, $requestOptions); - } catch (\Throwable $e) { - $this->logger->debug('Can not connect to local server for running setup checks', ['exception' => $e, 'url' => $testURL]); - } - } - } - - /** - * Run a HEAD request to check header - * @param string $url The relative URL to check (e.g. output of IURLGenerator) - * @param bool $ignoreSSL Ignore SSL certificates - * @param bool $httpErrors Ignore requests with HTTP errors (will not yield if request has a 4xx or 5xx response) - * @return Generator<int, IResponse> - */ - protected function runHEAD(string $url, bool $ignoreSSL = true, bool $httpErrors = true): Generator { - return $this->runRequest('HEAD', $url, ['ignoreSSL' => $ignoreSSL, 'httpErrors' => $httpErrors]); - } - - protected function getRequestOptions(bool $ignoreSSL, bool $httpErrors): array { - $requestOptions = [ - 'connect_timeout' => 10, - 'http_errors' => $httpErrors, - 'nextcloud' => [ - 'allow_local_address' => true, - ], - ]; - if ($ignoreSSL) { - $requestOptions['verify'] = false; - } - return $requestOptions; - } -} diff --git a/apps/settings/lib/SetupChecks/DataDirectoryProtected.php b/apps/settings/lib/SetupChecks/DataDirectoryProtected.php index 051494adb62..4280457ced0 100644 --- a/apps/settings/lib/SetupChecks/DataDirectoryProtected.php +++ b/apps/settings/lib/SetupChecks/DataDirectoryProtected.php @@ -12,6 +12,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; diff --git a/apps/settings/lib/SetupChecks/JavaScriptModules.php b/apps/settings/lib/SetupChecks/JavaScriptModules.php index ae19eacec7b..e09dc459dc8 100644 --- a/apps/settings/lib/SetupChecks/JavaScriptModules.php +++ b/apps/settings/lib/SetupChecks/JavaScriptModules.php @@ -12,6 +12,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; @@ -43,7 +44,7 @@ class JavaScriptModules implements ISetupCheck { $testFile = $this->urlGenerator->linkTo('settings', 'js/esm-test.mjs'); $noResponse = true; - foreach ($this->runHEAD($testFile) as $response) { + foreach ($this->runRequest('HEAD', $testFile) as $response) { $noResponse = false; if (preg_match('/(text|application)\/javascript/i', $response->getHeader('Content-Type'))) { return SetupResult::success(); diff --git a/apps/settings/lib/SetupChecks/JavaScriptSourceMaps.php b/apps/settings/lib/SetupChecks/JavaScriptSourceMaps.php index 85cbe872339..dcfc40192b9 100644 --- a/apps/settings/lib/SetupChecks/JavaScriptSourceMaps.php +++ b/apps/settings/lib/SetupChecks/JavaScriptSourceMaps.php @@ -12,6 +12,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; @@ -42,7 +43,7 @@ class JavaScriptSourceMaps implements ISetupCheck { public function run(): SetupResult { $testFile = $this->urlGenerator->linkTo('settings', 'js/map-test.js.map'); - foreach ($this->runHEAD($testFile) as $response) { + foreach ($this->runRequest('HEAD', $testFile) as $response) { return SetupResult::success(); } diff --git a/apps/settings/lib/SetupChecks/OcxProviders.php b/apps/settings/lib/SetupChecks/OcxProviders.php index 84da99dbfb0..191341b0ee4 100644 --- a/apps/settings/lib/SetupChecks/OcxProviders.php +++ b/apps/settings/lib/SetupChecks/OcxProviders.php @@ -12,6 +12,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; diff --git a/apps/settings/lib/SetupChecks/SecurityHeaders.php b/apps/settings/lib/SetupChecks/SecurityHeaders.php index a6dbc631b5c..b85ab9b4018 100644 --- a/apps/settings/lib/SetupChecks/SecurityHeaders.php +++ b/apps/settings/lib/SetupChecks/SecurityHeaders.php @@ -13,6 +13,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; @@ -71,8 +72,8 @@ class SecurityHeaders implements ISetupCheck { } } - $xssfields = array_map('trim', explode(';', $response->getHeader('X-XSS-Protection'))); - if (!in_array('1', $xssfields) || !in_array('mode=block', $xssfields)) { + $xssFields = array_map('trim', explode(';', $response->getHeader('X-XSS-Protection'))); + if (!in_array('1', $xssFields) || !in_array('mode=block', $xssFields)) { $msg .= $this->l10n->t('- The `%1$s` HTTP header does not contain `%2$s`. This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly.', ['X-XSS-Protection', '1; mode=block'])."\n"; } diff --git a/apps/settings/lib/SetupChecks/WellKnownUrls.php b/apps/settings/lib/SetupChecks/WellKnownUrls.php index 623b9fae90c..9fdaca996b8 100644 --- a/apps/settings/lib/SetupChecks/WellKnownUrls.php +++ b/apps/settings/lib/SetupChecks/WellKnownUrls.php @@ -13,6 +13,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; diff --git a/apps/settings/lib/SetupChecks/Woff2Loading.php b/apps/settings/lib/SetupChecks/Woff2Loading.php index 769653c4618..27aff4ea999 100644 --- a/apps/settings/lib/SetupChecks/Woff2Loading.php +++ b/apps/settings/lib/SetupChecks/Woff2Loading.php @@ -12,6 +12,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; +use OCP\SetupCheck\CheckServerResponseTrait; use OCP\SetupCheck\ISetupCheck; use OCP\SetupCheck\SetupResult; use Psr\Log\LoggerInterface; @@ -49,7 +50,7 @@ class Woff2Loading implements ISetupCheck { protected function checkFont(string $fileExtension, string $url): SetupResult { $noResponse = true; - $responses = $this->runHEAD($url); + $responses = $this->runRequest('HEAD', $url); foreach ($responses as $response) { $noResponse = false; if ($response->getStatusCode() === 200) { diff --git a/apps/settings/tests/SetupChecks/CheckServerResponseTraitImplementation.php b/apps/settings/tests/SetupChecks/CheckServerResponseTraitImplementation.php deleted file mode 100644 index 6c8b65855cc..00000000000 --- a/apps/settings/tests/SetupChecks/CheckServerResponseTraitImplementation.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\Settings\Tests\SetupChecks; - -use OCA\Settings\SetupChecks\CheckServerResponseTrait; -use OCP\Http\Client\IClientService; -use OCP\IConfig; -use OCP\IL10N; -use OCP\IURLGenerator; -use Psr\Log\LoggerInterface; - -/** - * Dummy implementation for CheckServerResponseTraitTest - */ -class CheckServerResponseTraitImplementation { - - use CheckServerResponseTrait { - CheckServerResponseTrait::getRequestOptions as public; - CheckServerResponseTrait::runHEAD as public; - CheckServerResponseTrait::runRequest as public; - CheckServerResponseTrait::normalizeUrl as public; - CheckServerResponseTrait::getTestUrls as public; - } - - public function __construct( - protected IL10N $l10n, - protected IConfig $config, - protected IURLGenerator $urlGenerator, - protected IClientService $clientService, - protected LoggerInterface $logger, - ) { - } - -} diff --git a/apps/settings/tests/SetupChecks/CheckServerResponseTraitTest.php b/apps/settings/tests/SetupChecks/CheckServerResponseTraitTest.php deleted file mode 100644 index e51546c1cf1..00000000000 --- a/apps/settings/tests/SetupChecks/CheckServerResponseTraitTest.php +++ /dev/null @@ -1,213 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OCA\Settings\Tests\SetupChecks; - -use OCP\Http\Client\IClientService; -use OCP\IConfig; -use OCP\IL10N; -use OCP\IURLGenerator; -use PHPUnit\Framework\MockObject\MockObject; -use Psr\Log\LoggerInterface; -use Test\TestCase; - -class CheckServerResponseTraitTest extends TestCase { - - protected const BASE_URL = 'https://nextcloud.local'; - - private IL10N&MockObject $l10n; - private IConfig&MockObject $config; - private IURLGenerator&MockObject $urlGenerator; - private IClientService&MockObject $clientService; - private LoggerInterface&MockObject $logger; - - private CheckServerResponseTraitImplementation $trait; - - protected function setUp(): void { - parent::setUp(); - - $this->l10n = $this->createMock(IL10N::class); - $this->l10n->method('t') - ->willReturnArgument(0); - $this->config = $this->createMock(IConfig::class); - $this->urlGenerator = $this->createMock(IURLGenerator::class); - $this->clientService = $this->createMock(IClientService::class); - $this->logger = $this->createMock(LoggerInterface::class); - - $this->trait = new CheckServerResponseTraitImplementation( - $this->l10n, - $this->config, - $this->urlGenerator, - $this->clientService, - $this->logger, - ); - } - - /** - * @dataProvider dataNormalizeUrl - */ - public function testNormalizeUrl(string $url, bool $isRootRequest, string $expected): void { - $this->assertEquals($expected, $this->trait->normalizeUrl($url, $isRootRequest)); - } - - public static function dataNormalizeUrl(): array { - return [ - // untouched web-root - 'valid and nothing to change' => ['http://example.com/root', false, 'http://example.com/root'], - 'valid with port and nothing to change' => ['http://example.com:8081/root', false, 'http://example.com:8081/root'], - 'trailing slash' => ['http://example.com/root/', false, 'http://example.com/root'], - 'deep web root' => ['http://example.com/deep/webroot', false, 'http://example.com/deep/webroot'], - // removal of the web-root - 'remove web root' => ['http://example.com/root/', true, 'http://example.com'], - 'remove web root but empty' => ['http://example.com', true, 'http://example.com'], - 'remove deep web root' => ['http://example.com/deep/webroot', true, 'http://example.com'], - 'remove web root with port' => ['http://example.com:8081/root', true, 'http://example.com:8081'], - 'remove web root with port but empty' => ['http://example.com:8081', true, 'http://example.com:8081'], - 'remove web root from IP' => ['https://127.0.0.1/root', true, 'https://127.0.0.1'], - 'remove web root from IP with port' => ['https://127.0.0.1:8080/root', true, 'https://127.0.0.1:8080'], - 'remove web root from IPv6' => ['https://[ff02::1]/root', true, 'https://[ff02::1]'], - 'remove web root from IPv6 with port' => ['https://[ff02::1]:8080/root', true, 'https://[ff02::1]:8080'], - ]; - } - - /** - * @dataProvider dataGetTestUrls - */ - public function testGetTestUrls( - string $url, - bool $isRootRequest, - string $cliUrl, - string $webRoot, - array $trustedDomains, - array $expected, - ): void { - $this->config->expects(self::atLeastOnce()) - ->method('getSystemValueString') - ->with('overwrite.cli.url', '') - ->willReturn($cliUrl); - - $this->config->expects(self::atLeastOnce()) - ->method('getSystemValue') - ->with('trusted_domains', []) - ->willReturn($trustedDomains); - - $this->urlGenerator->expects(self::atLeastOnce()) - ->method('getWebroot') - ->willReturn($webRoot); - - $this->urlGenerator->expects(self::atLeastOnce()) - ->method('getBaseUrl') - ->willReturn(self::BASE_URL . $webRoot); - - $result = $this->trait->getTestUrls($url, $isRootRequest); - $this->assertEquals($expected, $result); - } - - /** - * @return array<string, list{string, bool, string, string, list<string>, list<string>}> - */ - public static function dataGetTestUrls(): array { - return [ - 'same cli and base URL' => [ - '/apps/files/js/example.js', false, 'https://nextcloud.local', '', ['nextcloud.local'], [ - // from cli url - 'https://nextcloud.local/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/apps/files/js/example.js', - ] - ], - 'different cli and base URL' => [ - '/apps/files/js/example.js', false, 'https://example.com', '', ['nextcloud.local'], [ - // from cli url - 'https://example.com/apps/files/js/example.js', - // from base url - 'https://nextcloud.local/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/apps/files/js/example.js', - ] - ], - 'different cli and base URL and trusted domains' => [ - '/apps/files/js/example.js', false, 'https://example.com', '', ['nextcloud.local', 'example.com', '127.0.0.1'], [ - // from cli url - 'https://example.com/apps/files/js/example.js', - // from base url - 'https://nextcloud.local/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/apps/files/js/example.js', - 'http://example.com/apps/files/js/example.js', - // trusted domains - 'https://127.0.0.1/apps/files/js/example.js', - 'http://127.0.0.1/apps/files/js/example.js', - ] - ], - 'wildcard trusted domains' => [ - '/apps/files/js/example.js', false, '', '', ['nextcloud.local', '*.example.com'], [ - // from base url - 'https://nextcloud.local/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/apps/files/js/example.js', - // trusted domains with wild card are skipped - ] - ], - 'missing leading slash' => [ - 'apps/files/js/example.js', false, 'https://nextcloud.local', '', ['nextcloud.local'], [ - // from cli url - 'https://nextcloud.local/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/apps/files/js/example.js', - ] - ], - 'keep web-root' => [ - '/apps/files/js/example.js', false, 'https://example.com', '/nextcloud', ['nextcloud.local', 'example.com', '192.168.100.1'], [ - // from cli url (note that the CLI url has NO web root) - 'https://example.com/apps/files/js/example.js', - // from base url - 'https://nextcloud.local/nextcloud/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/nextcloud/apps/files/js/example.js', - // trusted domains with web-root - 'https://example.com/nextcloud/apps/files/js/example.js', - 'http://example.com/nextcloud/apps/files/js/example.js', - 'https://192.168.100.1/nextcloud/apps/files/js/example.js', - 'http://192.168.100.1/nextcloud/apps/files/js/example.js', - ] - ], - // example if the URL is generated by the URL generator - 'keep web-root and web root in url' => [ - '/nextcloud/apps/files/js/example.js', false, 'https://example.com', '/nextcloud', ['nextcloud.local', 'example.com', '192.168.100.1'], [ - // from cli url (note that the CLI url has NO web root) - 'https://example.com/apps/files/js/example.js', - // from base url - 'https://nextcloud.local/nextcloud/apps/files/js/example.js', - // http variant from trusted domains - 'http://nextcloud.local/nextcloud/apps/files/js/example.js', - // trusted domains with web-root - 'https://example.com/nextcloud/apps/files/js/example.js', - 'http://example.com/nextcloud/apps/files/js/example.js', - 'https://192.168.100.1/nextcloud/apps/files/js/example.js', - 'http://192.168.100.1/nextcloud/apps/files/js/example.js', - ] - ], - 'remove web-root' => [ - '/.well-known/caldav', true, 'https://example.com', '/nextcloud', ['nextcloud.local', 'example.com', '192.168.100.1'], [ - // from cli url (note that the CLI url has NO web root) - 'https://example.com/.well-known/caldav', - // from base url - 'https://nextcloud.local/.well-known/caldav', - // http variant from trusted domains - 'http://nextcloud.local/.well-known/caldav', - 'http://example.com/.well-known/caldav', - // trusted domains with web-root - 'https://192.168.100.1/.well-known/caldav', - 'http://192.168.100.1/.well-known/caldav', - ] - ], - ]; - } - -} |