sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: make sure we have a valid scheme when testing ocm urls 

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
pull/49901/head
skjnldsv 2024-12-17 15:23:59 +07:00 committed by backportbot[bot]
parent 4f74901eda
commit fd558fd62e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/OCM/OCMDiscoveryService.php
Unescape Escape View File

@ -26,6 +26,7 @@ declare(strict_types=1);
namespace OC\OCM;
use GuzzleHttp\Exception\ConnectException;
use JsonException;
use OCP\AppFramework\Http;
use OCP\Http\Client\IClientService;
@ -69,6 +70,14 @@ class OCMDiscoveryService implements IOCMDiscoveryService {
*/
public function discover(string $remote, bool $skipCache = false): IOCMProvider {
$remote = rtrim($remote, '/');
if (!str_starts_with($remote, 'http://') && !str_starts_with($remote, 'https://')) {
// if scheme not specified, we test both;
try {
return $this->discover('https://' . $remote, $skipCache);
} catch (OCMProviderException|ConnectException) {
return $this->discover('http://' . $remote, $skipCache);
}
}
if (!$skipCache) {
try {