libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-797

Browse source 
login-status-iframe.html fails if domain contains hyphen
This commit is contained in:
Stian Thorgersen 2014-10-29 14:02:38 +01:00
parent 8c2d4812b0
commit 05b6dc7af4
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/keycloak/util/UriUtils.java
View file

@ -8,7 +8,7 @@ import java.util.regex.Pattern;
*/ */
public class UriUtils { public class UriUtils {
private static final Pattern originPattern = Pattern.compile("(http://|https://)[\\w]+(\\.[\\w]+)*(:[\\d]{2,5})?"); private static final Pattern originPattern = Pattern.compile("(http://|https://)[\\w-]+(\\.[\\w-]+)*(:[\\d]{2,5})?");
public static String getOrigin(URI uri) { public static String getOrigin(URI uri) {
return getOrigin(uri.toString()); return getOrigin(uri.toString());

2
core/src/test/java/org/keycloak/util/UriUtilsTest.java
View file

@ -24,6 +24,8 @@ public class UriUtilsTest {
assertValid("http://192.168.123.123"); assertValid("http://192.168.123.123");
assertValid("https://192.168.123.123"); assertValid("https://192.168.123.123");
assertValid("https://192.168.123.123:8080"); assertValid("https://192.168.123.123:8080");
assertValid("https://sub-sub.test.com");
assertValid("https://sub.test-test.com");
assertInvalid("https://test/"); assertInvalid("https://test/");
assertInvalid("{"); assertInvalid("{");