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 2019/09/09 17:17:03 UTC
[knox] branch master updated: KNOX-1994 - Update Ranger API service
definition to allow separate URL patterns
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new ac21cb6 KNOX-1994 - Update Ranger API service definition to allow separate URL patterns
ac21cb6 is described below
commit ac21cb65ae0f63664b63c4dbabd221bf0831f094
Author: Vishal Suvagia <vi...@apache.org>
AuthorDate: Sun Sep 8 23:39:46 2019 +0530
KNOX-1994 - Update Ranger API service definition to allow separate URL patterns
Signed-off-by: Kevin Risden <kr...@apache.org>
---
.../src/main/resources/services/ranger/1.0.0/rewrite.xml | 14 ++++----------
.../src/main/resources/services/ranger/1.0.0/service.xml | 8 ++------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/rewrite.xml
index 55eae2d..a883e01 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/rewrite.xml
@@ -21,17 +21,11 @@
<rule dir="IN" name="RANGER/ranger/inbound/plugins" pattern="*://*:*/**/ranger/service/plugins/{path=**}?{**}">
<rewrite template="{$serviceUrl[RANGER]}/service/plugins/{path=**}?{**}"/>
</rule>
- <rule dir="IN" name="RANGER/ranger/inbound/users/path" pattern="*://*:*/**/ranger/service/xusers/users/{path=**}?{**}">
- <rewrite template="{$serviceUrl[RANGER]}/service/xusers/users/{path=**}?{**}"/>
+ <rule dir="IN" name="RANGER/ranger/inbound/xusers/path" pattern="*://*:*/**/ranger/service/xusers/{path=**}?{**}">
+ <rewrite template="{$serviceUrl[RANGER]}/service/xusers/{path=**}?{**}"/>
</rule>
- <rule dir="IN" name="RANGER/ranger/inbound/users" pattern="*://*:*/**/ranger/service/xusers/users">
- <rewrite template="{$serviceUrl[RANGER]}/service/xusers/users"/>
- </rule>
- <rule dir="IN" name="RANGER/ranger/inbound/groups/path" pattern="*://*:*/**/ranger/service/xusers/groups/{path=**}?{**}">
- <rewrite template="{$serviceUrl[RANGER]}/service/xusers/groups/{path=**}?{**}"/>
- </rule>
- <rule dir="IN" name="RANGER/ranger/inbound/groups" pattern="*://*:*/**/ranger/service/xusers/groups">
- <rewrite template="{$serviceUrl[RANGER]}/service/xusers/groups"/>
+ <rule dir="IN" name="RANGER/ranger/inbound/assets/path" pattern="*://*:*/**/ranger/service/assets/{path=**}?{**}">
+ <rewrite template="{$serviceUrl[RANGER]}/service/assets/{path=**}?{**}"/>
</rule>
<rule dir="IN" name="RANGER/ranger/inbound/healthcheck" pattern="*://*:*/**/ranger">
<rewrite template="{$serviceUrl[RANGER]}"/>
diff --git a/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/service.xml b/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/service.xml
index 05b9900..fef619c 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/1.0.0/service.xml
@@ -18,12 +18,8 @@
<routes>
<route path="/ranger/service/public/**"/>
<route path="/ranger/service/plugins/**"/>
- <route path="/ranger/service/xusers/users/**"/>
- <route path="/ranger/service/xusers/users/"/>
- <route path="/ranger/service/xusers/users"/>
- <route path="/ranger/service/xusers/groups/**"/>
- <route path="/ranger/service/xusers/groups/"/>
- <route path="/ranger/service/xusers/groups"/>
+ <route path="/ranger/service/xusers/**"/>
+ <route path="/ranger/service/assets/**"/>
<route path="/ranger"/>
</routes>
<dispatch classname="org.apache.knox.gateway.dispatch.DefaultDispatch"/>