Skip to content

[stable30] fix: make sure we have a valid scheme when testing ocm urls #49900

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

Merged
skjnldsv merged 1 commit into from
Dec 17, 2024
Merged

[stable30] fix: make sure we have a valid scheme when testing ocm urls #49900

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
fix: make sure we have a valid scheme when testing ocm urls 
Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Dec 17, 2024
commit b356cba2a64b841c8c8f2c3f518bdc5f9464a95a
9 changes: 9 additions & 0 deletions lib/private/OCM/OCMDiscoveryService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

namespace OC\OCM;

use GuzzleHttp\Exception\ConnectException;
use JsonException;
use OCP\AppFramework\Http;
use OCP\Http\Client\IClientService;
Expand Down Expand Up @@ -52,6 +53,14 @@ public function __construct(
*/
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 {
Expand Down
Loading