-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SNOW-760534 Added URLValidator and URLEncoder (#1297)
- Loading branch information
1 parent
e798047
commit 4be4b18
Showing
3 changed files
with
91 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved. | ||
*/ | ||
package net.snowflake.client.core; | ||
|
||
import java.io.UnsupportedEncodingException; | ||
import java.net.MalformedURLException; | ||
import java.net.URISyntaxException; | ||
import java.net.URL; | ||
import java.net.URLEncoder; | ||
import java.nio.charset.StandardCharsets; | ||
import java.util.regex.Matcher; | ||
import java.util.regex.Pattern; | ||
import java.util.regex.PatternSyntaxException; | ||
import javax.annotation.Nullable; | ||
import net.snowflake.client.log.SFLogger; | ||
import net.snowflake.client.log.SFLoggerFactory; | ||
|
||
public class URLUtil { | ||
|
||
static final SFLogger logger = SFLoggerFactory.getLogger(URLUtil.class); | ||
static final String validURLPattern = | ||
"^http(s?)\\:\\/\\/[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z@:])*(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\.\\?\\,\\&\\(\\)\\/\\\\\\+&%\\$#_=@]*)?$"; | ||
static final Pattern pattern = Pattern.compile(validURLPattern); | ||
|
||
public static boolean isValidURL(String url) { | ||
try { | ||
Matcher matcher = pattern.matcher(url); | ||
return matcher.find(); | ||
} catch (PatternSyntaxException pex) { | ||
logger.debug("The URL REGEX is invalid. Falling back to basic sanity test"); | ||
try { | ||
new URL(url).toURI(); | ||
return true; | ||
} catch (MalformedURLException mex) { | ||
logger.debug("The URL " + url + ", is invalid"); | ||
return false; | ||
} catch (URISyntaxException uex) { | ||
logger.debug("The URL " + url + ", is invalid"); | ||
return false; | ||
} | ||
} | ||
} | ||
|
||
@Nullable | ||
public static String urlEncode(String target) throws UnsupportedEncodingException { | ||
String encodedTarget; | ||
try { | ||
encodedTarget = URLEncoder.encode(target, StandardCharsets.UTF_8.toString()); | ||
} catch (UnsupportedEncodingException uex) { | ||
logger.debug("The string to be encoded- " + target + ", is invalid"); | ||
return null; | ||
} | ||
return encodedTarget; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
* Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved. | ||
*/ | ||
package net.snowflake.client.core; | ||
|
||
import static org.junit.Assert.*; | ||
|
||
import org.junit.Test; | ||
|
||
public class URLUtilTest { | ||
|
||
@Test | ||
public void testValidURL() throws Exception { | ||
assertTrue(URLUtil.isValidURL("https://ssoTestURL.okta.com")); | ||
assertTrue(URLUtil.isValidURL("https://ssoTestURL.okta.com:8080")); | ||
assertTrue(URLUtil.isValidURL("https://ssoTestURL.okta.com/testpathvalue")); | ||
} | ||
|
||
@Test | ||
public void testInvalidURL() throws Exception { | ||
assertFalse(URLUtil.isValidURL("-a Calculator")); | ||
assertFalse(URLUtil.isValidURL("This is random text")); | ||
assertFalse(URLUtil.isValidURL("file://TestForFile")); | ||
} | ||
|
||
@Test | ||
public void testEncodeURL() throws Exception { | ||
assertEquals(URLUtil.urlEncode("Hello @World"), "Hello+%40World"); | ||
assertEquals(URLUtil.urlEncode("Test//String"), "Test%2F%2FString"); | ||
} | ||
} |
4be4b18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
still, it may have arbitrary code execution problem after this pattern validate. for example "https://test.com/&id"
4be4b18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
我试过了不可以