upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(settings): Adjust order of parameters for runRequest

Browse source 
Fixing invalid request to host `HEAD`.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-03-08 11:21:51 +01:00
parent b6691b35c7
commit 58f57fd13f
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/settings/lib/SetupChecks/CheckServerResponseTrait.php
View file

@ -74,8 +74,8 @@ trait CheckServerResponseTrait {
/**
* Run a HTTP request to check header
* @param string $url The relative URL to check
* @param string $method The HTTP method to use
* @param string $url The relative URL to check
* @param array{ignoreSSL?: bool, httpErrors?: bool, options?: array} $options Additional options, like
* [
* // Ignore invalid SSL certificates (e.g. self signed)
@ -86,7 +86,7 @@ trait CheckServerResponseTrait {
*
* @return Generator<int, IResponse>
*/
protected function runRequest(string $url, string $method, array $options = []): Generator {
protected function runRequest(string $method, string $url, array $options = []): Generator {
$options = array_merge(['ignoreSSL' => true, 'httpErrors' => true], $options);
$client = $this->clientService->newClient();
@ -95,7 +95,7 @@ trait CheckServerResponseTrait {
foreach ($this->getTestUrls($url) as $testURL) {
try {
yield $client->request($testURL, $method, $requestOptions);
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]);
}
@ -110,7 +110,7 @@ trait CheckServerResponseTrait {
* @return Generator<int, IResponse>
*/
protected function runHEAD(string $url, bool $ignoreSSL = true, bool $httpErrors = true): Generator {
return $this->runRequest($url, 'HEAD', ['ignoreSSL' => $ignoreSSL, 'httpErrors' => $httpErrors]);
return $this->runRequest('HEAD', $url, ['ignoreSSL' => $ignoreSSL, 'httpErrors' => $httpErrors]);
}
protected function getRequestOptions(bool $ignoreSSL, bool $httpErrors): array {

2
apps/settings/lib/SetupChecks/WellKnownUrls.php
View file

@ -70,7 +70,7 @@ class WellKnownUrls implements ISetupCheck {
foreach ($urls as [$verb,$url,$validStatuses,$checkCustomHeader]) {
$works = null;
foreach ($this->runRequest($url, $verb, ['httpErrors' => false, 'options' => ['allow_redirects' => ['track_redirects' => true]]]) as $response) {
foreach ($this->runRequest($verb, $url, ['httpErrors' => false, 'options' => ['allow_redirects' => ['track_redirects' => true]]]) as $response) {
// Check that the response status matches
$works = in_array($response->getStatusCode(), $validStatuses);
// and (if needed) the custom Nextcloud header is set