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/03/05 17:12:25 UTC

[knox] branch master updated: KNOX-1802 - Ranger /service/plugins and healthcheck endpoint needs to be exposed through Knox.

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 283d638  KNOX-1802 - Ranger /service/plugins and healthcheck endpoint needs to be exposed through Knox.
283d638 is described below

commit 283d638f728015120cd9838ac7676f8b8b649d3b
Author: Mukund Thakur <mt...@hortonworks.com>
AuthorDate: Tue Mar 5 15:20:38 2019 +0530

    KNOX-1802 - Ranger /service/plugins and healthcheck endpoint needs to be exposed through Knox.
    
    Signed-off-by: Kevin Risden <kr...@apache.org>
---
 .../src/main/resources/services/ranger/0.1.0.0/rewrite.xml     | 10 ++++++++--
 .../src/main/resources/services/ranger/0.1.0.0/service.xml     |  2 ++
 .../src/main/resources/services/ranger/0.5.0/rewrite.xml       | 10 ++++++++--
 .../src/main/resources/services/ranger/0.5.0/service.xml       |  2 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/rewrite.xml
index 772c271..5683f8e 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/rewrite.xml
@@ -15,7 +15,13 @@
    limitations under the License.
 -->
 <rules>
-    <rule dir="IN" name="RANGER/ranger/inbound" pattern="*://*:*/**/ranger/service/public/{path=**}?{**}">
+    <rule dir="IN" name="RANGER/ranger/inbound/public" pattern="*://*:*/**/ranger/service/public/{path=**}?{**}">
         <rewrite template="{$serviceUrl[RANGER]}/service/public/{path=**}?{**}"/>
     </rule>
-</rules>
\ No newline at end of file
+    <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/healthcheck" pattern="*://*:*/**/ranger">
+        <rewrite template="{$serviceUrl[RANGER]}"/>
+    </rule>
+</rules>
diff --git a/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/service.xml b/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/service.xml
index fc95bd5..c652b19 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/0.1.0.0/service.xml
@@ -17,6 +17,8 @@
 <service role="RANGER" name="ranger" version="0.1.0.0">
     <routes>
         <route path="/ranger/service/public/**"/>
+        <route path="/ranger/service/plugins/**"/>
+        <route path="/ranger"/>
     </routes>
     <dispatch classname="org.apache.knox.gateway.dispatch.DefaultDispatch"/>
 </service>
diff --git a/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/rewrite.xml
index 772c271..5683f8e 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/rewrite.xml
@@ -15,7 +15,13 @@
    limitations under the License.
 -->
 <rules>
-    <rule dir="IN" name="RANGER/ranger/inbound" pattern="*://*:*/**/ranger/service/public/{path=**}?{**}">
+    <rule dir="IN" name="RANGER/ranger/inbound/public" pattern="*://*:*/**/ranger/service/public/{path=**}?{**}">
         <rewrite template="{$serviceUrl[RANGER]}/service/public/{path=**}?{**}"/>
     </rule>
-</rules>
\ No newline at end of file
+    <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/healthcheck" pattern="*://*:*/**/ranger">
+        <rewrite template="{$serviceUrl[RANGER]}"/>
+    </rule>
+</rules>
diff --git a/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/service.xml b/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/service.xml
index eb21090..643a1f3 100644
--- a/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/ranger/0.5.0/service.xml
@@ -24,6 +24,8 @@
     </policies>
     <routes>
         <route path="/ranger/service/public/**"/>
+        <route path="/ranger/service/plugins/**"/>
+        <route path="/ranger"/>
     </routes>
     <dispatch classname="org.apache.knox.gateway.dispatch.PassAllHeadersDispatch"/>
 </service>