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 3e73a7a KNOX-1876 - Zeppelin should default to trusted proxy for
service definition (#100)
3e73a7a is described below
commit 3e73a7a04eb71f00611a027ddcd5fea37ae34187
Author: Kevin Risden <[email protected]>
AuthorDate: Thu Jun 13 14:30:13 2019 -0400
KNOX-1876 - Zeppelin should default to trusted proxy for service definition
(#100)
Signed-off-by: Kevin Risden <[email protected]>
---
.../services/zeppelinui/0.8.1/rewrite.xml | 197 +++++++++++++++++++++
.../services/zeppelinui/0.8.1/service.xml | 96 ++++++++++
.../services/zeppelinws/0.8.1/rewrite.xml | 27 +++
.../services/zeppelinws/0.8.1/service.xml | 28 +++
4 files changed, 348 insertions(+)
diff --git
a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/rewrite.xml
b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/rewrite.xml
new file mode 100644
index 0000000..2b866eb
--- /dev/null
+++
b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/rewrite.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<rules>
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/favicon"
pattern="*://*:*/**/zeppelin/favicon.ico">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/favicon.ico"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/root"
pattern="*://*:*/**/zeppelin/">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/rootAppScript"
pattern="*://*:*/**/zeppelin/{path=**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{path=**}"/>
+ </rule>
+
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/notebook"
pattern="*://*:*/**/zeppelin/{**}/notebook/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{**}/notebook/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/interpreter"
pattern="*://*:*/**/zeppelin/{**}/interpreter/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{**}/interpreter/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/credential"
pattern="*://*:*/**/zeppelin/{**}/credential/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{**}/credential/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/configuration"
pattern="*://*:*/**/zeppelin/{**}/configuration/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{**}/configuration/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/api"
pattern="*://*:*/**/zeppelin/api/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/api/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/components"
pattern="*://*:*/**/zeppelin/components/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/components/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/app"
pattern="*://*:*/**/zeppelin/app/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/app/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/app/notebook"
pattern="*://*:*/**/zeppelin/app/notebook/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/app/notebook/{**}"/>
+ </rule>
+
+ <!-- Resources -->
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/styles"
pattern="*://*:*/**/zeppelin/styles/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/styles/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/scripts"
pattern="*://*:*/**/zeppelin/scripts/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/scripts/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/extensions"
pattern="*://*:*/**/zeppelin/extensions/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/extensions/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/jax"
pattern="*://*:*/**/zeppelin/jax/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/jax/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/components"
pattern="*://*:*/**/zeppelin/components/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/components/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/assets"
pattern="*://*:*/**/zeppelin/assets/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/assets/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/fonts"
pattern="*://*:*/**/zeppelin/fonts/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/fonts/{**}"/>
+ </rule>
+
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/css"
pattern="styles/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/styles/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/assets/styles"
pattern="assets/styles/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/assets/styles/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/assets"
pattern="assets/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/assets/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript"
pattern="scripts/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/scripts/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript"
pattern="extensions/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/extensions/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript"
pattern="jax/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/jax/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript"
pattern="components/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/components/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript"
pattern="{path=app.**}">
+ <rewrite template="{$frontend[path]}/zeppelin/{path=app.**}"/>
+ </rule>
+
+ <!--
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/component/tick"
pattern="'components/{**}">
+ <rewrite template="{$prefix[',url]}/zeppelin/components/{**}"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/component/tick"
pattern="'app/{**}">
+ <rewrite template="{$prefix[',url]}/zeppelin/app/{**}"/>
+ </rule>
+ -->
+
+ <!-- Filters -->
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/home" >
+ <rewrite template="{$frontend[path]}/zeppelin/app/home/home.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/notebook" >
+ <rewrite template="{$frontend[path]}/zeppelin/app/notebook/notebook.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/jobmanager" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/jobmanager/jobmanager.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/interpreter" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/interpreter/interpreter.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/notebookRepos" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/notebook-repository/notebook-repository.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/credential" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/credential/credential.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/helium" >
+ <rewrite template="{$frontend[path]}/zeppelin/app/helium/helium.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/configuration" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/configuration/configuration.html"/>
+ </rule>
+
+ <rule dir="OUT"
name="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/searchTerm" >
+ <rewrite
template="{$frontend[path]}/zeppelin/app/search/result-list.html"/>
+ </rule>
+
+ <!-- Rewrite the outgoing content for /api/ticket -->
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/api/login"
pattern="*://*:*/api/login">
+ <rewrite template="{$frontend[path]}/zeppelin/api/login"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/api"
pattern="*://*:*/api/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/api/{**}"/>
+ </rule>
+
+ <filter name="ZEPPELINUI/zeppelin/outbound/javascript/filter">
+ <content type="application/javascript">
+ <apply path="app/home/home.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/home"/>
+ <apply path="app/notebook/notebook.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/notebook"/>
+ <apply path="app/jobmanager/jobmanager.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/jobmanager"/>
+ <apply path="app/interpreter/interpreter.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/interpreter"/>
+ <apply path="app/notebook-repository/notebook-repository.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/notebookRepos"/>
+ <apply path="app/credential/credential.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/credential"/>
+ <apply path="app/helium/helium.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/helium"/>
+ <apply path="app/configuration/configuration.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/configuration"/>
+ <apply path="app/search/result-list.html"
rule="ZEPPELINUI/zeppelin/outbound/javascript/filter/app/searchTerm"/>
+ </content>
+ </filter>
+
+</rules>
diff --git
a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/service.xml
b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/service.xml
new file mode 100644
index 0000000..d010d08
--- /dev/null
+++
b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.8.1/service.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<service role="ZEPPELINUI" name="zeppelinui" version="0.8.1">
+ <routes>
+ <!-- Filter -->
+ <route path="/zeppelin/scripts/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/outbound/javascript/filter"
to="response.body"/>
+ </route>
+
+ <route path="/zeppelin/favicon.ico">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/favicon" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/root" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/*.js">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/rootAppScript"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/*.woff">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/rootAppScript"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/*.ttf">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/rootAppScript"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/*.css">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/rootAppScript"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/api/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/api" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/components/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/components"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/app/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/app" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/app/notebook/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/app/notebook"
to="request.url"/>
+ </route>
+
+ <!-- Resources -->
+ <route path="/zeppelin/styles/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/styles" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/scripts/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/scripts" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/extensions/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/extensions"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/jax/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/jax" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/components/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/components"
to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/assets/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/assets" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/fonts/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/fonts" to="request.url"/>
+ </route>
+
+ </routes>
+ <dispatch classname="org.apache.knox.gateway.dispatch.DefaultDispatch"/>
+</service>
diff --git
a/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/rewrite.xml
b/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/rewrite.xml
new file mode 100644
index 0000000..5572e9d
--- /dev/null
+++
b/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/rewrite.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<rules>
+
+ <rule dir="IN" name="ZEPPELINWS/zeppelin/ws/inbound" pattern="*://*:*/**/ws">
+ <rewrite template="{$serviceUrl[ZEPPELINWS]}/ws"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINWS/zeppelin/inbound"
pattern="*://*:*/**/ws{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINWS]}/ws{**}"/>
+ </rule>
+</rules>
\ No newline at end of file
diff --git
a/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/service.xml
b/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/service.xml
new file mode 100644
index 0000000..b1d30ac
--- /dev/null
+++
b/gateway-service-definitions/src/main/resources/services/zeppelinws/0.8.1/service.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<service role="ZEPPELINWS" name="zeppelinws" version="0.8.1">
+ <routes>
+ <route path="/zeppelin/ws">
+ <rewrite apply="ZEPPELINWS/zeppelin/ws/inbound" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/ws**">
+ <rewrite apply="ZEPPELINWS/zeppelin/inbound" to="request.url"/>
+ </route>
+ </routes>
+</service>
