From 763571c86c1a3bf00f9067c589a506430623e26e Mon Sep 17 00:00:00 2001 From: viv Date: Wed, 3 Apr 2024 14:52:15 +1100 Subject: [PATCH 1/3] Remove validateURL checks remove regex check for url --- .../java/org/openapitools/sdk/KindeClientSDK.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/org/openapitools/sdk/KindeClientSDK.java b/src/main/java/org/openapitools/sdk/KindeClientSDK.java index a8afb4a5..35d9166c 100644 --- a/src/main/java/org/openapitools/sdk/KindeClientSDK.java +++ b/src/main/java/org/openapitools/sdk/KindeClientSDK.java @@ -118,17 +118,11 @@ public KindeClientSDK( if (domain == null || domain.isEmpty()) { throw new IllegalArgumentException("Please provide domain"); } - if (!Utils.validateURL(domain)) { - throw new IllegalArgumentException("Please provide valid domain"); - } this.domain = domain; if (redirectUri == null || redirectUri.isEmpty()) { throw new IllegalArgumentException("Please provide redirect_uri"); } - if (!Utils.validateURL(redirectUri)) { - throw new IllegalArgumentException("Please provide valid redirect_uri"); - } this.redirectUri = redirectUri; if (clientSecret == null || clientSecret.isEmpty()) { @@ -149,9 +143,6 @@ public KindeClientSDK( if (logoutRedirectUri == null || logoutRedirectUri.isEmpty()) { throw new IllegalArgumentException("Please provide logout_redirect_uri"); } - if (!Utils.validateURL(logoutRedirectUri)) { - throw new IllegalArgumentException("Please provide valid logout_redirect_uri"); - } if (additionalParameters==null){ additionalParameters=new HashMap<>(); @@ -644,4 +635,4 @@ private String getGrantType(String grantType) { } } -} \ No newline at end of file +} From 5ef68d2abfa063542aa2e489ecb32651395b6f85 Mon Sep 17 00:00:00 2001 From: viv Date: Wed, 3 Apr 2024 14:53:39 +1100 Subject: [PATCH 2/3] Update Utils.java --- src/main/java/org/openapitools/sdk/utils/Utils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/openapitools/sdk/utils/Utils.java b/src/main/java/org/openapitools/sdk/utils/Utils.java index a6535a94..42ff01a3 100644 --- a/src/main/java/org/openapitools/sdk/utils/Utils.java +++ b/src/main/java/org/openapitools/sdk/utils/Utils.java @@ -104,12 +104,6 @@ public static String generateCodeChallenge(String codeVerifier) { } } - public static boolean validateURL(String url) { - String pattern = "https?://(?:w{1,3}\\.)?[^\\s.]+(?:\\.[a-z]+)*(?::\\d+)?(?![^<]*(?:<\\/?\\w+>|\\/?>))"; -// return Pattern.matches(pattern,url); - return url.matches(pattern); - } - public static Map parseJWT(String token) { try { @@ -184,4 +178,4 @@ public static String bytesToHex(byte[] bytes) { return result.toString(); } -} \ No newline at end of file +} From 1f4f3d33123a974840f6164be659a2079f6b565f Mon Sep 17 00:00:00 2001 From: viv Date: Wed, 3 Apr 2024 14:57:13 +1100 Subject: [PATCH 3/3] Update UtilsTest.java --- src/test/java/org/openapitools/UtilsTest.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/test/java/org/openapitools/UtilsTest.java b/src/test/java/org/openapitools/UtilsTest.java index bd3c1cd8..6548f069 100644 --- a/src/test/java/org/openapitools/UtilsTest.java +++ b/src/test/java/org/openapitools/UtilsTest.java @@ -47,18 +47,4 @@ public void testGenerateChallenge() { () -> assertNotNull(result.get("codeChallenge")) ); } - - @Test - public void testValidationURL() { - String url = "https://test.com"; - Boolean result = utils.validateURL(url); - assertEquals(Boolean.TRUE, result); - } - - @Test - public void testValidationUrlInvalid() { - String urlInvalid = "test.c"; - boolean result = utils.validateURL(urlInvalid); - assertNotEquals(result, true); - } }