From bf3e493a8380b7f4123575594ad86f24ac32f15a Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 6 Nov 2023 15:49:39 +0100 Subject: [PATCH] fix: BitbucketServerURLParser should not fail if url contains spaces Signed-off-by: Anatolii Bazko --- .../server/bitbucket/BitbucketServerURLParser.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java index f275b6b5f3..bb431ae7ac 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java @@ -85,8 +85,14 @@ public class BitbucketServerURLParser { } private boolean isUserTokenPresent(String repositoryUrl) { + URI uri; + try { + uri = URI.create(repositoryUrl); + } catch (IllegalArgumentException e) { + return false; + } + String serverUrl = getServerUrl(repositoryUrl); - URI uri = URI.create(repositoryUrl); String schema = uri.getScheme(); String host = uri.getHost(); if (bitbucketUrlPatternTemplates.stream() @@ -130,7 +136,7 @@ public class BitbucketServerURLParser { // If the user request catches the unauthorised error, it means that the provided url // belongs to Bitbucket. bitbucketServerApiClient.getUser(); - } catch (ScmItemNotFoundException | ScmCommunicationException e) { + } catch (ScmItemNotFoundException | ScmCommunicationException | IllegalArgumentException e) { return false; } catch (ScmUnauthorizedException e) { return true;