You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/11/14 14:52:31 UTC
knox git commit: KNOX-1577 - Knox automatically derived dispatch
whitelist doesn't seem to actually match the knox domain
Repository: knox
Updated Branches:
refs/heads/master f32d86085 -> 986172bb5
KNOX-1577 - Knox automatically derived dispatch whitelist doesn't seem to actually match the knox domain
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/986172bb
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/986172bb
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/986172bb
Branch: refs/heads/master
Commit: 986172bb5790e504839355d280482c0bbf967271
Parents: f32d860
Author: pzampino <pz...@gmail.com>
Authored: Fri Nov 9 14:11:22 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Nov 14 09:20:46 2018 -0500
----------------------------------------------------------------------
.../main/java/org/apache/knox/gateway/util/WhitelistUtils.java | 2 +-
.../java/org/apache/knox/gateway/util/WhitelistUtilsTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/986172bb/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java b/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
index cc91ffd..09eaefe 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
@@ -34,7 +34,7 @@ public class WhitelistUtils {
static final String LOCALHOST_REGEXP = "^" + LOCALHOST_REGEXP_SEGMENT + "$";
- static final String DEFAULT_DISPATCH_WHITELIST_TEMPLATE = "^/.*$;^https?://%s:[0-9]+/?.*$";
+ static final String DEFAULT_DISPATCH_WHITELIST_TEMPLATE = "^\\/.*$;^https?:\\/\\/%s:[0-9]+\\/?.*$";
private static final String IP_ADDRESS_REGEX = "^(?:[0-9]{1,3}\\.){3}[0-9]{1,3}$";
http://git-wip-us.apache.org/repos/asf/knox/blob/986172bb/gateway-spi/src/test/java/org/apache/knox/gateway/util/WhitelistUtilsTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/util/WhitelistUtilsTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/util/WhitelistUtilsTest.java
index de95fa8..dc50588 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/util/WhitelistUtilsTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/util/WhitelistUtilsTest.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -79,7 +80,7 @@ public class WhitelistUtilsTest {
"host0.test.org",
serviceRole);
assertNotNull(whitelist);
- assertTrue(whitelist.contains("\\.test\\.org"));
+ assertEquals("^\\/.*$;^https?:\\/\\/(.+\\.test\\.org):[0-9]+\\/?.*$", whitelist); // KNOX-1577
}
@Test