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/08/26 23:50:46 UTC
[knox] branch master updated: KNOX-1994 - Update Ranger API service
definition to allow separate URL patterns (#136)
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 a6197d1 KNOX-1994 - Update Ranger API service definition to allow separate URL patterns (#136)
a6197d1 is described below
commit a6197d16cf723a4d87e433ae805dbe36fca9e823
Author: Vishal Suvagia <vi...@users.noreply.github.com>
AuthorDate: Tue Aug 27 05:20:41 2019 +0530
KNOX-1994 - Update Ranger API service definition to allow separate URL patterns (#136)
---
.../src/main/resources/services/ranger/1.0.0/rewrite.xml | 10 ++++++++--
.../src/main/resources/services/ranger/1.0.0/service.xml | 4 ++++
2 files changed, 12 insertions(+), 2 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 e53e9cb..55eae2d 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,12 +21,18 @@
<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/plugins" pattern="*://*:*/**/ranger/service/xusers/users/{path=**}?{**}">
+ <rule dir="IN" name="RANGER/ranger/inbound/users/path" pattern="*://*:*/**/ranger/service/xusers/users/{path=**}?{**}">
<rewrite template="{$serviceUrl[RANGER]}/service/xusers/users/{path=**}?{**}"/>
</rule>
- <rule dir="IN" name="RANGER/ranger/inbound/plugins" pattern="*://*:*/**/ranger/service/xusers/groups/{path=**}?{**}">
+ <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>
<rule dir="IN" name="RANGER/ranger/inbound/healthcheck" pattern="*://*:*/**/ranger">
<rewrite template="{$serviceUrl[RANGER]}"/>
</rule>
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 47c377b..05b9900 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
@@ -19,7 +19,11 @@
<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"/>
</routes>
<dispatch classname="org.apache.knox.gateway.dispatch.DefaultDispatch"/>