You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/13 03:00:35 UTC
[1/5] KNOX-118: Add rewrite functions to allow use of service
registry within rewrite rules. Also includes initial integration of this with
Oozie.
Updated Branches:
refs/heads/master 493cfa7e1 -> 2f135e165
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java b/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
deleted file mode 100644
index c337d7e..0000000
--- a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.deploy.DeploymentContext;
-import org.apache.hadoop.gateway.topology.Provider;
-import org.easymock.EasyMock;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SecureQueryDeploymentContributorTest {
-
- @Test
- public void testDeployment() throws IOException {
- WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-acrhive" );
-
-// UrlRewriteRulesDescriptorImpl rewriteRules = new UrlRewriteRulesDescriptorImpl();
-
- Map<String,String> providerParams = new HashMap<String, String>();
-// providerParams.put( "test-host-external", "test-host-internal" );
- Provider provider = new Provider();
- provider.setEnabled( true );
- provider.setName( "secure-query" );
- provider.setParams( providerParams );
-
- DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
-// EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rewriteRules ).anyTimes();
- EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
- EasyMock.replay( context );
-
- SecureQueryDeploymentContributor contributor = new SecureQueryDeploymentContributor();
-
- assertThat( contributor.getRole(), is( "secure-query" ) );
- assertThat( contributor.getName(), is( "default" ) );
-
- // Just make sure it doesn't blow up.
- contributor.contributeFilter( null, null, null, null, null );
-
- // Just make sure it doesn't blow up.
- contributor.initializeContribution( context );
-
- contributor.contributeProvider( context, provider );
-
-// HostmapFunctionDescriptor funcDesc = rewriteRules.getFunction( "hostmap" );
-// assertThat( funcDesc.config(), is( "/WEB-INF/hostmap.txt" ) );
-//
-// Node node = webArchive.get( "/WEB-INF/hostmap.txt" );
-// String asset = IOUtils.toString( node.getAsset().openStream() );
-// assertThat( asset, containsString( "test-host-external=test-host-internal" ) );
-
- // Just make sure it doesn't blow up.
- contributor.finalizeContribution( context );
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java b/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
deleted file mode 100644
index bdf1ad0..0000000
--- a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SecureQueryEncodeDescriptorTest {
-
- @Test
- public void testGetAndSet() {
- SecureQueryEncodeDescriptor descriptor = new SecureQueryEncodeDescriptor();
- assertThat( descriptor.type(), is( "encode-query" ) );
- assertThat( descriptor.getParam(), nullValue() );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java b/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
deleted file mode 100644
index 4003be3..0000000
--- a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.util.urltemplate.Parser;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.junit.Test;
-import sun.misc.BASE64Encoder;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SecureQueryEncodeProcessorTest {
-
- @Test
- public void testSimpleQueryEncoding() throws Exception {
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
-
- Template inTemplate = Parser.parse( "http://host:0/root/path?query" );
- UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
- EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
- Capture<Template> outTemplate = new Capture<Template>();
- context.setCurrentUrl( EasyMock.capture( outTemplate ) );
-
- EasyMock.replay( environment, context );
-
- SecureQueryEncodeDescriptor descriptor = new SecureQueryEncodeDescriptor();
- SecureQueryEncodeProcessor processor = new SecureQueryEncodeProcessor();
- processor.initialize( environment, descriptor );
- processor.process( context );
-
- BASE64Encoder encoder = new BASE64Encoder();
- String encQuery = encoder.encode( "query".getBytes("utf-8" ) );
- encQuery = encQuery.replaceAll( "\\=", "" );
- String outExpect = "http://host:0/root/path?_=" + encQuery;
- String outActual = outTemplate.getValue().toString();
- assertThat( outActual, is( outExpect ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 2a5cdf1..0f2b601 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -143,11 +143,15 @@
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-secure-query</artifactId>
+ <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-hostmap-static</artifactId>
+ <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
index 5c2dd18..062b9ff 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
@@ -99,7 +99,7 @@ public class GatewayServer {
}
Map<String,String> options = new HashMap<String,String>();
options.put(GatewayCommandLine.PERSIST_LONG, Boolean.toString(cmd.hasOption(GatewayCommandLine.PERSIST_LONG)));
- ((org.apache.hadoop.gateway.services.Service) services).init(config, options);
+ services.init(config, options);
if (!cmd.hasOption(GatewayCommandLine.NOSTART_LONG)) {
startGateway( config, services );
}
@@ -164,38 +164,6 @@ public class GatewayServer {
return properties;
}
-// private static void setupGateway() {
-// try {
-// GatewayConfig config = new GatewayConfigImpl();
-// String home = config.getGatewayHomeDir();
-//
-// File homeDir = new File( home ).getAbsoluteFile();
-// if( !homeDir.exists() ) {
-// log.creatingGatewayHomeDir( homeDir );
-// homeDir.mkdirs();
-// }
-//
-// File defaultConfigFile = new File( homeDir, "conf/gateway-site.xml" );
-// if( !defaultConfigFile.exists() ) {
-// log.creatingDefaultConfigFile( defaultConfigFile );
-// extractToFile( "conf/gateway-site.xml", defaultConfigFile );
-// }
-//
-// File topologiesDir = calculateAbsoluteTopologiesDir( config );
-// if( !topologiesDir.exists() ) {
-// log.creatingGatewayDeploymentDir( topologiesDir );
-// topologiesDir.mkdirs();
-//
-// File defaultTopologyFile = new File( topologiesDir, "cluster.xml" );
-// log.creatingDefaultTopologyFile( defaultTopologyFile );
-// extractToFile( "cluster-sample.xml", defaultTopologyFile );
-// }
-//
-// } catch( IOException e ) {
-// e.printStackTrace();
-// }
-// }
-
private static void extractToFile( String resource, File file ) throws IOException {
InputStream input = ClassLoader.getSystemResourceAsStream( resource );
OutputStream output = new FileOutputStream( file );
@@ -208,7 +176,7 @@ public class GatewayServer {
try {
log.startingGateway();
server = new GatewayServer( config );
- synchronized (server ) {
+ synchronized ( server ) {
if (services == null) {
services = svcs;
}
@@ -282,7 +250,7 @@ public class GatewayServer {
jetty = new Server(address);
}
if (config.isSSLEnabled()) {
- SSLService ssl = (SSLService) services.getService("SSLService");
+ SSLService ssl = services.getService("SSLService");
Connector connector = (Connector) ssl.buildSSlConnector(config.getGatewayHomeDir());
connector.setHost(address.getHostName());
connector.setPort(address.getPort());
@@ -342,6 +310,7 @@ public class GatewayServer {
context.setContextPath( "/" + config.getGatewayPath() + "/" + name );
context.setWar( warPath );
internalUndeploy( topology );
+ context.setAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE, name );
deployments.put( name, context );
contexts.addHandler( context );
try {
@@ -354,7 +323,7 @@ public class GatewayServer {
private synchronized void internalUndeploy( Topology topology ) {
WebAppContext context = deployments.remove( topology.getName() );
if( context != null ) {
- ServiceRegistry sr = (ServiceRegistry) this.getGatewayServices().getService(GatewayServices.SERVICE_REGISTRY_SERVICE);
+ ServiceRegistry sr = getGatewayServices().getService(GatewayServices.SERVICE_REGISTRY_SERVICE);
if (sr != null) {
sr.removeClusterServices(topology.getName());
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServlet.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServlet.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServlet.java
index d0b5a40..0764663 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServlet.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServlet.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.gateway.descriptor.GatewayDescriptor;
import org.apache.hadoop.gateway.descriptor.GatewayDescriptorFactory;
import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
import org.apache.hadoop.gateway.i18n.resources.ResourcesFactory;
+import org.apache.hadoop.gateway.services.GatewayServices;
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-server/src/main/java/org/apache/hadoop/gateway/services/DefaultGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/DefaultGatewayServices.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/DefaultGatewayServices.java
index b17c98c..23fa983 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/DefaultGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/DefaultGatewayServices.java
@@ -17,20 +17,12 @@
*/
package org.apache.hadoop.gateway.services;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.hadoop.gateway.GatewayMessages;
import org.apache.hadoop.gateway.config.GatewayConfig;
import org.apache.hadoop.gateway.deploy.DeploymentContext;
import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
-import org.apache.hadoop.gateway.services.GatewayServices;
-import org.apache.hadoop.gateway.services.Service;
-import org.apache.hadoop.gateway.services.ServiceLifecycleException;
import org.apache.hadoop.gateway.services.registry.impl.DefaultServiceRegistryService;
import org.apache.hadoop.gateway.services.security.KeystoreServiceException;
import org.apache.hadoop.gateway.services.security.SSLService;
@@ -42,6 +34,11 @@ import org.apache.hadoop.gateway.services.security.impl.JettySSLService;
import org.apache.hadoop.gateway.services.token.impl.DefaultTokenAuthorityService;
import org.apache.hadoop.gateway.topology.Provider;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class DefaultGatewayServices implements GatewayServices {
private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
@@ -85,6 +82,11 @@ public class DefaultGatewayServices implements GatewayServices {
ssl.setMasterService(ms);
ssl.init(config, options);
services.put(SSL_SERVICE, ssl);
+
+ DefaultServiceRegistryService sr = new DefaultServiceRegistryService();
+ sr.setCryptoService( crypto );
+ sr.init( config, options );
+ services.put( SERVICE_REGISTRY_SERVICE, sr );
}
public void start() throws ServiceLifecycleException {
@@ -123,8 +125,8 @@ public class DefaultGatewayServices implements GatewayServices {
* @see org.apache.hadoop.gateway.GatewayServices#getService(java.lang.String)
*/
@Override
- public Service getService(String serviceName) {
- return services.get(serviceName);
+ public <T> T getService(String serviceName) {
+ return (T)services.get(serviceName);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
index 1711dc8..e9f59f1 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
@@ -128,8 +128,8 @@ public class HssoGatewayServices implements GatewayServices {
* @see org.apache.hadoop.gateway.GatewayServices#getService(java.lang.String)
*/
@Override
- public Service getService(String serviceName) {
- return services.get(serviceName);
+ public <T> T getService(String serviceName) {
+ return (T)services.get( serviceName );
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-service-oozie/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/pom.xml b/gateway-service-oozie/pom.xml
index cb9a981..79da81b 100644
--- a/gateway-service-oozie/pom.xml
+++ b/gateway-service-oozie/pom.xml
@@ -47,10 +47,31 @@
</dependency>
<dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
index 6a16f62..d685757 100644
--- a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
+++ b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
@@ -20,16 +20,20 @@ package org.apache.hadoop.gateway.oozie;
import org.apache.hadoop.gateway.deploy.DeploymentContext;
import org.apache.hadoop.gateway.deploy.ServiceDeploymentContributorBase;
import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRuleDescriptor;
import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionRewriteDescriptorExt;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory;
import org.apache.hadoop.gateway.topology.Service;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.net.URISyntaxException;
public class OozieDeploymentContributor extends ServiceDeploymentContributorBase {
private static final String EXTERNAL_PATH = "/oozie/api";
+ private static final String RULES_RESOURCE = OozieDeploymentContributor.class.getName().replace( '.', '/' ) + "/rewrite.xml";
@Override
public String getRole() {
@@ -47,22 +51,50 @@ public class OozieDeploymentContributor extends ServiceDeploymentContributorBase
contributeResources( context, service );
}
- private void contributeRewriteRules( DeploymentContext context, Service service ) throws URISyntaxException {
- UrlRewriteRulesDescriptor rules = context.getDescriptor( "rewrite" );
- UrlRewriteRuleDescriptor rule;
- UrlRewriteActionRewriteDescriptorExt rewrite;
-
- rule = rules.addRule( getRole() + "/" + getName() + "/root/inbound" )
- .directions( "inbound" )
- .pattern( "*://*:*/**" + EXTERNAL_PATH + "/{**}?{**}" );
- rewrite = rule.addStep( "rewrite" );
- rewrite.template( service.getUrl().toExternalForm() + "/{**}?{**}" );
+ UrlRewriteRulesDescriptor loadRulesFromTemplate() throws IOException {
+// VelocityEngine engine = new VelocityEngine();
+// engine.setProperty( RuntimeConstants.RESOURCE_LOADER, "classpath" );
+// engine.setProperty( "classpath.resource.loader.class", ClasspathResourceLoader.class.getName() );
+// engine.init();
+// VelocityContext context = new VelocityContext();
+// //context.put( "name", new String( "Velocity" ) );
+// Template template = engine.getTemplate( OozieDeploymentContributor.class.getName().replace( '.', '/' ) + "/rewrite.xml.vm");
+// StringWriter writer = new StringWriter();
+// template.merge( context, writer );
+// String string = writer.toString();
+ InputStream stream = this.getClass().getClassLoader().getResourceAsStream( RULES_RESOURCE );
+ Reader reader = new InputStreamReader( stream );
+ UrlRewriteRulesDescriptor rules = UrlRewriteRulesDescriptorFactory.load( "xml", reader );
+ reader.close();
+ stream.close();
+ return rules;
+ }
- rule = rules.addRule( getRole() + "/" + getName() + "/api/inbound" )
- .directions( "inbound" )
- .pattern( "*://*:*/**" + EXTERNAL_PATH + "/v1/{**}?{**}" );
- rewrite = rule.addStep( "rewrite" );
- rewrite.template( service.getUrl().toExternalForm() + "/v1/{**}?{**}" );
+ private void contributeRewriteRules( DeploymentContext context, Service service ) throws URISyntaxException, IOException {
+ UrlRewriteRulesDescriptor oozieRules = loadRulesFromTemplate();
+ UrlRewriteRulesDescriptor clusterRules = context.getDescriptor( "rewrite" );
+ clusterRules.addRules( oozieRules );
+// UrlRewriteRuleDescriptor rule;
+// UrlRewriteActionRewriteDescriptorExt rewrite;
+//
+// String prefix = getRole() + "/" + getName();
+//
+// rule = clusterRules.addRule( prefix + "/root/inbound" )
+// .directions( "inbound" )
+// .pattern( "*://*:*/**" + EXTERNAL_PATH + "/{**}?{**}" );
+// rewrite = rule.addStep( "rewrite" );
+// rewrite.template( service.getUrl().toExternalForm() + "/{**}?{**}" );
+//
+// rule = clusterRules.addRule( prefix + "/api/inbound" )
+// .directions( "inbound" )
+// .pattern( "*://*:*/**" + EXTERNAL_PATH + "/v1/{**}?{**}" );
+// rewrite = rule.addStep( "rewrite" );
+// rewrite.template( service.getUrl().toExternalForm() + "/v1/{**}?{**}" );
+//
+// UrlRewriteFilterDescriptor filter;
+// UrlRewriteFilterContentDescriptor content;
+// UrlRewriteFilterBufferDescriptor buffer;
+// UrlRewriteFilterDetectDescriptor detect;
}
public void contributeResources( DeploymentContext context, Service service ) throws URISyntaxException {
@@ -94,4 +126,4 @@ public class OozieDeploymentContributor extends ServiceDeploymentContributorBase
context.contributeFilter( service, resource, "dispatch", null, null );
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml b/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
new file mode 100644
index 0000000..a4cb3b9
--- /dev/null
+++ b/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
@@ -0,0 +1,69 @@
+<!--
+ 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="OOZIE/oozie/root" pattern="*://*:*/**/oozie/api/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/{**}?{**}"/>
+ </rule>
+
+ <rule dir="IN" name="OOZIE/oozie/api" pattern="*://*:*/**/oozie/api/v1/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/v1/{**}?{**}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/user-name">
+ <rewrite template="{$username}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/name-node-url">
+ <rewrite template="hdfs://{$serviceAddr[NAMENODE-RPC]}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/job-tracker-address">
+ <rewrite template="{$serviceAddr[JOBTRACKER]}"/>
+ </rule>
+
+ <rule name="OOZIE/oozie/hdfs-path">
+ <match pattern="{path=**}"/>
+ <rewrite template="hdfs://{$serviceHost[NAMENODE-RPC]}:{$servicePort[NAMENODE-RPC]}/{path=**}"/>
+ </rule>
+
+ <filter name="OOZIE/oozie/configuration">
+ <content type="*/xml">
+ <buffer path="/configuration/property">
+ <detect path="name" value="user.name">
+ <apply path="value" rule="OOZIE/oozie/user-name"/>
+ </detect>
+ <detect path="name" value="nameNode">
+ <apply path="value" rule="OOZIE/oozie/name-node-url"/>
+ </detect>
+ <detect path="name" value="jobTracker">
+ <apply path="value" rule="OOZIE/oozie/job-tracker-address"/>
+ </detect>
+ <detect path="name" value="oozie.wf.application.path">
+ <apply path="value" rule="OOZIE/oozie/hdfs-path"/>
+ </detect>
+ </buffer>
+ </content>
+ <content type="*/json">
+ <apply path="$[user.name]" rule="OOZIE/oozie/user-name"/>
+ <apply path="$[nameNode]" rule="OOZIE/oozie/name-node-url"/>
+ <apply path="$[jobTracker]" rule="OOZIE/oozie/job-tracker-addr"/>
+ <apply path="$[oozie.wf.application.path]" rule="OOZIE/oozie/hdfs-path"/>
+ </content>
+ </filter>
+
+</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-service-oozie/src/test/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/test/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributorTest.java b/gateway-service-oozie/src/test/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributorTest.java
new file mode 100644
index 0000000..2741a06
--- /dev/null
+++ b/gateway-service-oozie/src/test/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributorTest.java
@@ -0,0 +1,114 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.oozie;
+
+import org.apache.hadoop.gateway.deploy.DeploymentContext;
+import org.apache.hadoop.gateway.deploy.ServiceDeploymentContributor;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.impl.UrlRewriteRulesDescriptorImpl;
+import org.apache.hadoop.gateway.topology.Service;
+import org.easymock.EasyMock;
+import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.fail;
+
+public class OozieDeploymentContributorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( ServiceDeploymentContributor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof OozieDeploymentContributor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + OozieDeploymentContributor.class.getName() + " via service loader." );
+ }
+
+
+ @Test
+ public void testLoadRulesFromTemplate() throws IOException {
+ WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-archive" );
+
+ UrlRewriteRulesDescriptorImpl clusterRules = new UrlRewriteRulesDescriptorImpl();
+
+ DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
+ EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( clusterRules ).anyTimes();
+ EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
+
+ Service service = EasyMock.createNiceMock( Service.class );
+ EasyMock.expect( service.getRole() ).andReturn( "OOZIE" ).anyTimes();
+ EasyMock.expect( service.getName() ).andReturn( null ).anyTimes();
+ EasyMock.expect( service.getUrl() ).andReturn( new URL( "http://test-host:777" ) ).anyTimes();
+
+ EasyMock.replay( context, service );
+
+ OozieDeploymentContributor contributor = new OozieDeploymentContributor();
+
+ UrlRewriteRulesDescriptor oozieRules = contributor.loadRulesFromTemplate();
+
+ assertThat( oozieRules, notNullValue() );
+ assertThat( oozieRules.getFilter( "OOZIE/oozie/configuration" ), notNullValue() );
+ }
+
+ @Ignore
+ @Test
+ public void testDeployment() throws Exception {
+ WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-acrhive" );
+
+ UrlRewriteRulesDescriptorImpl rules = new UrlRewriteRulesDescriptorImpl();
+
+ DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
+ EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rules ).anyTimes();
+ EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
+
+ Service service = EasyMock.createNiceMock( Service.class );
+ EasyMock.expect( service.getRole() ).andReturn( "OOZIE" ).anyTimes();
+ EasyMock.expect( service.getName() ).andReturn( null ).anyTimes();
+ EasyMock.expect( service.getUrl() ).andReturn( new URL( "http://test-host:777" ) ).anyTimes();
+
+ EasyMock.replay( context, service );
+
+ OozieDeploymentContributor contributor = new OozieDeploymentContributor();
+ assertThat( contributor.getRole(), is( "OOZIE" ) );
+ assertThat( contributor.getName(), is( "oozie" ) );
+
+ contributor.initializeContribution( context );
+ contributor.contributeService( context, service );
+ contributor.finalizeContribution( context );
+
+ Node node = webArchive.get( "TODO" );
+ assertThat( node, notNullValue() );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/GatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/GatewayServices.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/GatewayServices.java
index d97d3cb..187d559 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/GatewayServices.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/GatewayServices.java
@@ -23,7 +23,10 @@ import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
public interface GatewayServices extends Service, ProviderDeploymentContributor {
+
+ public static final String GATEWAY_CLUSTER_ATTRIBUTE = "org.apache.hadoop.gateway.gateway.cluster";
public static final String GATEWAY_SERVICES_ATTRIBUTE = "org.apache.hadoop.gateway.gateway.services";
+
public static final String SSL_SERVICE = "SSLService";
public static final String CRYPTO_SERVICE = "CryptoService";
public static final String ALIAS_SERVICE = "AliasService";
@@ -32,6 +35,6 @@ public interface GatewayServices extends Service, ProviderDeploymentContributor
public abstract Collection<String> getServiceNames();
- public abstract Service getService(String serviceName);
+ public abstract <T> T getService( String serviceName );
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java
index a73ec00..add02a4 100644
--- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java
+++ b/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.test;
+import org.apache.commons.io.IOUtils;
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -50,4 +52,8 @@ public class TestUtils {
return new InputStreamReader( getResourceStream( clazz, name ), charset );
}
+ public static String getResourceString( Class clazz, String name, String charset ) throws IOException {
+ return IOUtils.toString( getResourceReader( clazz, name, charset ) );
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockRequestMatcher.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockRequestMatcher.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockRequestMatcher.java
index 5e32bfc..b50cc7f 100644
--- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockRequestMatcher.java
+++ b/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockRequestMatcher.java
@@ -292,6 +292,8 @@ public class MockRequestMatcher {
String expect = new String( entity, ( expectEncoding == null ? UTF8.name() : expectEncoding ) );
String actualEncoding = request.getCharacterEncoding();
String actual = IOUtils.toString( request.getInputStream(), actualEncoding == null ? UTF8.name() : actualEncoding );
+// System.out.println( "EXPECT=" + expect );
+// System.out.println( "ACTUAL=" + actual );
assertThat( actual, sameJSONAs( expect ) );
} else if( characterEncoding == null || request.getCharacterEncoding() == null ) {
byte[] bytes = IOUtils.toByteArray( request.getInputStream() );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index 2405947..c1466d7 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -97,7 +97,7 @@ public class GatewayBasicFuncTest {
// Specifies if the GATEWAY_HOME created for the test should be deleted when the test suite is complete.
// This is frequently used during debugging to keep the GATEWAY_HOME around for inspection.
- private static final boolean CLEANUP_TEST = true;
+ private static final boolean CLEANUP_TEST = false;
// private static final boolean USE_GATEWAY = false;
// private static final boolean USE_MOCK_SERVICES = false;
@@ -125,9 +125,11 @@ public class GatewayBasicFuncTest {
driver.setResourceBase( GatewayBasicFuncTest.class );
driver.setupLdap( findFreePort() );
driver.setupService( "NAMENODE", "http://" + TEST_HOST + ":50070/webhdfs/v1", "/cluster/namenode/api/v1", USE_MOCK_SERVICES ); // IPC:8020
+ driver.setupService( "NAMENODE-RPC", "thrift://" + TEST_HOST + ":777", null, USE_MOCK_SERVICES );
driver.setupService( "DATANODE", "http://" + TEST_HOST + ":50075/webhdfs/v1", "/cluster/datanode/api/v1", USE_MOCK_SERVICES ); // CLIENT:50010, IPC:50020
// JobTracker: UI:50030,
// TaskTracker: UI:50060, 127.0.0.1:0
+ driver.setupService( "JOBTRACKER", "thrift://" + TEST_HOST + ":777", null, USE_MOCK_SERVICES );
driver.setupService( "TEMPLETON", "http://" + TEST_HOST + ":50111/templeton/v1", "/cluster/templeton/api/v1", USE_MOCK_SERVICES );
driver.setupService( "OOZIE", "http://" + TEST_HOST + ":11000/oozie", "/cluster/oozie/api", USE_MOCK_SERVICES );
driver.setupService( "HIVE", "http://" + TEST_HOST + ":10000", "/cluster/hive/api/v1", USE_MOCK_SERVICES );
@@ -193,9 +195,15 @@ public class GatewayBasicFuncTest {
.addTag( "role" ).addText( "NAMENODE" )
.addTag( "url" ).addText( driver.getRealUrl( "NAMENODE" ) ).gotoParent()
.addTag( "service" )
+ .addTag( "role" ).addText( "NAMENODE-RPC" )
+ .addTag( "url" ).addText( driver.getRealUrl( "NAMENODE-RPC" ) ).gotoParent()
+ .addTag( "service" )
.addTag( "role" ).addText( "DATANODE" )
.addTag( "url" ).addText( driver.getRealUrl( "DATANODE" ) ).gotoParent()
.addTag( "service" )
+ .addTag( "role" ).addText( "JOBTRACKER" )
+ .addTag( "url" ).addText( driver.getRealUrl( "JOBTRACKER" ) ).gotoParent()
+ .addTag( "service" )
.addTag( "role" ).addText( "TEMPLETON" )
.addTag( "url" ).addText( driver.getRealUrl( "TEMPLETON" ) ).gotoParent()
.addTag( "service" )
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
index bc609e6..050a6b7 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
@@ -54,6 +54,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
@@ -194,7 +195,7 @@ public class GatewayFuncTestDriver {
} else if( service.mock ) {
url = "http://localhost:" + service.server.getPort();
} else {
- url = service.realUrl.toExternalForm();
+ url = service.realUrl.toASCIIString();
}
return url;
}
@@ -216,13 +217,13 @@ public class GatewayFuncTestDriver {
private static class Service {
String role;
- URL realUrl;
+ URI realUrl;
String gatewayPath;
boolean mock;
MockServer server;
private Service( String role, String realUrl, String gatewayPath, boolean mock ) throws Exception {
this.role = role;
- this.realUrl = new URL( realUrl );
+ this.realUrl = new URI( realUrl );
this.gatewayPath = gatewayPath;
this.mock = mock;
this.server = new MockServer( role, true );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/JsonPath.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/JsonPath.java b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/JsonPath.java
index 6ac326c..cd34d45 100644
--- a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/JsonPath.java
+++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/JsonPath.java
@@ -107,6 +107,7 @@ public class JsonPath {
}
private List<Segment> parse( String expression ) {
+ boolean insideBrackets = false;
boolean expectChild = false;
boolean foundChild = false;
List<Segment> list = null;
@@ -116,7 +117,11 @@ public class JsonPath {
String prevToken = null;
while( parser.hasMoreTokens() ) {
prevToken = currToken;
- currToken = parser.nextToken().trim();
+ if( insideBrackets ) {
+ currToken = parser.nextToken( "$[]()@?:," ).trim();
+ } else {
+ currToken = parser.nextToken( "$.[]()@?:," ).trim();
+ }
char c = currToken.charAt( 0 );
switch( c ) {
case '$' :
@@ -146,6 +151,7 @@ public class JsonPath {
if( expectChild ) {
throw new IllegalArgumentException( expression );
}
+ insideBrackets = true;
expectChild = true;
foundChild = false;
break;
@@ -153,6 +159,7 @@ public class JsonPath {
if( !foundChild ) {
throw new IllegalArgumentException( expression );
}
+ insideBrackets = false;
expectChild = false;
foundChild = false;
break;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-util-common/src/test/java/org/apache/hadoop/gateway/util/JsonPathTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/hadoop/gateway/util/JsonPathTest.java b/gateway-util-common/src/test/java/org/apache/hadoop/gateway/util/JsonPathTest.java
index fc67db7..b561a84 100644
--- a/gateway-util-common/src/test/java/org/apache/hadoop/gateway/util/JsonPathTest.java
+++ b/gateway-util-common/src/test/java/org/apache/hadoop/gateway/util/JsonPathTest.java
@@ -286,6 +286,112 @@ public class JsonPathTest {
}
@Test
+ public void testCompileQuotedExpressions() {
+ JsonPath.Expression expression;
+ JsonPath.Segment[] segments;
+
+ expression = JsonPath.compile( "$.fieldName" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "fieldName" ) );
+
+ expression = JsonPath.compile( "$[fieldName]" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "fieldName" ) );
+
+ expression = JsonPath.compile( "$['fieldName']" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "fieldName" ) );
+
+ expression = JsonPath.compile( "$.field_name" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field_name" ) );
+
+ expression = JsonPath.compile( "$['field_name']" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field_name" ) );
+
+ expression = JsonPath.compile( "$[field_name]" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field_name" ) );
+
+ expression = JsonPath.compile( "$['field-name']" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field-name" ) );
+
+ expression = JsonPath.compile( "$[field-name]" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field-name" ) );
+
+ expression = JsonPath.compile( "$.field-name" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field-name" ) );
+
+ expression = JsonPath.compile( "$['field.name']" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field.name" ) );
+
+ expression = JsonPath.compile( "$[field.name]" );
+ assertThat( expression, notNullValue() );
+ segments = expression.getSegments();
+ assertThat( segments, notNullValue() );
+ assertThat( segments.length, is( 2 ) );
+ assertThat( segments[0].getType(), is( JsonPath.Segment.Type.ROOT ) );
+ assertThat( segments[1].getType(), is( JsonPath.Segment.Type.FIELD ) );
+ assertThat( segments[1].getField(), is( "field.name" ) );
+
+ }
+
+ @Test
public void testEvaluateObjects() throws IOException {
String json;
JsonPath.Segment seg;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/hsso-release/pom.xml
----------------------------------------------------------------------
diff --git a/hsso-release/pom.xml b/hsso-release/pom.xml
index 880fd32..caea5cf 100644
--- a/hsso-release/pom.xml
+++ b/hsso-release/pom.xml
@@ -135,11 +135,15 @@
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-secure-query</artifactId>
+ <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-hostmap-static</artifactId>
+ <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7019946..5a2e985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,9 @@
<module>gateway-i18n-logging-sl4j</module>
<module>gateway-spi</module>
<module>gateway-provider-rewrite</module>
- <module>gateway-provider-hostmap-static</module>
- <module>gateway-provider-secure-query</module>
+ <module>gateway-provider-rewrite-func-hostmap-static</module>
+ <module>gateway-provider-rewrite-func-service-registry</module>
+ <module>gateway-provider-rewrite-step-secure-query</module>
<module>gateway-provider-security-jwt</module>
<module>gateway-provider-security-shiro</module>
<module>gateway-provider-security-authz-acls</module>
@@ -159,6 +160,7 @@
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
<exclude>**/install/**</exclude>
+ <exclude>**/patch/**</exclude>
<exclude>**/test/resources/**</exclude>
<exclude>**/main/resources/**/*.json</exclude>
<exclude>**/home/CHANGES</exclude>
@@ -331,12 +333,17 @@
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-hostmap-static</artifactId>
+ <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
<version>${gateway-version}</version>
</dependency>
<dependency>
<groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-secure-query</artifactId>
+ <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
+ <version>${gateway-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
<version>${gateway-version}</version>
</dependency>
<dependency>
@@ -818,6 +825,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <artifactId>openaz</artifactId>
+ <groupId>org.openliberty</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
[2/5] KNOX-118: Add rewrite functions to allow use of service
registry within rewrite rules. Also includes initial integration of this with
Oozie.
Posted by km...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
new file mode 100644
index 0000000..df75a1b
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
@@ -0,0 +1,91 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+public class SecureQueryEncryptProcessor
+ implements UrlRewriteStepProcessor<SecureQueryEncryptDescriptor> {
+
+ private static final String ENCRYPTED_PARAMETER_NAME = "_";
+
+ private String clusterName;
+
+ @Override
+ public String getType() {
+ return SecureQueryEncryptDescriptor.STEP_NAME;
+ }
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, SecureQueryEncryptDescriptor descriptor ) throws Exception {
+ List<String> values = environment.resolve( "cluster.name" );
+ if( values != null && values.size() > 0 ) {
+ this.clusterName = environment.resolve( "cluster.name" ).get( 0 );
+ }
+ }
+
+ @Override
+ public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
+ //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
+ Template url = context.getCurrentUrl();
+ String str = url.toString();
+ String path = str;
+ String query = null;
+ int index = str.indexOf( '?' );
+ if( index >= 0 ) {
+ path = str.substring( 0, index );
+ if( index < str.length() ) {
+ query = str.substring( index + 1 );
+ }
+ }
+ if( query != null ) {
+ query = encode( query );
+ url = Parser.parse( path + "?" + ENCRYPTED_PARAMETER_NAME +"=" + query );
+ context.setCurrentUrl( url );
+ }
+ return UrlRewriteStepStatus.SUCCESS;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ private String encode( String string ) throws UnsupportedEncodingException {
+ string = Base64.encodeBase64String( string.getBytes( "UTF-8" ) );
+ string = removeTrailingEquals( string );
+ return string;
+ }
+
+ private static String removeTrailingEquals( String s ) {
+ int i = s.length()-1;
+ while( i > 0 && s.charAt( i ) == '=' ) {
+ i--;
+ }
+ return s.substring( 0, i+1 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
new file mode 100644
index 0000000..14ed327
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
@@ -0,0 +1,19 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.securequery.SecureQueryDeploymentContributor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
new file mode 100644
index 0000000..c5f9376
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
@@ -0,0 +1,22 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.securequery.SecureQueryEncodeDescriptor
+org.apache.hadoop.gateway.securequery.SecureQueryDecodeDescriptor
+org.apache.hadoop.gateway.securequery.SecureQueryEncryptDescriptor
+org.apache.hadoop.gateway.securequery.SecureQueryDecryptDescriptor
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
new file mode 100644
index 0000000..f216d77
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
@@ -0,0 +1,22 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.securequery.SecureQueryEncodeProcessor
+org.apache.hadoop.gateway.securequery.SecureQueryDecodeProcessor
+org.apache.hadoop.gateway.securequery.SecureQueryEncryptProcessor
+org.apache.hadoop.gateway.securequery.SecureQueryDecryptProcessor
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
new file mode 100644
index 0000000..cb496e8
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SecureQueryDecodeDescriptorTest {
+
+ @Test
+ public void testGetAndSet() {
+ SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
+ assertThat( descriptor.type(), is( "decode-query" ) );
+ assertThat( descriptor.getParam(), nullValue() );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
new file mode 100644
index 0000000..e8af9ce
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
@@ -0,0 +1,125 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.junit.Test;
+import sun.misc.BASE64Encoder;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SecureQueryDecodeProcessorTest {
+
+ @Test
+ public void testSimpleQueryDecode() throws Exception {
+ UrlRewriteEnvironment environment = new UrlRewriteEnvironment() {
+ @Override
+ public URL getResource( String name ) throws IOException {
+ return null;
+ }
+
+ @Override
+ public <T> T getAttribute( String name ) {
+ return null;
+ }
+
+ @Override
+ public List<String> resolve( String name ) {
+ return null;
+ }
+ };
+
+ BASE64Encoder encoder = new BASE64Encoder();
+ String encQuery = encoder.encode( "test-query".getBytes("utf-8" ) );
+ encQuery = encQuery.replaceAll( "\\=", "" );
+ String inString = "http://host:0/root/path?_=" + encQuery;
+ Template inTemplate = Parser.parse( inString );
+
+ UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
+ EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
+ Capture<Template> outTemplate = new Capture<Template>();
+ context.setCurrentUrl( EasyMock.capture( outTemplate ) );
+ EasyMock.replay( context );
+
+ SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
+ SecureQueryDecodeProcessor processor = new SecureQueryDecodeProcessor();
+ processor.initialize( environment, descriptor );
+ processor.process( context );
+
+ String outActual = outTemplate.getValue().toString();
+ assertThat( outActual, is( "http://host:0/root/path?test-query" ) );
+ }
+
+ @Test
+ public void testDecodeQueryWithNonEncodedParams() throws Exception {
+ UrlRewriteEnvironment environment = new UrlRewriteEnvironment() {
+ @Override
+ public URL getResource( String name ) throws IOException {
+ return null;
+ }
+
+ @Override
+ public <T> T getAttribute( String name ) {
+ return null;
+ }
+
+ @Override
+ public List<String> resolve( String name ) {
+ return null;
+ }
+ };
+
+ BASE64Encoder encoder = new BASE64Encoder();
+ String inQuery = "test-query=test-value";
+ String encQuery = encoder.encode( inQuery.getBytes( "utf-8" ) );
+ encQuery = encQuery.replaceAll( "\\=", "" );
+ String inString = "http://host:0/root/path?_=" + encQuery + "&clear-param=clear-value";
+ Template inTemplate = Parser.parse( inString );
+
+ UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
+ EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
+ Capture<Template> outTemplate = new Capture<Template>();
+ context.setCurrentUrl( EasyMock.capture( outTemplate ) );
+ EasyMock.replay( context );
+
+ SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
+ SecureQueryDecodeProcessor processor = new SecureQueryDecodeProcessor();
+ processor.initialize( environment, descriptor );
+ processor.process( context );
+
+ String outActual = outTemplate.getValue().toString();
+ assertThat( outActual, containsString( "http://host:0/root/path?" ) );
+ assertThat( outActual, containsString( "test-query=test-value" ) );
+ assertThat( outActual, containsString( "clear-param=clear-value" ) );
+ assertThat( outActual, not( containsString( encQuery ) ) );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
new file mode 100644
index 0000000..c337d7e
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributorTest.java
@@ -0,0 +1,79 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.deploy.DeploymentContext;
+import org.apache.hadoop.gateway.topology.Provider;
+import org.easymock.EasyMock;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SecureQueryDeploymentContributorTest {
+
+ @Test
+ public void testDeployment() throws IOException {
+ WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-acrhive" );
+
+// UrlRewriteRulesDescriptorImpl rewriteRules = new UrlRewriteRulesDescriptorImpl();
+
+ Map<String,String> providerParams = new HashMap<String, String>();
+// providerParams.put( "test-host-external", "test-host-internal" );
+ Provider provider = new Provider();
+ provider.setEnabled( true );
+ provider.setName( "secure-query" );
+ provider.setParams( providerParams );
+
+ DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
+// EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rewriteRules ).anyTimes();
+ EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
+ EasyMock.replay( context );
+
+ SecureQueryDeploymentContributor contributor = new SecureQueryDeploymentContributor();
+
+ assertThat( contributor.getRole(), is( "secure-query" ) );
+ assertThat( contributor.getName(), is( "default" ) );
+
+ // Just make sure it doesn't blow up.
+ contributor.contributeFilter( null, null, null, null, null );
+
+ // Just make sure it doesn't blow up.
+ contributor.initializeContribution( context );
+
+ contributor.contributeProvider( context, provider );
+
+// HostmapFunctionDescriptor funcDesc = rewriteRules.getFunction( "hostmap" );
+// assertThat( funcDesc.config(), is( "/WEB-INF/hostmap.txt" ) );
+//
+// Node node = webArchive.get( "/WEB-INF/hostmap.txt" );
+// String asset = IOUtils.toString( node.getAsset().openStream() );
+// assertThat( asset, containsString( "test-host-external=test-host-internal" ) );
+
+ // Just make sure it doesn't blow up.
+ contributor.finalizeContribution( context );
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
new file mode 100644
index 0000000..bdf1ad0
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptorTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SecureQueryEncodeDescriptorTest {
+
+ @Test
+ public void testGetAndSet() {
+ SecureQueryEncodeDescriptor descriptor = new SecureQueryEncodeDescriptor();
+ assertThat( descriptor.type(), is( "encode-query" ) );
+ assertThat( descriptor.getParam(), nullValue() );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
new file mode 100644
index 0000000..4003be3
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessorTest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.junit.Test;
+import sun.misc.BASE64Encoder;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SecureQueryEncodeProcessorTest {
+
+ @Test
+ public void testSimpleQueryEncoding() throws Exception {
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+
+ Template inTemplate = Parser.parse( "http://host:0/root/path?query" );
+ UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
+ EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
+ Capture<Template> outTemplate = new Capture<Template>();
+ context.setCurrentUrl( EasyMock.capture( outTemplate ) );
+
+ EasyMock.replay( environment, context );
+
+ SecureQueryEncodeDescriptor descriptor = new SecureQueryEncodeDescriptor();
+ SecureQueryEncodeProcessor processor = new SecureQueryEncodeProcessor();
+ processor.initialize( environment, descriptor );
+ processor.process( context );
+
+ BASE64Encoder encoder = new BASE64Encoder();
+ String encQuery = encoder.encode( "query".getBytes("utf-8" ) );
+ encQuery = encQuery.replaceAll( "\\=", "" );
+ String outExpect = "http://host:0/root/path?_=" + encQuery;
+ String outActual = outTemplate.getValue().toString();
+ assertThat( outActual, is( outExpect ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessor.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessor.java
index 600b04d..a6efaf0 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessor.java
@@ -74,8 +74,8 @@ public class UrlRewriteProcessor implements UrlRewriter {
processor.initialize( environment, descriptor );
functions.put( name, processor );
} catch( Exception e ) {
- LOG.failedToInitializeRewriteFunctions( e );
// Ignore it and it won't be available as a function.
+ LOG.failedToInitializeRewriteFunctions( e );
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
index 8092459..461a272 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
@@ -24,6 +24,8 @@ import java.util.List;
*/
public interface UrlRewriteRulesDescriptor {
+ void addRules( UrlRewriteRulesDescriptor rules );
+
List<UrlRewriteFunctionDescriptor> getFunctions();
<T extends UrlRewriteFunctionDescriptor<?>> T getFunction( String name );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
index a59c90c..5e0043f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
@@ -38,6 +38,16 @@ public class UrlRewriteRulesDescriptorImpl implements UrlRewriteRulesDescriptor
private Map<String,UrlRewriteFilterDescriptor> filterMap = new HashMap<String,UrlRewriteFilterDescriptor>();
@Override
+ public void addRules( UrlRewriteRulesDescriptor rules ) {
+ for( UrlRewriteRuleDescriptor rule : rules.getRules() ) {
+ addRule( rule );
+ }
+ for( UrlRewriteFilterDescriptor filter : rules.getFilters() ) {
+ addFilter( filter );
+ }
+ }
+
+ @Override
public UrlRewriteRuleDescriptor getRule( String name ) {
return ruleMap.get( name );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
index 3fdb896..b01b656 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
@@ -163,8 +163,18 @@ public class UrlRewriteProcessorTest {
"xml", getTestResourceReader( "rewrite.xml", "UTF-8" ) );
processor.initialize( environment, config );
- Template inputUrl = Parser.parse( "test-scheme-input://test-host-input:42/test-path-input-one/test-path-input-two" );
- Template outputUrl = processor.rewrite( null, inputUrl, UrlRewriter.Direction.OUT, "test-rule-2" );
+ Template inputUrl;
+ Template outputUrl;
+
+ inputUrl = Parser.parse( "test-scheme-input://test-host-input:42/test-path-input-one/test-path-input-two?test-query-name=test-query-value" );
+ outputUrl = processor.rewrite( null, inputUrl, UrlRewriter.Direction.OUT, "test-rule-2" );
+
+ assertThat(
+ "Expect rewrite to contain the correct path and query.",
+ outputUrl.toString(), is( "test-scheme-output://test-host-output:777/test-path-output/test-path-input-one/test-path-input-two?test-query-name=test-query-value" ) );
+
+ inputUrl = Parser.parse( "test-scheme-input://test-host-input:42/test-path-input-one/test-path-input-two" );
+ outputUrl = processor.rewrite( null, inputUrl, UrlRewriter.Direction.OUT, "test-rule-2" );
assertThat(
"Expect rewrite to contain the correct path.",
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
index 9030689..c1b535e 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
@@ -29,7 +29,6 @@ import org.eclipse.jetty.testing.HttpTester;
import org.eclipse.jetty.testing.ServletTester;
import org.eclipse.jetty.util.ArrayQueue;
import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
index 833a927..de112e6 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
@@ -93,6 +93,33 @@ public class JsonFilterReaderTest {
JsonAssert.with( output ).assertThat( "name<test-str>", is( "value:null<text>" ) );
}
+ @Test
+ public void testNamesWithDots() throws IOException {
+ InputStream stream = TestUtils.getResourceStream( this.getClass(), "dotted-field-name.json" );
+ String input = IOUtils.toString( stream, Charset.forName( "UTF-8" ) );
+
+ //System.out.println( "INPUT=" + input );
+
+ UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "test-filter" );
+ UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "application/json" );
+ //NOTE: The field names are rewritten first so the values rules need to match the rewritten name.
+ contentConfig.addApply( "$.name<testField>", "test-rule" );
+ contentConfig.addApply( "$.name<test_field>", "test-rule" );
+ contentConfig.addApply( "$.name<test-field>", "test-rule" );
+ contentConfig.addApply( "$['name<test.field>']", "test-rule" );
+
+ JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
+ String output = IOUtils.toString( filter );
+
+ //System.out.println( "OUTPUT=" + output );
+
+ JsonAssert.with( output ).assertThat( "$['name<testField>']", is( "value:test-rule<testField value>" ) );
+ JsonAssert.with( output ).assertThat( "$['name<test_field>']", is( "value:test-rule<test_field value>" ) );
+ JsonAssert.with( output ).assertThat( "$['name<test-field>']", is( "value:test-rule<test-field value>" ) );
+ JsonAssert.with( output ).assertThat( "$['name<test.field>']", is( "value:test-rule<test.field value>" ) );
+ }
+
// @Test
// public void testJsonPathObject() throws IOException {
// InputStream stream = TestUtils.getResourceStream( this.getClass(), "complex.json" );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest/rewrite.xml b/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest/rewrite.xml
index 89257c4..ad51cc8 100644
--- a/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest/rewrite.xml
+++ b/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest/rewrite.xml
@@ -17,11 +17,36 @@
<rules>
<rule name="test-rule-1" url="{scheme=*}://{host=*}:{port=*}/{path=**}">
- <rewrite param="{scheme}://{host}:{port}/test-output-path-1"/>
+ <rewrite template="{scheme}://{host}:{port}/test-output-path-1"/>
</rule>
<rule name="test-rule-2" url="{scheme=*}://{host=*}:{port=*}/{path=**}">
- <rewrite param="{scheme}://{host}:{port}/test-output-path-2"/>
+ <rewrite template="{scheme}://{host}:{port}/test-output-path-2"/>
+ </rule>
+
+ <rule name="test-rule-username">
+ <match pattern="*://{host}:{port}/{path=**}?{**}"/>
+ <rewrite template="test-output-scheme://{host}:{port}/test-output-path/{path=**}?user.name={$username}?{**}?test-output-query-name=test-output-query-value"/>
+ </rule>
+
+ <rule name="test-rule-scvreg-all">
+ <match pattern="{*}://{*}:{*}/{**}?{**}"/>
+ <rewrite template="{$serviceScheme[NAMENODE]}://{$serviceHost[NAMENODE]:{$servicePort[NAMENOCE]}/{$servicePath[NAMENODE]}"/>
+ </rule>
+
+ <rule name="test-rule-scvreg-url">
+ <match pattern="{*}://{*}:{*}/{**}?{**}"/>
+ <rewrite template="{$serviceScheme[NAMENODE]}://{$serviceHost[NAMENODE]:{$servicePort[NAMENOCE]}/{$servicePath[NAMENODE]}"/>
+ </rule>
+
+ <rule name="test-rule-scvreg-addr">
+ <match pattern="{*}://{*}:{*}/{**}?{**}"/>
+ <rewrite template="{$serviceUrl[NAMENODE]}"/>
+ </rule>
+
+ <rule name="test-rule-scvreg-addr">
+ <match pattern="{*}://{*}:{*}/{**}?{**}"/>
+ <rewrite template="test-protocol://{$serviceAddr[NAMENODE]}/test-path"/>
</rule>
<filter name="test-filter-1">
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest/dotted-field-name.json
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest/dotted-field-name.json b/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest/dotted-field-name.json
new file mode 100644
index 0000000..bb18642
--- /dev/null
+++ b/gateway-provider-rewrite/src/test/resources/org/apache/hadoop/gateway/filter/rewrite/impl/json/JsonFilterReaderTest/dotted-field-name.json
@@ -0,0 +1,6 @@
+{
+ "testField": "testField value",
+ "test_field": "test_field value",
+ "test-field": "test-field value",
+ "test.field": "test.field value"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/pom.xml b/gateway-provider-secure-query/pom.xml
deleted file mode 100644
index 829e719..0000000
--- a/gateway-provider-secure-query/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>gateway</artifactId>
- <groupId>org.apache.hadoop</groupId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <artifactId>gateway-provider-secure-query</artifactId>
-
- <name>gateway-provider-secure-query</name>
- <description>An extension of the gateway that supports securing query parameters.</description>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <dependencies>
-
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-util-common</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-util-urltemplate</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-i18n-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-rewrite</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
-
- <!-- ********** ********** ********** ********** ********** ********** -->
- <!-- ********** Test Dependencies ********** -->
- <!-- ********** ********** ********** ********** ********** ********** -->
-
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- This must be after restassured otherwise is messes up the hamcrest dependencies. -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
deleted file mode 100644
index f026e38..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
-
-public class SecureQueryDecodeDescriptor
- extends UrlRewriteActionDescriptorBase
- implements UrlRewriteActionDescriptor {
-
- static final String STEP_NAME = "decode-query";
-
- public SecureQueryDecodeDescriptor() {
- super( STEP_NAME );
- }
-
- @Override
- public String getParam() {
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
deleted file mode 100644
index 37eec1c..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
-import org.apache.hadoop.gateway.util.urltemplate.Builder;
-import org.apache.hadoop.gateway.util.urltemplate.Query;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-public class SecureQueryDecodeProcessor implements UrlRewriteStepProcessor<SecureQueryDecodeDescriptor> {
-
- private static final String ENCODED_PARAMETER_NAME = "_";
-
- @Override
- public String getType() {
- return SecureQueryDecodeDescriptor.STEP_NAME;
- }
-
- @Override
- public void initialize( UrlRewriteEnvironment environment, SecureQueryDecodeDescriptor descriptor ) throws Exception {
- }
-
- @Override
- public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
- //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
- Template currUrl = context.getCurrentUrl();
- Builder newUrl = new Builder( currUrl );
- Map<String,Query> map = newUrl.getQuery();
- Query query = map.remove( ENCODED_PARAMETER_NAME );
- if( query != null ) {
- String value = query.getFirstValue().getPattern();
- value = decode( value );
- StringTokenizer outerParser = new StringTokenizer( value, "&" );
- while( outerParser.hasMoreTokens() ) {
- String pair = outerParser.nextToken();
- StringTokenizer innerParser = new StringTokenizer( pair, "=" );
- if( innerParser.hasMoreTokens() ) {
- String paramName = innerParser.nextToken();
- if( innerParser.hasMoreTokens() ) {
- String paramValue = innerParser.nextToken();
- // Need to take out any existing query param.
- // If we don't then someone could override something in the encoded param.
- map.remove( paramName );
- newUrl.addQuery( paramName, "", paramValue );
- } else {
- newUrl.addQuery( paramName, "", null );
- }
- }
- }
- context.setCurrentUrl( newUrl.build() );
- }
- return UrlRewriteStepStatus.SUCCESS;
- }
-
- @Override
- public void destroy() {
- }
-
- private static String decode( String string ) throws UnsupportedEncodingException {
- return new String( Base64.decodeBase64( string ), "UTF-8" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
deleted file mode 100644
index 8db2070..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
-
-public class SecureQueryDecryptDescriptor
- extends UrlRewriteActionDescriptorBase
- implements UrlRewriteActionDescriptor {
-
- static final String STEP_NAME = "decrypt-query";
-
- public SecureQueryDecryptDescriptor() {
- super( STEP_NAME );
- }
-
- @Override
- public String getParam() {
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
deleted file mode 100644
index 031e0fb..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
-import org.apache.hadoop.gateway.util.urltemplate.Builder;
-import org.apache.hadoop.gateway.util.urltemplate.Query;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-public class SecureQueryDecryptProcessor implements UrlRewriteStepProcessor<SecureQueryDecryptDescriptor> {
-
- private static final String ENCRYPTED_PARAMETER_NAME = "_";
-
- private String clusterName;
-
- @Override
- public String getType() {
- return SecureQueryDecryptDescriptor.STEP_NAME;
- }
-
- @Override
- public void initialize( UrlRewriteEnvironment environment, SecureQueryDecryptDescriptor descriptor ) throws Exception {
- List<String> values = environment.resolve( "cluster.name" );
- if( values != null && values.size() > 0 ) {
- this.clusterName = environment.resolve( "cluster.name" ).get( 0 );
- }
- }
-
- @Override
- public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
- //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
- Template currUrl = context.getCurrentUrl();
- Builder newUrl = new Builder( currUrl );
- Map<String,Query> map = newUrl.getQuery();
- Query query = map.remove( ENCRYPTED_PARAMETER_NAME );
- if( query != null ) {
- String value = query.getFirstValue().getPattern();
- value = decode( value );
- StringTokenizer outerParser = new StringTokenizer( value, "&" );
- while( outerParser.hasMoreTokens() ) {
- String pair = outerParser.nextToken();
- StringTokenizer innerParser = new StringTokenizer( pair, "=" );
- if( innerParser.hasMoreTokens() ) {
- String paramName = innerParser.nextToken();
- if( innerParser.hasMoreTokens() ) {
- String paramValue = innerParser.nextToken();
- // Need to remove from the clear parameters any param name in the encoded params.
- // If we don't then someone could override something in the encoded param.
- map.remove( paramName );
- newUrl.addQuery( paramName, "", paramValue );
- } else {
- newUrl.addQuery( paramName, "", null );
- }
- }
- }
- context.setCurrentUrl( newUrl.build() );
- context.getParameters().resolve( "gateway.name" );
- }
- return UrlRewriteStepStatus.SUCCESS;
- }
-
- @Override
- public void destroy() {
- }
-
- private static String decode( String string ) throws UnsupportedEncodingException {
- return new String( Base64.decodeBase64( string ), "UTF-8" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
deleted file mode 100644
index 2598eb2..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.deploy.DeploymentContext;
-import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
-import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
-import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
-import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
-import org.apache.hadoop.gateway.topology.Provider;
-import org.apache.hadoop.gateway.topology.Service;
-
-import java.util.List;
-
-public class SecureQueryDeploymentContributor
- extends ProviderDeploymentContributorBase
- implements ProviderDeploymentContributor {
-
- public static final String PROVIDER_ROLE_NAME = "secure-query";
- public static final String PROVIDER_IMPL_NAME = "default";
-
- @Override
- public String getRole() {
- return PROVIDER_ROLE_NAME;
- }
-
- @Override
- public String getName() {
- return PROVIDER_IMPL_NAME;
- }
-
- @Override
- public void contributeProvider( DeploymentContext context, Provider provider ) {
- if( provider.isEnabled() ) {
- //TODO: Do something with the keystore service.
-// UrlRewriteRulesDescriptor rules = context.getDescriptor( REWRITE_ROLE_NAME );
-// if( rules != null ) {
-// HostmapFunctionDescriptor func = rules.addFunction( HostmapFunctionDescriptor.FUNCTION_NAME );
-// if( func != null ) {
-// Asset asset = createAsset( provider );
-// context.getWebArchive().addAsWebInfResource(
-// asset, HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_FILE_NAME );
-// func.config( HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_LOCATION );
-// }
-// }
- }
- }
-
-// private Asset createAsset( Provider provider ) {
-// StringWriter buffer = new StringWriter();
-// PrintWriter writer = new PrintWriter( buffer );
-// for( Map.Entry<String,String> entry : provider.getParams().entrySet() ) {
-// String externalHosts = entry.getKey();
-// String internalHosts = entry.getValue();
-// writer.print( externalHosts );
-// writer.print( "=" );
-// writer.println( internalHosts ) ;
-// }
-// writer.close();
-// String string = buffer.toString();
-// Asset asset = new StringAsset( string );
-// return asset;
-// }
-
- @Override
- public void contributeFilter(
- DeploymentContext context,
- Provider provider,
- Service service,
- ResourceDescriptor resource,
- List<FilterParamDescriptor> params ) {
- //TODO: Might need to add a filter as a way to propigate a keystore service to the processor.
- // NoOp.
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
deleted file mode 100644
index a29be4e..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
-
-public class SecureQueryEncodeDescriptor
- extends UrlRewriteActionDescriptorBase
- implements UrlRewriteActionDescriptor {
-
- static final String STEP_NAME = "encode-query";
-
- public SecureQueryEncodeDescriptor() {
- super( STEP_NAME );
- }
-
- @Override
- public String getParam() {
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
deleted file mode 100644
index eff1908..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
-import org.apache.hadoop.gateway.util.urltemplate.Parser;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-
-public class SecureQueryEncodeProcessor
- implements UrlRewriteStepProcessor<SecureQueryEncodeDescriptor> {
-
- private static final String ENCODED_PARAMETER_NAME = "_";
-
- @Override
- public String getType() {
- return SecureQueryEncodeDescriptor.STEP_NAME;
- }
-
- @Override
- public void initialize( UrlRewriteEnvironment environment, SecureQueryEncodeDescriptor descriptor ) throws Exception {
- }
-
- @Override
- public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
- //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
- Template url = context.getCurrentUrl();
- String str = url.toString();
- String path = str;
- String query = null;
- int index = str.indexOf( '?' );
- if( index >= 0 ) {
- path = str.substring( 0, index );
- if( index < str.length() ) {
- query = str.substring( index + 1 );
- }
- }
- if( query != null ) {
- query = Base64.encodeBase64String( query.getBytes( "UTF-8" ) );
- query = removeTrailingEquals( query );
- url = Parser.parse( path + "?" + ENCODED_PARAMETER_NAME +"=" + query );
- context.setCurrentUrl( url );
- }
- return UrlRewriteStepStatus.SUCCESS;
- }
-
- @Override
- public void destroy() {
- }
-
- private static String removeTrailingEquals( String s ) {
- int i = s.length()-1;
- while( i > 0 && s.charAt( i ) == '=' ) {
- i--;
- }
- return s.substring( 0, i+1 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
deleted file mode 100644
index 9f3d7b9..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
-
-public class SecureQueryEncryptDescriptor
- extends UrlRewriteActionDescriptorBase
- implements UrlRewriteActionDescriptor {
-
- static final String STEP_NAME = "encrypt-query";
-
- public SecureQueryEncryptDescriptor() {
- super( STEP_NAME );
- }
-
- @Override
- public String getParam() {
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java b/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
deleted file mode 100644
index df75a1b..0000000
--- a/gateway-provider-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptProcessor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
-import org.apache.hadoop.gateway.util.urltemplate.Parser;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-
-public class SecureQueryEncryptProcessor
- implements UrlRewriteStepProcessor<SecureQueryEncryptDescriptor> {
-
- private static final String ENCRYPTED_PARAMETER_NAME = "_";
-
- private String clusterName;
-
- @Override
- public String getType() {
- return SecureQueryEncryptDescriptor.STEP_NAME;
- }
-
- @Override
- public void initialize( UrlRewriteEnvironment environment, SecureQueryEncryptDescriptor descriptor ) throws Exception {
- List<String> values = environment.resolve( "cluster.name" );
- if( values != null && values.size() > 0 ) {
- this.clusterName = environment.resolve( "cluster.name" ).get( 0 );
- }
- }
-
- @Override
- public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
- //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
- Template url = context.getCurrentUrl();
- String str = url.toString();
- String path = str;
- String query = null;
- int index = str.indexOf( '?' );
- if( index >= 0 ) {
- path = str.substring( 0, index );
- if( index < str.length() ) {
- query = str.substring( index + 1 );
- }
- }
- if( query != null ) {
- query = encode( query );
- url = Parser.parse( path + "?" + ENCRYPTED_PARAMETER_NAME +"=" + query );
- context.setCurrentUrl( url );
- }
- return UrlRewriteStepStatus.SUCCESS;
- }
-
- @Override
- public void destroy() {
- }
-
- private String encode( String string ) throws UnsupportedEncodingException {
- string = Base64.encodeBase64String( string.getBytes( "UTF-8" ) );
- string = removeTrailingEquals( string );
- return string;
- }
-
- private static String removeTrailingEquals( String s ) {
- int i = s.length()-1;
- while( i > 0 && s.charAt( i ) == '=' ) {
- i--;
- }
- return s.substring( 0, i+1 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor b/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
deleted file mode 100644
index 14ed327..0000000
--- a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.securequery.SecureQueryDeploymentContributor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor b/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
deleted file mode 100644
index c5f9376..0000000
--- a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteStepDescriptor
+++ /dev/null
@@ -1,22 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.securequery.SecureQueryEncodeDescriptor
-org.apache.hadoop.gateway.securequery.SecureQueryDecodeDescriptor
-org.apache.hadoop.gateway.securequery.SecureQueryEncryptDescriptor
-org.apache.hadoop.gateway.securequery.SecureQueryDecryptDescriptor
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor b/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
deleted file mode 100644
index f216d77..0000000
--- a/gateway-provider-secure-query/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor
+++ /dev/null
@@ -1,22 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.securequery.SecureQueryEncodeProcessor
-org.apache.hadoop.gateway.securequery.SecureQueryDecodeProcessor
-org.apache.hadoop.gateway.securequery.SecureQueryEncryptProcessor
-org.apache.hadoop.gateway.securequery.SecureQueryDecryptProcessor
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java b/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
deleted file mode 100644
index cb496e8..0000000
--- a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptorTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SecureQueryDecodeDescriptorTest {
-
- @Test
- public void testGetAndSet() {
- SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
- assertThat( descriptor.type(), is( "decode-query" ) );
- assertThat( descriptor.getParam(), nullValue() );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java b/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
deleted file mode 100644
index e8af9ce..0000000
--- a/gateway-provider-secure-query/src/test/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessorTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.securequery;
-
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.util.urltemplate.Parser;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.junit.Test;
-import sun.misc.BASE64Encoder;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SecureQueryDecodeProcessorTest {
-
- @Test
- public void testSimpleQueryDecode() throws Exception {
- UrlRewriteEnvironment environment = new UrlRewriteEnvironment() {
- @Override
- public URL getResource( String name ) throws IOException {
- return null;
- }
-
- @Override
- public <T> T getAttribute( String name ) {
- return null;
- }
-
- @Override
- public List<String> resolve( String name ) {
- return null;
- }
- };
-
- BASE64Encoder encoder = new BASE64Encoder();
- String encQuery = encoder.encode( "test-query".getBytes("utf-8" ) );
- encQuery = encQuery.replaceAll( "\\=", "" );
- String inString = "http://host:0/root/path?_=" + encQuery;
- Template inTemplate = Parser.parse( inString );
-
- UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
- EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
- Capture<Template> outTemplate = new Capture<Template>();
- context.setCurrentUrl( EasyMock.capture( outTemplate ) );
- EasyMock.replay( context );
-
- SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
- SecureQueryDecodeProcessor processor = new SecureQueryDecodeProcessor();
- processor.initialize( environment, descriptor );
- processor.process( context );
-
- String outActual = outTemplate.getValue().toString();
- assertThat( outActual, is( "http://host:0/root/path?test-query" ) );
- }
-
- @Test
- public void testDecodeQueryWithNonEncodedParams() throws Exception {
- UrlRewriteEnvironment environment = new UrlRewriteEnvironment() {
- @Override
- public URL getResource( String name ) throws IOException {
- return null;
- }
-
- @Override
- public <T> T getAttribute( String name ) {
- return null;
- }
-
- @Override
- public List<String> resolve( String name ) {
- return null;
- }
- };
-
- BASE64Encoder encoder = new BASE64Encoder();
- String inQuery = "test-query=test-value";
- String encQuery = encoder.encode( inQuery.getBytes( "utf-8" ) );
- encQuery = encQuery.replaceAll( "\\=", "" );
- String inString = "http://host:0/root/path?_=" + encQuery + "&clear-param=clear-value";
- Template inTemplate = Parser.parse( inString );
-
- UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class );
- EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate );
- Capture<Template> outTemplate = new Capture<Template>();
- context.setCurrentUrl( EasyMock.capture( outTemplate ) );
- EasyMock.replay( context );
-
- SecureQueryDecodeDescriptor descriptor = new SecureQueryDecodeDescriptor();
- SecureQueryDecodeProcessor processor = new SecureQueryDecodeProcessor();
- processor.initialize( environment, descriptor );
- processor.process( context );
-
- String outActual = outTemplate.getValue().toString();
- assertThat( outActual, containsString( "http://host:0/root/path?" ) );
- assertThat( outActual, containsString( "test-query=test-value" ) );
- assertThat( outActual, containsString( "clear-param=clear-value" ) );
- assertThat( outActual, not( containsString( encQuery ) ) );
- }
-
-
-}
[4/5] KNOX-118: Add rewrite functions to allow use of service
registry within rewrite rules. Also includes initial integration of this with
Oozie.
Posted by km...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
new file mode 100644
index 0000000..f3e8c0a
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class HostmapFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof HostmapFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + UrlRewriteFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testGetAndSet() {
+ HostmapFunctionDescriptor descriptor = new HostmapFunctionDescriptor();
+
+ assertThat( descriptor.name(), is( "hostmap" ) );
+ assertThat( descriptor.config(), nullValue() );
+
+ // Test Fluent API
+ descriptor.config( "test-config-location-fluent" );
+ assertThat( descriptor.config(), is( "test-config-location-fluent" ) );
+ assertThat( descriptor.getConfig(), is( "test-config-location-fluent" ) );
+
+ // Test Bean API
+ descriptor.setConfig( "test-config-location-bean" );
+ assertThat( descriptor.config(), is( "test-config-location-bean" ) );
+ assertThat( descriptor.getConfig(), is( "test-config-location-bean" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
new file mode 100644
index 0000000..e8bf3c3
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
@@ -0,0 +1,102 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.impl;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.hadoop.gateway.deploy.DeploymentContext;
+import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
+import org.apache.hadoop.gateway.filter.rewrite.impl.UrlRewriteRulesDescriptorImpl;
+import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
+import org.apache.hadoop.gateway.topology.Provider;
+import org.easymock.EasyMock;
+import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class HostmapDeploymentContributorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( ProviderDeploymentContributor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof HostmapDeploymentContributor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + HostmapDeploymentContributor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testDeployment() throws IOException {
+ WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-acrhive" );
+
+ UrlRewriteRulesDescriptorImpl rewriteRules = new UrlRewriteRulesDescriptorImpl();
+
+ Map<String,String> providerParams = new HashMap<String, String>();
+ providerParams.put( "test-host-external", "test-host-internal" );
+ Provider provider = new Provider();
+ provider.setEnabled( true );
+ provider.setName( "hostmap" );
+ provider.setParams( providerParams );
+
+ DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
+ EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rewriteRules ).anyTimes();
+ EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
+ EasyMock.replay( context );
+
+ HostmapDeploymentContributor contributor = new HostmapDeploymentContributor();
+
+ assertThat( contributor.getRole(), is("hostmap") );
+ assertThat( contributor.getName(), is( "static" ) );
+
+ // Just make sure it doesn't blow up.
+ contributor.contributeFilter( null, null, null, null, null );
+
+ // Just make sure it doesn't blow up.
+ contributor.initializeContribution( context );
+
+ contributor.contributeProvider( context, provider );
+
+ HostmapFunctionDescriptor funcDesc = rewriteRules.getFunction( "hostmap" );
+ assertThat( funcDesc.config(), is( "/WEB-INF/hostmap.txt" ) );
+
+ Node node = webArchive.get( "/WEB-INF/hostmap.txt" );
+ String asset = IOUtils.toString( node.getAsset().openStream() );
+ assertThat( asset, containsString( "test-host-external=test-host-internal" ) );
+
+ // Just make sure it doesn't blow up.
+ contributor.finalizeContribution( context );
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
new file mode 100644
index 0000000..4790158
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
@@ -0,0 +1,234 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteProcessor;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRuleDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriter;
+import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionRewriteDescriptorExt;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Resolver;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+import org.apache.hadoop.test.TestUtils;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class HostmapFunctionProcessorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof HostmapFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + HostmapFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testBasicUseCase() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://{$hostmap(host)}:{*}/{**}?{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-rewritten-host" ) );
+ }
+
+ @Test
+ public void testHdfsUseCase() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hdfs-hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-internal-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://test-static-host:{*}/{**}?server={$hostmap(host)}&{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse(
+ "test-scheme://test-external-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
+ assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
+ assertThat( output.getQuery().get( "server" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().get( "test-name-1" ).getFirstValue().getPattern(), is( "test-value-1" ) );
+ assertThat( output.getQuery().get( "test-name-1" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().get( "test-name-2" ).getFirstValue().getPattern(), is( "test-value-2" ) );
+ assertThat( output.getQuery().get( "test-name-2" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().size(), is( 3 ) );
+ }
+
+ @Test
+ public void testQueryToPathRewriteWithFunction() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hdfs-hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-internal-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{qp1}&{qp2}&{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://test-static-host:{*}/{qp1}/{qp2}/{**}?server={$hostmap(host)}&{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse(
+ "test-scheme://test-external-host:42/test-path/test-file?qp1=qp1-val&qp2=qp2-val&test-name-1=test-value-1&test-name-2=test-value-2" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
+ assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
+ assertThat( output.getQuery().get( "server" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().get( "test-name-1" ).getFirstValue().getPattern(), is( "test-value-1" ) );
+ assertThat( output.getQuery().get( "test-name-1" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().get( "test-name-2" ).getFirstValue().getPattern(), is( "test-value-2" ) );
+ assertThat( output.getQuery().get( "test-name-2" ).getValues().size(), is( 1 ) );
+ assertThat( output.getQuery().size(), is( 3 ) );
+ }
+
+ @Test
+ public void testUnmappedUseCase() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-unmapped-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://{$hostmap(host)}:{*}/{**}?{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse(
+ "test-scheme://test-inbound-unmapped-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-unmapped-host" ) );
+ }
+
+ @Test
+ public void testMissingFunctionUseCase() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://{$invalid-function(host)}:{*}/{**}?{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-host" ) );
+ }
+
+ @Test
+ public void testEmptyHostmapUseCase() throws Exception {
+ URL configUrl = TestUtils.getResourceUrl( this.getClass(), "empty-hostmap.txt" );
+
+ UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
+ Resolver resolver = EasyMock.createNiceMock( Resolver.class );
+ EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
+ EasyMock.replay( environment, resolver );
+
+ UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
+ UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
+ rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
+ UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
+ rewrite.template( "{*}://{$invalid-function(host)}:{*}/{**}?{**}" );
+
+ UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
+ rewriter.initialize( environment, descriptor );
+
+ Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
+ Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
+ //System.out.println( output );
+ assertThat( output, notNullValue() );
+ assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-host" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
new file mode 100644
index 0000000..635f0d9
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
@@ -0,0 +1,15 @@
+# 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.
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
new file mode 100644
index 0000000..38eb607
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
@@ -0,0 +1,17 @@
+# 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.
+
+test-external-host=test-inbound-internal-host
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
new file mode 100644
index 0000000..576cac4
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
@@ -0,0 +1,17 @@
+# 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.
+
+test-inbound-host=test-inbound-rewritten-host
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml
new file mode 100644
index 0000000..a0d4e65
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>gateway</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
+
+ <name>gateway-provider-rewrite-func-service-registry</name>
+ <description>An extension to the URL rewriter that provides a way to access the service registry.</description>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite</artifactId>
+ </dependency>
+
+ <!-- ********** ********** ********** ********** ********** ********** -->
+ <!-- ********** Test Dependencies ********** -->
+ <!-- ********** ********** ********** ********** ********** ********** -->
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>test-jetty-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlmatchers</groupId>
+ <artifactId>xml-matchers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>uk.co.datumedge</groupId>
+ <artifactId>hamcrest-json</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- This must be after restassured otherwise is messes up the hamcrest dependencies. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptor.java
new file mode 100644
index 0000000..b271215
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptor.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServiceAddressFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "serviceAddr";
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptor.java
new file mode 100644
index 0000000..83a66c2
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptor.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServiceHostFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "serviceHost";
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptor.java
new file mode 100644
index 0000000..d819d61
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptor.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServicePathFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "servicePath";
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptor.java
new file mode 100644
index 0000000..8a04ad2
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptor.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServicePortFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "servicePort";
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptor.java
new file mode 100644
index 0000000..a391b72
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptor.java
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServiceSchemeFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "serviceScheme";
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptor.java
new file mode 100644
index 0000000..788c164
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptor.java
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class ServiceUrlFunctionDescriptor implements UrlRewriteFunctionDescriptor<ServiceUrlFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "serviceUrl";
+
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
new file mode 100644
index 0000000..350b6f9
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.util.urltemplate.Host;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Port;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+public class ServiceAddressFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServiceAddressFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServiceAddressFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServiceAddressFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String addr = parameter;
+ String url = super.resolve( context, parameter );
+ if( url != null ) {
+ Template template = Parser.parse( url );
+ Host host = template.getHost();
+ Port port = template.getPort();
+ if( host != null && port != null ) {
+ addr = host.getFirstValue().getPattern() + ":" + port.getFirstValue().getPattern();
+ } else if( host != null && port == null ) {
+ addr = host.getFirstValue().getPattern();
+ } else if( host == null && port != null ) {
+ addr = ":" + port.getFirstValue().getPattern();
+ }
+ }
+ return addr;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
new file mode 100644
index 0000000..2f50a82
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceHostFunctionDescriptor;
+import org.apache.hadoop.gateway.util.urltemplate.Host;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+public class ServiceHostFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServiceHostFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServiceHostFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServiceHostFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value = parameter;
+ String url = super.resolve( context, parameter );
+ if( url != null && !url.equals( parameter ) ) {
+ Template template = Parser.parse( url );
+ Host host = template.getHost();
+ if( host != null ) {
+ value = host.getFirstValue().getPattern();
+ }
+ }
+ return value;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
new file mode 100644
index 0000000..4d2500d
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServicePathFunctionDescriptor;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Path;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+import java.util.List;
+
+public class ServicePathFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServicePathFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServicePathFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServicePathFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value = parameter;
+ String url = super.resolve( context, parameter );
+ if( url != null && !url.equals( parameter ) ) {
+ Template template = Parser.parse( url );
+ List<Path> path = template.getPath();
+ if( path != null ) {
+ value = toString( path );
+ } else {
+ value = parameter;
+ }
+ }
+ return value;
+ }
+
+ private String toString( List<Path> paths ) {
+ StringBuilder s = new StringBuilder();
+ for( Path path: paths ) {
+ s.append( '/' );
+ s.append( path.getFirstValue().getPattern() );
+ }
+ if( s.length() == 0 ) {
+ s.append( '/' );
+ }
+ return s.toString();
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
new file mode 100644
index 0000000..e4a5c79
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServicePortFunctionDescriptor;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Port;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+public class ServicePortFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServicePortFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServicePortFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServicePortFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value = parameter;
+ String url = super.resolve( context, value );
+ if( url != null && !url.equals( parameter ) ) {
+ Template template = Parser.parse( url );
+ Port port = template.getPort();
+ if( port != null ) {
+ value = port.getFirstValue().getPattern();
+ }
+ }
+ return value;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionProcessorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionProcessorBase.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionProcessorBase.java
new file mode 100644
index 0000000..432a771
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionProcessorBase.java
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+
+abstract class ServiceRegistryFunctionProcessorBase<T extends UrlRewriteFunctionDescriptor> implements UrlRewriteFunctionProcessor<T> {
+
+ private String cluster;
+ private ServiceRegistry registry;
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, T descriptor ) throws Exception {
+ if( environment == null ) {
+ throw new IllegalArgumentException( "environment==null" );
+ }
+ cluster = environment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE );
+ if( cluster == null ) {
+ throw new IllegalArgumentException( "cluster==null" );
+ }
+ GatewayServices services = environment.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE );
+ if( services == null ) {
+ throw new IllegalArgumentException( "services==null" );
+ }
+ registry = services.getService( GatewayServices.SERVICE_REGISTRY_SERVICE );
+ if( registry == null ) {
+ throw new IllegalArgumentException( "registry==null" );
+ }
+ }
+
+ @Override
+ public void destroy() throws Exception {
+ registry = null;
+ cluster = null;
+ }
+
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value = parameter;
+ String url = registry.lookupServiceURL( cluster, parameter );
+ if( url != null ) {
+ value = url;
+ }
+ return value;
+ }
+
+ String cluster() {
+ return cluster;
+ }
+
+ ServiceRegistry registry() {
+ return registry;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
new file mode 100644
index 0000000..450df00
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Scheme;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+public class ServiceSchemeFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServiceSchemeFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServiceSchemeFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServiceSchemeFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value = parameter;
+ String url = super.resolve( context, parameter );
+ if( url != null && !url.equals( parameter ) ) {
+ Template template = Parser.parse( url );
+ Scheme scheme = template.getScheme();
+ if( scheme != null ) {
+ value = scheme.getFirstValue().getPattern();
+ }
+ }
+ return value;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
new file mode 100644
index 0000000..dd4ed0e
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceUrlFunctionDescriptor;
+
+public class ServiceUrlFunctionProcessor
+ extends ServiceRegistryFunctionProcessorBase<ServiceUrlFunctionDescriptor>
+ implements UrlRewriteFunctionProcessor<ServiceUrlFunctionDescriptor> {
+
+ @Override
+ public String name() {
+ return ServiceUrlFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ return super.resolve( context, parameter );
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor b/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
new file mode 100644
index 0000000..8f50977
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
@@ -0,0 +1,24 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.svcregfunc.api.ServiceUrlFunctionDescriptor
+org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor
+org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor
+org.apache.hadoop.gateway.svcregfunc.api.ServiceHostFunctionDescriptor
+org.apache.hadoop.gateway.svcregfunc.api.ServicePortFunctionDescriptor
+org.apache.hadoop.gateway.svcregfunc.api.ServicePathFunctionDescriptor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor b/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
new file mode 100644
index 0000000..d241c10
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
@@ -0,0 +1,24 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.svcregfunc.impl.ServiceUrlFunctionProcessor
+org.apache.hadoop.gateway.svcregfunc.impl.ServiceAddressFunctionProcessor
+org.apache.hadoop.gateway.svcregfunc.impl.ServiceSchemeFunctionProcessor
+org.apache.hadoop.gateway.svcregfunc.impl.ServiceHostFunctionProcessor
+org.apache.hadoop.gateway.svcregfunc.impl.ServicePortFunctionProcessor
+org.apache.hadoop.gateway.svcregfunc.impl.ServicePathFunctionProcessor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptorTest.java
new file mode 100644
index 0000000..c4f9a39
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceAddressFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceAddressFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceAddressFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceAddressFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceAddressFunctionDescriptor descriptor = new ServiceAddressFunctionDescriptor();
+ assertThat( descriptor.name(), is( "serviceAddr" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptorTest.java
new file mode 100644
index 0000000..c52b6e4
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceHostFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceHostFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceHostFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceHostFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceHostFunctionDescriptor descriptor = new ServiceHostFunctionDescriptor();
+ assertThat( descriptor.name(), is( "serviceHost" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptorTest.java
new file mode 100644
index 0000000..a3729a1
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePathFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServicePathFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServicePathFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServicePathFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServicePathFunctionDescriptor descriptor = new ServicePathFunctionDescriptor();
+ assertThat( descriptor.name(), is( "servicePath" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptorTest.java
new file mode 100644
index 0000000..b95b8d4
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServicePortFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServicePortFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServicePortFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServicePortFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServicePortFunctionDescriptor descriptor = new ServicePortFunctionDescriptor();
+ assertThat( descriptor.name(), is( "servicePort" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptorTest.java
new file mode 100644
index 0000000..e47a96e
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceSchemeFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceSchemeFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceSchemeFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceSchemeFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceSchemeFunctionDescriptor descriptor = new ServiceSchemeFunctionDescriptor();
+ assertThat( descriptor.name(), is( "serviceScheme" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptorTest.java
new file mode 100644
index 0000000..631a9f1
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/api/ServiceUrlFunctionDescriptorTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceUrlFunctionDescriptorTest {
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionDescriptor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceUrlFunctionDescriptor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceUrlFunctionDescriptor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceUrlFunctionDescriptor descriptor = new ServiceUrlFunctionDescriptor();
+ assertThat( descriptor.name(), is( "serviceUrl" ) );
+ }
+
+}
[5/5] git commit: KNOX-118: Add rewrite functions to allow use of
service registry within rewrite rules. Also includes initial integration of
this with Oozie.
Posted by km...@apache.org.
KNOX-118: Add rewrite functions to allow use of service registry within rewrite rules. Also includes initial integration of this with Oozie.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/2f135e16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/2f135e16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/2f135e16
Branch: refs/heads/master
Commit: 2f135e165e6fbff3221e27e52e5360cbe4c6a870
Parents: 493cfa7
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Thu Sep 12 21:00:24 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Thu Sep 12 21:00:24 2013 -0400
----------------------------------------------------------------------
.gitignore | 1 +
gateway-provider-hostmap-static/pom.xml | 96 --------
.../hostmap/api/HostmapFunctionDescriptor.java | 50 ----
.../impl/HostmapDeploymentContributor.java | 100 --------
.../hostmap/impl/HostmapFunctionProcessor.java | 98 --------
...gateway.deploy.ProviderDeploymentContributor | 19 --
...ter.rewrite.api.UrlRewriteFunctionDescriptor | 19 --
...lter.rewrite.spi.UrlRewriteFunctionProcessor | 19 --
.../api/HostmapFunctionDescriptorTest.java | 46 ----
.../impl/HostmapDeploymentContributorTest.java | 84 -------
.../impl/HostmapFunctionProcessorTest.java | 216 -----------------
.../empty-hostmap.txt | 15 --
.../hdfs-hostmap.txt | 17 --
.../HostmapFunctionProcessorTest/hostmap.txt | 17 --
.../pom.xml | 15 +-
.../function/UsernameFunctionProcessorTest.java | 166 ++++++++++++-
.../UsernameFunctionProcessorTest/rewrite.xml | 24 ++
.../pom.xml | 96 ++++++++
.../hostmap/api/HostmapFunctionDescriptor.java | 50 ++++
.../impl/HostmapDeploymentContributor.java | 100 ++++++++
.../hostmap/impl/HostmapFunctionProcessor.java | 98 ++++++++
...gateway.deploy.ProviderDeploymentContributor | 19 ++
...ter.rewrite.api.UrlRewriteFunctionDescriptor | 19 ++
...lter.rewrite.spi.UrlRewriteFunctionProcessor | 19 ++
.../api/HostmapFunctionDescriptorTest.java | 65 ++++++
.../impl/HostmapDeploymentContributorTest.java | 102 ++++++++
.../impl/HostmapFunctionProcessorTest.java | 234 +++++++++++++++++++
.../empty-hostmap.txt | 15 ++
.../hdfs-hostmap.txt | 17 ++
.../HostmapFunctionProcessorTest/hostmap.txt | 17 ++
.../pom.xml | 112 +++++++++
.../api/ServiceAddressFunctionDescriptor.java | 30 +++
.../api/ServiceHostFunctionDescriptor.java | 30 +++
.../api/ServicePathFunctionDescriptor.java | 30 +++
.../api/ServicePortFunctionDescriptor.java | 30 +++
.../api/ServiceSchemeFunctionDescriptor.java | 30 +++
.../api/ServiceUrlFunctionDescriptor.java | 31 +++
.../impl/ServiceAddressFunctionProcessor.java | 56 +++++
.../impl/ServiceHostFunctionProcessor.java | 50 ++++
.../impl/ServicePathFunctionProcessor.java | 66 ++++++
.../impl/ServicePortFunctionProcessor.java | 50 ++++
.../ServiceRegistryFunctionProcessorBase.java | 76 ++++++
.../impl/ServiceSchemeFunctionProcessor.java | 50 ++++
.../impl/ServiceUrlFunctionProcessor.java | 38 +++
...ter.rewrite.api.UrlRewriteFunctionDescriptor | 24 ++
...lter.rewrite.spi.UrlRewriteFunctionProcessor | 24 ++
.../ServiceAddressFunctionDescriptorTest.java | 52 +++++
.../api/ServiceHostFunctionDescriptorTest.java | 52 +++++
.../api/ServicePathFunctionDescriptorTest.java | 52 +++++
.../api/ServicePortFunctionDescriptorTest.java | 52 +++++
.../ServiceSchemeFunctionDescriptorTest.java | 52 +++++
.../api/ServiceUrlFunctionDescriptorTest.java | 52 +++++
.../ServiceAddressFunctionProcessorTest.java | 134 +++++++++++
.../impl/ServiceHostFunctionProcessorTest.java | 135 +++++++++++
.../impl/ServicePathFunctionProcessorTest.java | 135 +++++++++++
.../impl/ServicePortFunctionProcessorTest.java | 135 +++++++++++
.../impl/ServiceRegistryFunctionsTest.java | 233 ++++++++++++++++++
.../ServiceSchemeFunctionProcessorTest.java | 134 +++++++++++
.../impl/ServiceUrlFunctionProcessorTest.java | 135 +++++++++++
.../ServiceRegistryFunctionsTest/rewrite.xml | 101 ++++++++
.../test-expect-body.json | 11 +
.../test-expect-body.xml | 40 ++++
.../test-input-body.json | 11 +
.../test-input-body.xml | 40 ++++
.../pom.xml | 106 +++++++++
.../SecureQueryDecodeDescriptor.java | 38 +++
.../securequery/SecureQueryDecodeProcessor.java | 86 +++++++
.../SecureQueryDecryptDescriptor.java | 38 +++
.../SecureQueryDecryptProcessor.java | 94 ++++++++
.../SecureQueryDeploymentContributor.java | 91 ++++++++
.../SecureQueryEncodeDescriptor.java | 38 +++
.../securequery/SecureQueryEncodeProcessor.java | 77 ++++++
.../SecureQueryEncryptDescriptor.java | 38 +++
.../SecureQueryEncryptProcessor.java | 91 ++++++++
...gateway.deploy.ProviderDeploymentContributor | 19 ++
....filter.rewrite.api.UrlRewriteStepDescriptor | 22 ++
...y.filter.rewrite.spi.UrlRewriteStepProcessor | 22 ++
.../SecureQueryDecodeDescriptorTest.java | 35 +++
.../SecureQueryDecodeProcessorTest.java | 125 ++++++++++
.../SecureQueryDeploymentContributorTest.java | 79 +++++++
.../SecureQueryEncodeDescriptorTest.java | 35 +++
.../SecureQueryEncodeProcessorTest.java | 59 +++++
.../filter/rewrite/api/UrlRewriteProcessor.java | 2 +-
.../rewrite/api/UrlRewriteRulesDescriptor.java | 2 +
.../impl/UrlRewriteRulesDescriptorImpl.java | 10 +
.../rewrite/api/UrlRewriteProcessorTest.java | 14 +-
.../api/UrlRewriteServletFilterTest.java | 1 -
.../rewrite/impl/json/JsonFilterReaderTest.java | 27 +++
.../api/UrlRewriteServletFilterTest/rewrite.xml | 29 ++-
.../JsonFilterReaderTest/dotted-field-name.json | 6 +
gateway-provider-secure-query/pom.xml | 106 ---------
.../SecureQueryDecodeDescriptor.java | 38 ---
.../securequery/SecureQueryDecodeProcessor.java | 86 -------
.../SecureQueryDecryptDescriptor.java | 38 ---
.../SecureQueryDecryptProcessor.java | 94 --------
.../SecureQueryDeploymentContributor.java | 91 --------
.../SecureQueryEncodeDescriptor.java | 38 ---
.../securequery/SecureQueryEncodeProcessor.java | 77 ------
.../SecureQueryEncryptDescriptor.java | 38 ---
.../SecureQueryEncryptProcessor.java | 91 --------
...gateway.deploy.ProviderDeploymentContributor | 19 --
....filter.rewrite.api.UrlRewriteStepDescriptor | 22 --
...y.filter.rewrite.spi.UrlRewriteStepProcessor | 22 --
.../SecureQueryDecodeDescriptorTest.java | 35 ---
.../SecureQueryDecodeProcessorTest.java | 125 ----------
.../SecureQueryDeploymentContributorTest.java | 79 -------
.../SecureQueryEncodeDescriptorTest.java | 35 ---
.../SecureQueryEncodeProcessorTest.java | 59 -----
gateway-release/pom.xml | 8 +-
.../apache/hadoop/gateway/GatewayServer.java | 41 +---
.../apache/hadoop/gateway/GatewayServlet.java | 1 +
.../services/DefaultGatewayServices.java | 22 +-
.../gateway/services/HssoGatewayServices.java | 4 +-
gateway-service-oozie/pom.xml | 21 ++
.../oozie/OozieDeploymentContributor.java | 68 ++++--
.../OozieDeploymentContributor/rewrite.xml | 69 ++++++
.../oozie/OozieDeploymentContributorTest.java | 114 +++++++++
.../gateway/services/GatewayServices.java | 5 +-
.../java/org/apache/hadoop/test/TestUtils.java | 6 +
.../hadoop/test/mock/MockRequestMatcher.java | 2 +
.../hadoop/gateway/GatewayBasicFuncTest.java | 10 +-
.../hadoop/gateway/GatewayFuncTestDriver.java | 7 +-
.../apache/hadoop/gateway/util/JsonPath.java | 9 +-
.../hadoop/gateway/util/JsonPathTest.java | 106 +++++++++
hsso-release/pom.xml | 8 +-
pom.xml | 21 +-
126 files changed, 4958 insertions(+), 1977 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e3099b4..df91feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ atlassian-ide-plugin.xml
.DS_Store
target
install
+patch
org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer/
velocity.log
*.pyc
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/pom.xml b/gateway-provider-hostmap-static/pom.xml
deleted file mode 100644
index 612d013..0000000
--- a/gateway-provider-hostmap-static/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>gateway</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <artifactId>gateway-provider-hostmap-static</artifactId>
-
- <name>gateway-provider-hostmap-static</name>
- <description>An extension to the URL rewriter that provides a way to map hostnames in requests and responses.</description>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <dependencies>
-
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-i18n-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-provider-rewrite</artifactId>
- </dependency>
-
- <!-- ********** ********** ********** ********** ********** ********** -->
- <!-- ********** Test Dependencies ********** -->
- <!-- ********** ********** ********** ********** ********** ********** -->
-
- <dependency>
- <groupId>${gateway-group}</groupId>
- <artifactId>gateway-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- This must be after restassured otherwise is messes up the hamcrest dependencies. -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java b/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
deleted file mode 100644
index 01d41b9..0000000
--- a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.api;
-
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
-
-public class HostmapFunctionDescriptor implements UrlRewriteFunctionDescriptor<HostmapFunctionDescriptor> {
-
- public static final String FUNCTION_NAME = "hostmap";
-
- private String configLocation;
-
- @Override
- public String name() {
- return FUNCTION_NAME;
- }
-
- public HostmapFunctionDescriptor config( String configLocation ) {
- this.configLocation = configLocation;
- return this;
- }
-
- public String config() {
- return configLocation;
- }
-
- public String getConfig() {
- return config();
- }
-
- public void setConfig( String configLocation ) {
- config( configLocation );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java b/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
deleted file mode 100644
index ba9274d..0000000
--- a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.impl;
-
-import org.apache.hadoop.gateway.deploy.DeploymentContext;
-import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
-import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
-import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
-import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
-import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
-import org.apache.hadoop.gateway.topology.Provider;
-import org.apache.hadoop.gateway.topology.Service;
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
-public class HostmapDeploymentContributor
- extends ProviderDeploymentContributorBase
- implements ProviderDeploymentContributor {
-
- public static final String PROVIDER_ROLE_NAME = HostmapFunctionDescriptor.FUNCTION_NAME;
- public static final String PROVIDER_IMPL_NAME = "static";
-
- private static final String REWRITE_ROLE_NAME = "rewrite";
-
- @Override
- public String getRole() {
- return PROVIDER_ROLE_NAME;
- }
-
- @Override
- public String getName() {
- return PROVIDER_IMPL_NAME;
- }
-
- // Write the provider init params to the hostmap.txt file.
- // Add the function to the rewrite descriptor providing the location of the hostmap.txt file.
- @Override
- public void contributeProvider( DeploymentContext context, Provider provider ) {
- if( provider.isEnabled() ) {
- UrlRewriteRulesDescriptor rules = context.getDescriptor( REWRITE_ROLE_NAME );
- if( rules != null ) {
- HostmapFunctionDescriptor func = rules.addFunction( HostmapFunctionDescriptor.FUNCTION_NAME );
- if( func != null ) {
- Asset asset = createAsset( provider );
- context.getWebArchive().addAsWebInfResource(
- asset, HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_FILE_NAME );
- func.config( HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_LOCATION );
- }
- }
- }
- }
-
- private Asset createAsset( Provider provider ) {
- StringWriter buffer = new StringWriter();
- PrintWriter writer = new PrintWriter( buffer );
- for( Map.Entry<String,String> entry : provider.getParams().entrySet() ) {
- String externalHosts = entry.getKey();
- String internalHosts = entry.getValue();
- writer.print( externalHosts );
- writer.print( "=" );
- writer.println( internalHosts ) ;
- }
- writer.close();
- String string = buffer.toString();
- Asset asset = new StringAsset( string );
- return asset;
- }
-
- @Override
- public void contributeFilter(
- DeploymentContext context,
- Provider provider,
- Service service,
- ResourceDescriptor resource,
- List<FilterParamDescriptor> params ) {
- // NoOp.
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
deleted file mode 100644
index 9e71a4e..0000000
--- a/gateway-provider-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.impl;
-
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
-import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
-import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-public class HostmapFunctionProcessor
- implements UrlRewriteFunctionProcessor<HostmapFunctionDescriptor> {
-
- public static final String DESCRIPTOR_DEFAULT_FILE_NAME = "hostmap.txt";
- public static final String DESCRIPTOR_DEFAULT_LOCATION = "/WEB-INF/" + DESCRIPTOR_DEFAULT_FILE_NAME;
-
- private Map<String, String> inbound = new HashMap<String, String>();
- private Map<String, String> outbound = new HashMap<String, String>();
-
- @Override
- public String name() {
- return HostmapFunctionDescriptor.FUNCTION_NAME;
- }
-
- @Override
- public void initialize( UrlRewriteEnvironment environment, HostmapFunctionDescriptor descriptor ) throws Exception {
- URL url = environment.getResource( DESCRIPTOR_DEFAULT_LOCATION );
- if( url != null ) {
- InputStream stream = url.openStream();
- BufferedReader reader = new BufferedReader( new InputStreamReader( stream ) );
- String line = reader.readLine();
- while( line != null ) {
- String[] lineSplit = line.split( "=" );
- if( lineSplit.length >= 2 ) {
- String[] externalSplit = lineSplit[ 0 ].split( "," );
- String[] internalSplit = lineSplit[ 1 ].split( "," );
- if( externalSplit.length >= 1 && internalSplit.length >= 1 ) {
- for( String external : externalSplit ) {
- inbound.put( external, internalSplit[ 0 ] );
- }
- for( String internal : internalSplit ) {
- outbound.put( internal, externalSplit[ 0 ] );
- }
- }
- }
- line = reader.readLine();
- }
- reader.close();
- }
- }
-
- @Override
- public void destroy() throws Exception {
- }
-
- @Override
- public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
- String value;
- switch( context.getDirection() ) {
- case IN:
- value = inbound.get( parameter );
- break;
- case OUT:
- value = outbound.get( parameter );
- break;
- default:
- value = null;
- }
- if( value == null ) {
- value = parameter;
- }
-// System.out.println( "HOSTMAP: " + parameter + "->" + value );
- return value;
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor b/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
deleted file mode 100644
index eda74c1..0000000
--- a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.hostmap.impl.HostmapDeploymentContributor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor b/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
deleted file mode 100644
index 3e80487..0000000
--- a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor b/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
deleted file mode 100644
index 7c6619c..0000000
--- a/gateway-provider-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################################
-# 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.
-##########################################################################
-
-org.apache.hadoop.gateway.hostmap.impl.HostmapFunctionProcessor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java b/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
deleted file mode 100644
index 4bbe392..0000000
--- a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptorTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.api;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class HostmapFunctionDescriptorTest {
-
- @Test
- public void testGetAndSet() {
- HostmapFunctionDescriptor descriptor = new HostmapFunctionDescriptor();
-
- assertThat( descriptor.name(), is( "hostmap" ) );
- assertThat( descriptor.config(), nullValue() );
-
- // Test Fluent API
- descriptor.config( "test-config-location-fluent" );
- assertThat( descriptor.config(), is( "test-config-location-fluent" ) );
- assertThat( descriptor.getConfig(), is( "test-config-location-fluent" ) );
-
- // Test Bean API
- descriptor.setConfig( "test-config-location-bean" );
- assertThat( descriptor.config(), is( "test-config-location-bean" ) );
- assertThat( descriptor.getConfig(), is( "test-config-location-bean" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java b/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
deleted file mode 100644
index 47b482c..0000000
--- a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributorTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.impl;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.gateway.deploy.DeploymentContext;
-import org.apache.hadoop.gateway.filter.rewrite.impl.UrlRewriteRulesDescriptorImpl;
-import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
-import org.apache.hadoop.gateway.topology.Provider;
-import org.easymock.EasyMock;
-import org.jboss.shrinkwrap.api.Node;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class HostmapDeploymentContributorTest {
-
- @Test
- public void testDeployment() throws IOException {
- WebArchive webArchive = ShrinkWrap.create( WebArchive.class, "test-acrhive" );
-
- UrlRewriteRulesDescriptorImpl rewriteRules = new UrlRewriteRulesDescriptorImpl();
-
- Map<String,String> providerParams = new HashMap<String, String>();
- providerParams.put( "test-host-external", "test-host-internal" );
- Provider provider = new Provider();
- provider.setEnabled( true );
- provider.setName( "hostmap" );
- provider.setParams( providerParams );
-
- DeploymentContext context = EasyMock.createNiceMock( DeploymentContext.class );
- EasyMock.expect( context.getDescriptor( "rewrite" ) ).andReturn( rewriteRules ).anyTimes();
- EasyMock.expect( context.getWebArchive() ).andReturn( webArchive ).anyTimes();
- EasyMock.replay( context );
-
- HostmapDeploymentContributor contributor = new HostmapDeploymentContributor();
-
- assertThat( contributor.getRole(), is("hostmap") );
- assertThat( contributor.getName(), is( "static" ) );
-
- // Just make sure it doesn't blow up.
- contributor.contributeFilter( null, null, null, null, null );
-
- // Just make sure it doesn't blow up.
- contributor.initializeContribution( context );
-
- contributor.contributeProvider( context, provider );
-
- HostmapFunctionDescriptor funcDesc = rewriteRules.getFunction( "hostmap" );
- assertThat( funcDesc.config(), is( "/WEB-INF/hostmap.txt" ) );
-
- Node node = webArchive.get( "/WEB-INF/hostmap.txt" );
- String asset = IOUtils.toString( node.getAsset().openStream() );
- assertThat( asset, containsString( "test-host-external=test-host-internal" ) );
-
- // Just make sure it doesn't blow up.
- contributor.finalizeContribution( context );
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java b/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
deleted file mode 100644
index d93d6d1..0000000
--- a/gateway-provider-hostmap-static/src/test/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * 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.
- */
-package org.apache.hadoop.gateway.hostmap.impl;
-
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteProcessor;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRuleDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory;
-import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriter;
-import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionRewriteDescriptorExt;
-import org.apache.hadoop.gateway.util.urltemplate.Parser;
-import org.apache.hadoop.gateway.util.urltemplate.Resolver;
-import org.apache.hadoop.gateway.util.urltemplate.Template;
-import org.apache.hadoop.test.TestUtils;
-import org.easymock.EasyMock;
-import org.junit.Test;
-
-import java.net.URL;
-import java.util.Arrays;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class HostmapFunctionProcessorTest {
-
- @Test
- public void testBasicUseCase() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://{$hostmap(host)}:{*}/{**}?{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-rewritten-host" ) );
- }
-
- @Test
- public void testHdfsUseCase() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hdfs-hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-internal-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://test-static-host:{*}/{**}?server={$hostmap(host)}&{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse(
- "test-scheme://test-external-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
- assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
- assertThat( output.getQuery().get( "server" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().get( "test-name-1" ).getFirstValue().getPattern(), is( "test-value-1" ) );
- assertThat( output.getQuery().get( "test-name-1" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().get( "test-name-2" ).getFirstValue().getPattern(), is( "test-value-2" ) );
- assertThat( output.getQuery().get( "test-name-2" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().size(), is( 3 ) );
- }
-
- @Test
- public void testQueryToPathRewriteWithFunction() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hdfs-hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-internal-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{qp1}&{qp2}&{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://test-static-host:{*}/{qp1}/{qp2}/{**}?server={$hostmap(host)}&{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse(
- "test-scheme://test-external-host:42/test-path/test-file?qp1=qp1-val&qp2=qp2-val&test-name-1=test-value-1&test-name-2=test-value-2" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
- assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
- assertThat( output.getQuery().get( "server" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().get( "test-name-1" ).getFirstValue().getPattern(), is( "test-value-1" ) );
- assertThat( output.getQuery().get( "test-name-1" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().get( "test-name-2" ).getFirstValue().getPattern(), is( "test-value-2" ) );
- assertThat( output.getQuery().get( "test-name-2" ).getValues().size(), is( 1 ) );
- assertThat( output.getQuery().size(), is( 3 ) );
- }
-
- @Test
- public void testUnmappedUseCase() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-unmapped-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://{$hostmap(host)}:{*}/{**}?{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse(
- "test-scheme://test-inbound-unmapped-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-unmapped-host" ) );
- }
-
- @Test
- public void testMissingFunctionUseCase() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://{$invalid-function(host)}:{*}/{**}?{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-host" ) );
- }
-
- @Test
- public void testEmptyHostmapUseCase() throws Exception {
- URL configUrl = TestUtils.getResourceUrl( this.getClass(), "empty-hostmap.txt" );
-
- UrlRewriteEnvironment environment = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
- EasyMock.expect( environment.getResource( "/WEB-INF/hostmap.txt" ) ).andReturn( configUrl ).anyTimes();
- Resolver resolver = EasyMock.createNiceMock( Resolver.class );
- EasyMock.expect( resolver.resolve( "host" ) ).andReturn( Arrays.asList( "test-inbound-host" ) ).anyTimes();
- EasyMock.replay( environment, resolver );
-
- UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory.create();
- UrlRewriteRuleDescriptor rule = descriptor.addRule( "test-rule" );
- rule.pattern( "{*}://{host}:{*}/{**}?{**}" );
- UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep( "rewrite" );
- rewrite.template( "{*}://{$invalid-function(host)}:{*}/{**}?{**}" );
-
- UrlRewriteProcessor rewriter = new UrlRewriteProcessor();
- rewriter.initialize( environment, descriptor );
-
- Template input = Parser.parse( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
- Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
- //System.out.println( output );
- assertThat( output, notNullValue() );
- assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-host" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt b/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
deleted file mode 100644
index 635f0d9..0000000
--- a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/empty-hostmap.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt b/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
deleted file mode 100644
index 38eb607..0000000
--- a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hdfs-hostmap.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
-test-external-host=test-inbound-internal-host
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
----------------------------------------------------------------------
diff --git a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt b/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
deleted file mode 100644
index 576cac4..0000000
--- a/gateway-provider-hostmap-static/src/test/resources/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessorTest/hostmap.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
-test-inbound-host=test-inbound-rewritten-host
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-identity-assertion-pseudo/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/pom.xml b/gateway-provider-identity-assertion-pseudo/pom.xml
index dd7e87c..7f2664a 100644
--- a/gateway-provider-identity-assertion-pseudo/pom.xml
+++ b/gateway-provider-identity-assertion-pseudo/pom.xml
@@ -44,22 +44,30 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+
<dependency>
<groupId>${gateway-group}</groupId>
<artifactId>gateway-spi</artifactId>
</dependency>
+
<dependency>
<groupId>${gateway-group}</groupId>
<artifactId>gateway-provider-rewrite</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
+ <groupId>${gateway-group}</groupId>
<artifactId>gateway-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>test-jetty-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -75,6 +83,11 @@
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.xmlmatchers</groupId>
+ <artifactId>xml-matchers</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
index 3e50eaa..dab9c59 100644
--- a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
+++ b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
@@ -17,14 +17,45 @@
*/
package org.apache.hadoop.gateway.identityasserter.function;
+import org.apache.hadoop.gateway.filter.AbstractGatewayFilter;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletContextListener;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletFilter;
import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
-import org.apache.hadoop.gateway.filter.security.AbstractIdentityAssertionBase;
import org.apache.hadoop.gateway.security.PrimaryPrincipal;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.test.log.NoOpLogger;
+import org.apache.hadoop.test.mock.MockInteraction;
+import org.apache.hadoop.test.mock.MockServlet;
+import org.apache.http.auth.BasicUserPrincipal;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.testing.HttpTester;
+import org.eclipse.jetty.testing.ServletTester;
+import org.eclipse.jetty.util.ArrayQueue;
+import org.eclipse.jetty.util.log.Log;
+import org.hamcrest.core.Is;
+import org.junit.After;
import org.junit.Test;
import javax.security.auth.Subject;
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.EnumSet;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.ServiceLoader;
import static org.hamcrest.CoreMatchers.is;
@@ -34,6 +65,58 @@ import static org.junit.Assert.fail;
public class UsernameFunctionProcessorTest {
+ private ServletTester server;
+ private HttpTester request;
+ private HttpTester response;
+ private ArrayQueue<MockInteraction> interactions;
+ private MockInteraction interaction;
+
+ private static URL getTestResource( String name ) {
+ name = UsernameFunctionProcessorTest.class.getName().replaceAll( "\\.", "/" ) + "/" + name;
+ URL url = ClassLoader.getSystemResource( name );
+ return url;
+ }
+
+ public void setUp( String username, Map<String,String> initParams ) throws Exception {
+ String descriptorUrl = getTestResource( "rewrite.xml" ).toExternalForm();
+
+ Log.setLog( new NoOpLogger() );
+
+ server = new ServletTester();
+ server.setContextPath( "/" );
+ server.getContext().addEventListener( new UrlRewriteServletContextListener() );
+ server.getContext().setInitParameter(
+ UrlRewriteServletContextListener.DESCRIPTOR_LOCATION_INIT_PARAM_NAME, descriptorUrl );
+
+ FilterHolder setupFilter = server.addFilter( SetupFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) );
+ setupFilter.setFilter( new SetupFilter( username ) );
+ FilterHolder rewriteFilter = server.addFilter( UrlRewriteServletFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) );
+ if( initParams != null ) {
+ for( Map.Entry<String,String> entry : initParams.entrySet() ) {
+ rewriteFilter.setInitParameter( entry.getKey(), entry.getValue() );
+ }
+ }
+ rewriteFilter.setFilter( new UrlRewriteServletFilter() );
+
+ interactions = new ArrayQueue<MockInteraction>();
+
+ ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
+ servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
+
+ server.start();
+
+ interaction = new MockInteraction();
+ request = new HttpTester();
+ response = new HttpTester();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if( server != null ) {
+ server.stop();
+ }
+ }
+
@Test
public void testInitialize() throws Exception {
UsernameFunctionProcessor processor = new UsernameFunctionProcessor();
@@ -79,4 +162,85 @@ public class UsernameFunctionProcessorTest {
fail( "Failed to find UsernameFunctionProcessor via service loader." );
}
+ @Test
+ public void testRequestUrlRewriteOfUsernameViaRewriteRule() throws Exception {
+ Map<String,String> initParams = new HashMap<String,String>();
+ initParams.put( "request.url", "test-rule-username" );
+ setUp( "test-user", initParams );
+
+ String input = "<root/>";
+ String expect = "<root/>";
+
+ // Setup the server side request/response interaction.
+ interaction.expect()
+ .method( "PUT" )
+ .requestUrl( "test-output-scheme://test-input-host:777/test-output-path/test-input-path" )
+ .queryParam( "user.name", "test-user" )
+ .queryParam( "test-query-input-name", "test-query-input-value" )
+ .queryParam( "test-query-output-name", "test-query-output-value" )
+ .contentType( "text/xml" )
+ .characterEncoding( "UTF-8" )
+ .content( expect, Charset.forName( "UTF-8" ) );
+ interaction.respond()
+ .status( 200 );
+ interactions.add( interaction );
+ request.setMethod( "PUT" );
+ request.setURI( "/test-input-path?test-query-input-name=test-query-input-value" );
+ request.setVersion( "HTTP/1.1" );
+ request.setHeader( "Host", "test-input-host:777" );
+ request.setContentType( "text/xml; charset=UTF-8" );
+ request.setContent( input );
+
+ response.parse( server.getResponses( request.generate() ) );
+
+ // Test the results.
+ assertThat( response.getStatus(), Is.is( 200 ) );
+ }
+
+ private static class SetupFilter implements Filter {
+ private Subject subject;
+
+ public SetupFilter( String userName ) {
+ subject = new Subject();
+ subject.getPrincipals().add( new BasicUserPrincipal( userName ) );
+ }
+
+ @Override
+ public void init( FilterConfig filterConfig ) throws ServletException {
+ }
+
+ @Override
+ public void doFilter( final ServletRequest request, final ServletResponse response, final FilterChain chain ) throws IOException, ServletException {
+ HttpServletRequest httpRequest = ((HttpServletRequest)request);
+ StringBuffer sourceUrl = httpRequest.getRequestURL();
+ String queryString = httpRequest.getQueryString();
+ if( queryString != null ) {
+ sourceUrl.append( "?" );
+ sourceUrl.append( queryString );
+ }
+ try {
+ request.setAttribute(
+ AbstractGatewayFilter.SOURCE_REQUEST_URL_ATTRIBUTE_NAME,
+ Parser.parse( sourceUrl.toString() ) );
+ } catch( URISyntaxException e ) {
+ throw new ServletException( e );
+ }
+ try {
+ Subject.doAs( subject, new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() throws Exception {
+ chain.doFilter( request, response );
+ return null;
+ }
+ } );
+ } catch( PrivilegedActionException e ) {
+ throw new ServletException( e );
+ }
+ }
+
+ @Override
+ public void destroy() {
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-identity-assertion-pseudo/src/test/resources/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/src/test/resources/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest/rewrite.xml b/gateway-provider-identity-assertion-pseudo/src/test/resources/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest/rewrite.xml
new file mode 100644
index 0000000..cf28b92
--- /dev/null
+++ b/gateway-provider-identity-assertion-pseudo/src/test/resources/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest/rewrite.xml
@@ -0,0 +1,24 @@
+<!--
+ 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 name="test-rule-username">
+ <match pattern="*://{host}:{port}/{path=**}?{**}"/>
+ <rewrite template="test-output-scheme://{host}:{port}/test-output-path/{path=**}?user.name={$username}?{**}?test-query-output-name=test-query-output-value"/>
+ </rule>
+
+</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/pom.xml b/gateway-provider-rewrite-func-hostmap-static/pom.xml
new file mode 100644
index 0000000..54fccb3
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>gateway</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
+
+ <name>gateway-provider-rewrite-func-hostmap-static</name>
+ <description>An extension to the URL rewriter that provides a way to map hostnames in requests and responses.</description>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite</artifactId>
+ </dependency>
+
+ <!-- ********** ********** ********** ********** ********** ********** -->
+ <!-- ********** Test Dependencies ********** -->
+ <!-- ********** ********** ********** ********** ********** ********** -->
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- This must be after restassured otherwise is messes up the hamcrest dependencies. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
new file mode 100644
index 0000000..01d41b9
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/api/HostmapFunctionDescriptor.java
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.api;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor;
+
+public class HostmapFunctionDescriptor implements UrlRewriteFunctionDescriptor<HostmapFunctionDescriptor> {
+
+ public static final String FUNCTION_NAME = "hostmap";
+
+ private String configLocation;
+
+ @Override
+ public String name() {
+ return FUNCTION_NAME;
+ }
+
+ public HostmapFunctionDescriptor config( String configLocation ) {
+ this.configLocation = configLocation;
+ return this;
+ }
+
+ public String config() {
+ return configLocation;
+ }
+
+ public String getConfig() {
+ return config();
+ }
+
+ public void setConfig( String configLocation ) {
+ config( configLocation );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
new file mode 100644
index 0000000..ba9274d
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapDeploymentContributor.java
@@ -0,0 +1,100 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.impl;
+
+import org.apache.hadoop.gateway.deploy.DeploymentContext;
+import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
+import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
+import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
+import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor;
+import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
+import org.apache.hadoop.gateway.topology.Provider;
+import org.apache.hadoop.gateway.topology.Service;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
+
+public class HostmapDeploymentContributor
+ extends ProviderDeploymentContributorBase
+ implements ProviderDeploymentContributor {
+
+ public static final String PROVIDER_ROLE_NAME = HostmapFunctionDescriptor.FUNCTION_NAME;
+ public static final String PROVIDER_IMPL_NAME = "static";
+
+ private static final String REWRITE_ROLE_NAME = "rewrite";
+
+ @Override
+ public String getRole() {
+ return PROVIDER_ROLE_NAME;
+ }
+
+ @Override
+ public String getName() {
+ return PROVIDER_IMPL_NAME;
+ }
+
+ // Write the provider init params to the hostmap.txt file.
+ // Add the function to the rewrite descriptor providing the location of the hostmap.txt file.
+ @Override
+ public void contributeProvider( DeploymentContext context, Provider provider ) {
+ if( provider.isEnabled() ) {
+ UrlRewriteRulesDescriptor rules = context.getDescriptor( REWRITE_ROLE_NAME );
+ if( rules != null ) {
+ HostmapFunctionDescriptor func = rules.addFunction( HostmapFunctionDescriptor.FUNCTION_NAME );
+ if( func != null ) {
+ Asset asset = createAsset( provider );
+ context.getWebArchive().addAsWebInfResource(
+ asset, HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_FILE_NAME );
+ func.config( HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_LOCATION );
+ }
+ }
+ }
+ }
+
+ private Asset createAsset( Provider provider ) {
+ StringWriter buffer = new StringWriter();
+ PrintWriter writer = new PrintWriter( buffer );
+ for( Map.Entry<String,String> entry : provider.getParams().entrySet() ) {
+ String externalHosts = entry.getKey();
+ String internalHosts = entry.getValue();
+ writer.print( externalHosts );
+ writer.print( "=" );
+ writer.println( internalHosts ) ;
+ }
+ writer.close();
+ String string = buffer.toString();
+ Asset asset = new StringAsset( string );
+ return asset;
+ }
+
+ @Override
+ public void contributeFilter(
+ DeploymentContext context,
+ Provider provider,
+ Service service,
+ ResourceDescriptor resource,
+ List<FilterParamDescriptor> params ) {
+ // NoOp.
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
new file mode 100644
index 0000000..9e71a4e
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/hadoop/gateway/hostmap/impl/HostmapFunctionProcessor.java
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.hostmap.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HostmapFunctionProcessor
+ implements UrlRewriteFunctionProcessor<HostmapFunctionDescriptor> {
+
+ public static final String DESCRIPTOR_DEFAULT_FILE_NAME = "hostmap.txt";
+ public static final String DESCRIPTOR_DEFAULT_LOCATION = "/WEB-INF/" + DESCRIPTOR_DEFAULT_FILE_NAME;
+
+ private Map<String, String> inbound = new HashMap<String, String>();
+ private Map<String, String> outbound = new HashMap<String, String>();
+
+ @Override
+ public String name() {
+ return HostmapFunctionDescriptor.FUNCTION_NAME;
+ }
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, HostmapFunctionDescriptor descriptor ) throws Exception {
+ URL url = environment.getResource( DESCRIPTOR_DEFAULT_LOCATION );
+ if( url != null ) {
+ InputStream stream = url.openStream();
+ BufferedReader reader = new BufferedReader( new InputStreamReader( stream ) );
+ String line = reader.readLine();
+ while( line != null ) {
+ String[] lineSplit = line.split( "=" );
+ if( lineSplit.length >= 2 ) {
+ String[] externalSplit = lineSplit[ 0 ].split( "," );
+ String[] internalSplit = lineSplit[ 1 ].split( "," );
+ if( externalSplit.length >= 1 && internalSplit.length >= 1 ) {
+ for( String external : externalSplit ) {
+ inbound.put( external, internalSplit[ 0 ] );
+ }
+ for( String internal : internalSplit ) {
+ outbound.put( internal, externalSplit[ 0 ] );
+ }
+ }
+ }
+ line = reader.readLine();
+ }
+ reader.close();
+ }
+ }
+
+ @Override
+ public void destroy() throws Exception {
+ }
+
+ @Override
+ public String resolve( UrlRewriteContext context, String parameter ) throws Exception {
+ String value;
+ switch( context.getDirection() ) {
+ case IN:
+ value = inbound.get( parameter );
+ break;
+ case OUT:
+ value = outbound.get( parameter );
+ break;
+ default:
+ value = null;
+ }
+ if( value == null ) {
+ value = parameter;
+ }
+// System.out.println( "HOSTMAP: " + parameter + "->" + value );
+ return value;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
new file mode 100644
index 0000000..eda74c1
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor
@@ -0,0 +1,19 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.hostmap.impl.HostmapDeploymentContributor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
new file mode 100644
index 0000000..3e80487
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteFunctionDescriptor
@@ -0,0 +1,19 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.hostmap.api.HostmapFunctionDescriptor
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
new file mode 100644
index 0000000..7c6619c
--- /dev/null
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/resources/META-INF/services/org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor
@@ -0,0 +1,19 @@
+##########################################################################
+# 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.
+##########################################################################
+
+org.apache.hadoop.gateway.hostmap.impl.HostmapFunctionProcessor
\ No newline at end of file
[3/5] KNOX-118: Add rewrite functions to allow use of service
registry within rewrite rules. Also includes initial integration of this with
Oozie.
Posted by km...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java
new file mode 100644
index 0000000..21f2bf5
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java
@@ -0,0 +1,134 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceAddressFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServiceAddressFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServiceAddressFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceAddressFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceAddressFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceAddressFunctionProcessor func = new ServiceAddressFunctionProcessor();
+ assertThat( func.name(), is( "serviceAddr" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServiceAddressFunctionProcessor func = new ServiceAddressFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServiceAddressFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServiceAddressFunctionProcessor func = new ServiceAddressFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServiceAddressFunctionProcessor func = new ServiceAddressFunctionProcessor();
+ func.initialize( env, desc );
+
+ assertThat( func.resolve( ctx, "test-service" ), is( "test-host:777" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+ assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java
new file mode 100644
index 0000000..9544174
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceHostFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceHostFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServiceHostFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServiceHostFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceHostFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceHostFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceHostFunctionProcessor func = new ServiceHostFunctionProcessor();
+ assertThat( func.name(), is( "serviceHost" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServiceHostFunctionProcessor func = new ServiceHostFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServiceHostFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServiceHostFunctionProcessor func = new ServiceHostFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServiceHostFunctionProcessor func = new ServiceHostFunctionProcessor();
+ func.initialize( env, desc );
+
+ assertThat( func.resolve( ctx, "test-service" ), is( "test-host" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+ assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java
new file mode 100644
index 0000000..ce554ad
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServicePathFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServicePathFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServicePathFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServicePathFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServicePathFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServicePathFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServicePathFunctionProcessor func = new ServicePathFunctionProcessor();
+ assertThat( func.name(), is( "servicePath" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServicePathFunctionProcessor func = new ServicePathFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServicePathFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServicePathFunctionProcessor func = new ServicePathFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServicePathFunctionProcessor func = new ServicePathFunctionProcessor();
+ func.initialize( env, desc );
+
+// assertThat( func.resolve( ctx, "test-service" ), is( "/test-path" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+// assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java
new file mode 100644
index 0000000..29c993d
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServicePortFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServicePortFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServicePortFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServicePortFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServicePortFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServicePortFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServicePortFunctionProcessor func = new ServicePortFunctionProcessor();
+ assertThat( func.name(), is( "servicePort" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServicePortFunctionProcessor func = new ServicePortFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServicePortFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServicePortFunctionProcessor func = new ServicePortFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServicePortFunctionProcessor func = new ServicePortFunctionProcessor();
+ func.initialize( env, desc );
+
+ assertThat( func.resolve( ctx, "test-service" ), is( "777" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+ assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
new file mode 100644
index 0000000..c13d302
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
@@ -0,0 +1,233 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.AbstractGatewayFilter;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletContextListener;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletFilter;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.test.TestUtils;
+import org.apache.hadoop.test.log.NoOpLogger;
+import org.apache.hadoop.test.mock.MockInteraction;
+import org.apache.hadoop.test.mock.MockServlet;
+import org.apache.http.auth.BasicUserPrincipal;
+import org.easymock.EasyMock;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.testing.HttpTester;
+import org.eclipse.jetty.testing.ServletTester;
+import org.eclipse.jetty.util.ArrayQueue;
+import org.eclipse.jetty.util.log.Log;
+import org.hamcrest.core.Is;
+import org.junit.Test;
+
+import javax.security.auth.Subject;
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+public class ServiceRegistryFunctionsTest {
+
+ private ServletTester server;
+ private HttpTester request;
+ private HttpTester response;
+ private ArrayQueue<MockInteraction> interactions;
+ private MockInteraction interaction;
+
+ private static URL getTestResource( String name ) {
+ name = ServiceRegistryFunctionsTest.class.getName().replaceAll( "\\.", "/" ) + "/" + name;
+ URL url = ClassLoader.getSystemResource( name );
+ return url;
+ }
+
+ public void setUp( String username, Map<String,String> initParams ) throws Exception {
+ ServiceRegistry mockServiceRegistry = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( mockServiceRegistry.lookupServiceURL( "test-cluster", "NAMENODE.rpc" ) ).andReturn( "test-nn-scheme://test-nn-host:411" ).anyTimes();
+ EasyMock.expect( mockServiceRegistry.lookupServiceURL( "test-cluster", "JOBTRACKER.rpc" ) ).andReturn( "test-jt-scheme://test-jt-host:511" ).anyTimes();
+
+ GatewayServices mockGatewayServices = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( mockGatewayServices.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( mockServiceRegistry ).anyTimes();
+
+ EasyMock.replay( mockServiceRegistry, mockGatewayServices );
+
+ String descriptorUrl = getTestResource( "rewrite.xml" ).toExternalForm();
+
+ Log.setLog( new NoOpLogger() );
+
+ server = new ServletTester();
+ server.setContextPath( "/" );
+ server.getContext().addEventListener( new UrlRewriteServletContextListener() );
+ server.getContext().setInitParameter(
+ UrlRewriteServletContextListener.DESCRIPTOR_LOCATION_INIT_PARAM_NAME, descriptorUrl );
+ server.getContext().setAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE, "test-cluster" );
+ server.getContext().setAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE, mockGatewayServices );
+
+ FilterHolder setupFilter = server.addFilter( SetupFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) );
+ setupFilter.setFilter( new SetupFilter( username ) );
+ FilterHolder rewriteFilter = server.addFilter( UrlRewriteServletFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) );
+ if( initParams != null ) {
+ for( Map.Entry<String,String> entry : initParams.entrySet() ) {
+ rewriteFilter.setInitParameter( entry.getKey(), entry.getValue() );
+ }
+ }
+ rewriteFilter.setFilter( new UrlRewriteServletFilter() );
+
+ interactions = new ArrayQueue<MockInteraction>();
+
+ ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
+ servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
+
+ server.start();
+
+ interaction = new MockInteraction();
+ request = new HttpTester();
+ response = new HttpTester();
+ }
+
+ @Test
+ public void testServiceRegistryFunctionsOnXmlRequestBody() throws Exception {
+ Map<String,String> initParams = new HashMap<String,String>();
+ initParams.put( "request.body", "oozie-conf" );
+ setUp( "test-user", initParams );
+
+ String input = TestUtils.getResourceString( ServiceRegistryFunctionsTest.class, "test-input-body.xml", "UTF-8" );
+ String expect = TestUtils.getResourceString( ServiceRegistryFunctionsTest.class, "test-expect-body.xml", "UTF-8" );
+
+ // Setup the server side request/response interaction.
+ interaction.expect()
+ .method( "PUT" )
+ .requestUrl( "http://test-host:42/test-path" )
+ .contentType( "text/xml" )
+ .characterEncoding( "UTF-8" )
+ .content( expect, Charset.forName( "UTF-8" ) );
+ interaction.respond()
+ .status( 200 );
+ interactions.add( interaction );
+ request.setMethod( "PUT" );
+ request.setURI( "/test-path" );
+ request.setVersion( "HTTP/1.1" );
+ request.setHeader( "Host", "test-host:42" );
+ request.setContentType( "text/xml; charset=UTF-8" );
+ request.setContent( input );
+
+ response.parse( server.getResponses( request.generate() ) );
+
+ // Test the results.
+ assertThat( response.getStatus(), Is.is( 200 ) );
+ }
+
+ @Test
+ public void testServiceRegistryFunctionsOnJsonRequestBody() throws Exception {
+ Map<String,String> initParams = new HashMap<String,String>();
+ initParams.put( "request.body", "oozie-conf" );
+ setUp( "test-user", initParams );
+
+ String input = TestUtils.getResourceString( ServiceRegistryFunctionsTest.class, "test-input-body.json", "UTF-8" );
+ String expect = TestUtils.getResourceString( ServiceRegistryFunctionsTest.class, "test-expect-body.json", "UTF-8" );
+
+ // Setup the server side request/response interaction.
+ interaction.expect()
+ .method( "PUT" )
+ .requestUrl( "http://test-host:42/test-path" )
+ .contentType( "application/json" )
+ .characterEncoding( "UTF-8" )
+ .content( expect, Charset.forName( "UTF-8" ) );
+ interaction.respond()
+ .status( 200 );
+ interactions.add( interaction );
+ request.setMethod( "PUT" );
+ request.setURI( "/test-path" );
+ request.setVersion( "HTTP/1.1" );
+ request.setHeader( "Host", "test-host:42" );
+ request.setContentType( "application/json; charset=UTF-8" );
+ request.setContent( input );
+
+ response.parse( server.getResponses( request.generate() ) );
+
+ // Test the results.
+ assertThat( response.getStatus(), Is.is( 200 ) );
+ }
+
+ private static class SetupFilter implements Filter {
+ private Subject subject;
+
+ public SetupFilter( String userName ) {
+ subject = new Subject();
+ subject.getPrincipals().add( new BasicUserPrincipal( userName ) );
+ }
+
+ @Override
+ public void init( FilterConfig filterConfig ) throws ServletException {
+ }
+
+ @Override
+ public void doFilter( final ServletRequest request, final ServletResponse response, final FilterChain chain ) throws IOException, ServletException {
+ HttpServletRequest httpRequest = ((HttpServletRequest)request);
+ StringBuffer sourceUrl = httpRequest.getRequestURL();
+ String queryString = httpRequest.getQueryString();
+ if( queryString != null ) {
+ sourceUrl.append( "?" );
+ sourceUrl.append( queryString );
+ }
+ try {
+ request.setAttribute(
+ AbstractGatewayFilter.SOURCE_REQUEST_URL_ATTRIBUTE_NAME,
+ Parser.parse( sourceUrl.toString() ) );
+ } catch( URISyntaxException e ) {
+ throw new ServletException( e );
+ }
+ try {
+ Subject.doAs( subject, new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() throws Exception {
+ chain.doFilter( request, response );
+ return null;
+ }
+ } );
+ } catch( PrivilegedActionException e ) {
+ throw new ServletException( e );
+ }
+ }
+
+ @Override
+ public void destroy() {
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java
new file mode 100644
index 0000000..021455a
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java
@@ -0,0 +1,134 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class ServiceSchemeFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServiceSchemeFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServiceSchemeFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceSchemeFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceSchemeFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceSchemeFunctionProcessor func = new ServiceSchemeFunctionProcessor();
+ assertThat( func.name(), is( "serviceScheme" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServiceSchemeFunctionProcessor func = new ServiceSchemeFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServiceSchemeFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace(); //NOTE: This is an OK use of e.printStackTrace in a test.
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServiceSchemeFunctionProcessor func = new ServiceSchemeFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServiceSchemeFunctionProcessor func = new ServiceSchemeFunctionProcessor();
+ func.initialize( env, desc );
+
+ assertThat( func.resolve( ctx, "test-service" ), is( "test-scheme" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+ assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java
new file mode 100644
index 0000000..b7e1dfe
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.svcregfunc.impl;
+
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor;
+import org.apache.hadoop.gateway.services.GatewayServices;
+import org.apache.hadoop.gateway.services.registry.ServiceRegistry;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceAddressFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceSchemeFunctionDescriptor;
+import org.apache.hadoop.gateway.svcregfunc.api.ServiceUrlFunctionDescriptor;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.fail;
+
+public class ServiceUrlFunctionProcessorTest {
+
+ ServiceRegistry reg;
+ GatewayServices svc;
+ UrlRewriteEnvironment env;
+ UrlRewriteContext ctx;
+ ServiceUrlFunctionDescriptor desc;
+
+ @Before
+ public void setUp() {
+ reg = EasyMock.createNiceMock( ServiceRegistry.class );
+ EasyMock.expect( reg.lookupServiceURL( "test-cluster", "test-service" ) ).andReturn( "test-scheme://test-host:777/test-path" ).anyTimes();
+
+ svc = EasyMock.createNiceMock( GatewayServices.class );
+ EasyMock.expect( svc.getService( GatewayServices.SERVICE_REGISTRY_SERVICE ) ).andReturn( reg ).anyTimes();
+
+ env = EasyMock.createNiceMock( UrlRewriteEnvironment.class );
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE ) ).andReturn( svc ).anyTimes();
+ EasyMock.expect( env.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster" ).anyTimes();
+
+ ctx = EasyMock.createNiceMock( UrlRewriteContext.class );
+
+ desc = EasyMock.createNiceMock( ServiceUrlFunctionDescriptor.class );
+
+ EasyMock.replay( reg, svc, env, desc, ctx );
+ }
+
+ @Test
+ public void testServiceLoader() throws Exception {
+ ServiceLoader loader = ServiceLoader.load( UrlRewriteFunctionProcessor.class );
+ Iterator iterator = loader.iterator();
+ assertThat( "Service iterator empty.", iterator.hasNext() );
+ while( iterator.hasNext() ) {
+ Object object = iterator.next();
+ if( object instanceof ServiceUrlFunctionProcessor ) {
+ return;
+ }
+ }
+ fail( "Failed to find " + ServiceUrlFunctionProcessor.class.getName() + " via service loader." );
+ }
+
+ @Test
+ public void testName() throws Exception {
+ ServiceUrlFunctionProcessor func = new ServiceUrlFunctionProcessor();
+ assertThat( func.name(), is( "serviceUrl" ) );
+ }
+
+ @Test
+ public void testInitialize() throws Exception {
+ ServiceUrlFunctionProcessor func = new ServiceUrlFunctionProcessor();
+ try {
+ func.initialize( null, desc );
+ fail( "Should have thrown an IllegalArgumentException" );
+ } catch( IllegalArgumentException e ) {
+ assertThat( e.getMessage(), containsString( "environment" ) );
+ }
+
+ func = new ServiceUrlFunctionProcessor();
+ try {
+ func.initialize( env, null );
+ } catch( Exception e ) {
+ e.printStackTrace(); //NOTE: OK to use e.printStackTrace for a test failure.
+ fail( "Should not have thrown an exception" );
+ }
+
+ func.initialize( env, desc );
+
+ assertThat( func.cluster(), is( "test-cluster" ) );
+ assertThat( func.registry(), sameInstance( reg ) );
+ }
+
+ @Test
+ public void testDestroy() throws Exception {
+ ServiceUrlFunctionProcessor func = new ServiceUrlFunctionProcessor();
+ func.initialize( env, desc );
+ func.destroy();
+
+ assertThat( func.cluster(), nullValue() );
+ assertThat( func.registry(), nullValue() );
+ }
+
+ @Test
+ public void testResolve() throws Exception {
+ ServiceUrlFunctionProcessor func = new ServiceUrlFunctionProcessor();
+ func.initialize( env, desc );
+
+ assertThat( func.resolve( ctx, "test-service" ), is( "test-scheme://test-host:777/test-path" ) );
+ assertThat( func.resolve( ctx, "invalid-test-service" ), is( "invalid-test-service" ) );
+ assertThat( func.resolve( ctx, null ), nullValue() );
+
+ func.destroy();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/rewrite.xml b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/rewrite.xml
new file mode 100644
index 0000000..9bab980
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/rewrite.xml
@@ -0,0 +1,101 @@
+<!--
+ 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 name="nn-url">
+ <rewrite template="{$serviceUrl[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="nn-addr">
+ <rewrite template="{$serviceAddr[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="nn-scheme">
+ <rewrite template="{$serviceScheme[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="nn-host">
+ <rewrite template="{$serviceHost[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="nn-port">
+ <rewrite template="{$servicePort[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="nn-path">
+ <rewrite template="{$servicePath[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="hdfs-addr">
+ <rewrite template="hdfs://{$serviceAddr[NAMENODE.rpc]}"/>
+ </rule>
+
+ <rule name="hdfs-path">
+ <match pattern="{path=**}"/>
+ <rewrite template="hdfs://{$serviceHost[NAMENODE.rpc]}:{$servicePort[NAMENODE.rpc]}/{path=**}"/>
+ </rule>
+
+ <rule name="jt-addr">
+ <rewrite template="{$serviceAddr[JOBTRACKER.rpc]}"/>
+ </rule>
+
+ <filter name="oozie-conf">
+ <content type="*/xml">
+ <buffer path="/configuration/property">
+ <detect path="name" value="nameNode">
+ <apply path="value" rule="hdfs-addr"/>
+ </detect>
+ <detect path="name" value="jobTracker">
+ <apply path="value" rule="jt-addr"/>
+ </detect>
+ <detect path="name" value="oozie.wf.application.path">
+ <apply path="value" rule="hdfs-path"/>
+ </detect>
+ <detect path="name" value="serviceUrl">
+ <apply path="value" rule="nn-url"/>
+ </detect>
+ <detect path="name" value="serviceAddr">
+ <apply path="value" rule="nn-addr"/>
+ </detect>
+ <detect path="name" value="serviceScheme">
+ <apply path="value" rule="nn-scheme"/>
+ </detect>
+ <detect path="name" value="serviceHost">
+ <apply path="value" rule="nn-host"/>
+ </detect>
+ <detect path="name" value="servicePort">
+ <apply path="value" rule="nn-port"/>
+ </detect>
+ <detect path="name" value="servicePath">
+ <apply path="value" rule="nn-path"/>
+ </detect>
+ </buffer>
+ </content>
+ <content type="*/json">
+ <apply path="$.nameNode" rule="hdfs-addr"/>
+ <apply path="$.jobTracker" rule="jt-addr"/>
+ <apply path="$['oozie.wf.application.path']" rule="hdfs-path"/>
+ <apply path="$.serviceUrl" rule="nn-url"/>
+ <apply path="$.serviceAddr" rule="nn-addr"/>
+ <apply path="$.serviceScheme" rule="nn-scheme"/>
+ <apply path="$.serviceHost" rule="nn-host"/>
+ <apply path="$.servicePort" rule="nn-port"/>
+ <apply path="$.servicePath" rule="nn-path"/>
+ </content>
+ </filter>
+
+</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.json
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.json b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.json
new file mode 100644
index 0000000..dcafe6a
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.json
@@ -0,0 +1,11 @@
+{
+ "nameNode":"hdfs://test-nn-host:411",
+ "jobTracker":"test-jt-host:511",
+ "oozie.wf.application.path":"hdfs://test-nn-host:411/tmp/test",
+ "serviceUrl":"test-nn-scheme://test-nn-host:411",
+ "serviceAddr":"test-nn-host:411",
+ "serviceScheme":"test-nn-scheme",
+ "serviceHost":"test-nn-host",
+ "servicePort":"411",
+ "servicePath":"/"
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.xml b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.xml
new file mode 100644
index 0000000..189cb54
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-expect-body.xml
@@ -0,0 +1,40 @@
+<configuration>
+ <property>
+ <name>nameNode</name>
+ <value>hdfs://test-nn-host:411</value>
+ </property>
+ <property>
+ <name>jobTracker</name>
+ <value>test-jt-host:511</value>
+ </property>
+ <property>
+ <name>oozie.wf.application.path</name>
+ <value>hdfs://test-nn-host:411/tmp/test</value>
+ </property>
+
+ <property>
+ <name>serviceUrl</name>
+ <value>test-nn-scheme://test-nn-host:411</value>
+ </property>
+ <property>
+ <name>serviceAddr</name>
+ <value>test-nn-host:411</value>
+ </property>
+ <property>
+ <name>serviceScheme</name>
+ <value>test-nn-scheme</value>
+ </property>
+ <property>
+ <name>serviceHost</name>
+ <value>test-nn-host</value>
+ </property>
+ <property>
+ <name>servicePort</name>
+ <value>411</value>
+ </property>
+ <property>
+ <name>servicePath</name>
+ <value>/</value>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.json
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.json b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.json
new file mode 100644
index 0000000..28700e0
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.json
@@ -0,0 +1,11 @@
+{
+ "nameNode":"default",
+ "jobTracker":"default",
+ "oozie.wf.application.path":"/tmp/test",
+ "serviceUrl":"",
+ "serviceAddr":"",
+ "serviceScheme":"",
+ "serviceHost":"",
+ "servicePort":"",
+ "servicePath":""
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.xml b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.xml
new file mode 100644
index 0000000..2c0d824
--- /dev/null
+++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest/test-input-body.xml
@@ -0,0 +1,40 @@
+<configuration>
+ <property>
+ <name>nameNode</name>
+ <value>default</value>
+ </property>
+ <property>
+ <name>jobTracker</name>
+ <value>default</value>
+ </property>
+ <property>
+ <name>oozie.wf.application.path</name>
+ <value>/tmp/test</value>
+ </property>
+
+ <property>
+ <name>serviceUrl</name>
+ <value></value>
+ </property>
+ <property>
+ <name>serviceAddr</name>
+ <value></value>
+ </property>
+ <property>
+ <name>serviceScheme</name>
+ <value></value>
+ </property>
+ <property>
+ <name>serviceHost</name>
+ <value></value>
+ </property>
+ <property>
+ <name>servicePort</name>
+ <value></value>
+ </property>
+ <property>
+ <name>servicePath</name>
+ <value></value>
+ </property>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/pom.xml b/gateway-provider-rewrite-step-secure-query/pom.xml
new file mode 100644
index 0000000..8ac5cd3
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/pom.xml
@@ -0,0 +1,106 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>gateway</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
+
+ <name>gateway-provider-rewrite-step-secure-query</name>
+ <description>An extension of the gateway that supports securing query parameters.</description>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-util-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-util-urltemplate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-i18n-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-provider-rewrite</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
+ <!-- ********** ********** ********** ********** ********** ********** -->
+ <!-- ********** Test Dependencies ********** -->
+ <!-- ********** ********** ********** ********** ********** ********** -->
+
+ <dependency>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- This must be after restassured otherwise is messes up the hamcrest dependencies. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
new file mode 100644
index 0000000..f026e38
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeDescriptor.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
+
+public class SecureQueryDecodeDescriptor
+ extends UrlRewriteActionDescriptorBase
+ implements UrlRewriteActionDescriptor {
+
+ static final String STEP_NAME = "decode-query";
+
+ public SecureQueryDecodeDescriptor() {
+ super( STEP_NAME );
+ }
+
+ @Override
+ public String getParam() {
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
new file mode 100644
index 0000000..37eec1c
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecodeProcessor.java
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
+import org.apache.hadoop.gateway.util.urltemplate.Builder;
+import org.apache.hadoop.gateway.util.urltemplate.Query;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class SecureQueryDecodeProcessor implements UrlRewriteStepProcessor<SecureQueryDecodeDescriptor> {
+
+ private static final String ENCODED_PARAMETER_NAME = "_";
+
+ @Override
+ public String getType() {
+ return SecureQueryDecodeDescriptor.STEP_NAME;
+ }
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, SecureQueryDecodeDescriptor descriptor ) throws Exception {
+ }
+
+ @Override
+ public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
+ //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
+ Template currUrl = context.getCurrentUrl();
+ Builder newUrl = new Builder( currUrl );
+ Map<String,Query> map = newUrl.getQuery();
+ Query query = map.remove( ENCODED_PARAMETER_NAME );
+ if( query != null ) {
+ String value = query.getFirstValue().getPattern();
+ value = decode( value );
+ StringTokenizer outerParser = new StringTokenizer( value, "&" );
+ while( outerParser.hasMoreTokens() ) {
+ String pair = outerParser.nextToken();
+ StringTokenizer innerParser = new StringTokenizer( pair, "=" );
+ if( innerParser.hasMoreTokens() ) {
+ String paramName = innerParser.nextToken();
+ if( innerParser.hasMoreTokens() ) {
+ String paramValue = innerParser.nextToken();
+ // Need to take out any existing query param.
+ // If we don't then someone could override something in the encoded param.
+ map.remove( paramName );
+ newUrl.addQuery( paramName, "", paramValue );
+ } else {
+ newUrl.addQuery( paramName, "", null );
+ }
+ }
+ }
+ context.setCurrentUrl( newUrl.build() );
+ }
+ return UrlRewriteStepStatus.SUCCESS;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ private static String decode( String string ) throws UnsupportedEncodingException {
+ return new String( Base64.decodeBase64( string ), "UTF-8" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
new file mode 100644
index 0000000..8db2070
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptDescriptor.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
+
+public class SecureQueryDecryptDescriptor
+ extends UrlRewriteActionDescriptorBase
+ implements UrlRewriteActionDescriptor {
+
+ static final String STEP_NAME = "decrypt-query";
+
+ public SecureQueryDecryptDescriptor() {
+ super( STEP_NAME );
+ }
+
+ @Override
+ public String getParam() {
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
new file mode 100644
index 0000000..031e0fb
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDecryptProcessor.java
@@ -0,0 +1,94 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
+import org.apache.hadoop.gateway.util.urltemplate.Builder;
+import org.apache.hadoop.gateway.util.urltemplate.Query;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class SecureQueryDecryptProcessor implements UrlRewriteStepProcessor<SecureQueryDecryptDescriptor> {
+
+ private static final String ENCRYPTED_PARAMETER_NAME = "_";
+
+ private String clusterName;
+
+ @Override
+ public String getType() {
+ return SecureQueryDecryptDescriptor.STEP_NAME;
+ }
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, SecureQueryDecryptDescriptor descriptor ) throws Exception {
+ List<String> values = environment.resolve( "cluster.name" );
+ if( values != null && values.size() > 0 ) {
+ this.clusterName = environment.resolve( "cluster.name" ).get( 0 );
+ }
+ }
+
+ @Override
+ public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
+ //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
+ Template currUrl = context.getCurrentUrl();
+ Builder newUrl = new Builder( currUrl );
+ Map<String,Query> map = newUrl.getQuery();
+ Query query = map.remove( ENCRYPTED_PARAMETER_NAME );
+ if( query != null ) {
+ String value = query.getFirstValue().getPattern();
+ value = decode( value );
+ StringTokenizer outerParser = new StringTokenizer( value, "&" );
+ while( outerParser.hasMoreTokens() ) {
+ String pair = outerParser.nextToken();
+ StringTokenizer innerParser = new StringTokenizer( pair, "=" );
+ if( innerParser.hasMoreTokens() ) {
+ String paramName = innerParser.nextToken();
+ if( innerParser.hasMoreTokens() ) {
+ String paramValue = innerParser.nextToken();
+ // Need to remove from the clear parameters any param name in the encoded params.
+ // If we don't then someone could override something in the encoded param.
+ map.remove( paramName );
+ newUrl.addQuery( paramName, "", paramValue );
+ } else {
+ newUrl.addQuery( paramName, "", null );
+ }
+ }
+ }
+ context.setCurrentUrl( newUrl.build() );
+ context.getParameters().resolve( "gateway.name" );
+ }
+ return UrlRewriteStepStatus.SUCCESS;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ private static String decode( String string ) throws UnsupportedEncodingException {
+ return new String( Base64.decodeBase64( string ), "UTF-8" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
new file mode 100644
index 0000000..2598eb2
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryDeploymentContributor.java
@@ -0,0 +1,91 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.deploy.DeploymentContext;
+import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributor;
+import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
+import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
+import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
+import org.apache.hadoop.gateway.topology.Provider;
+import org.apache.hadoop.gateway.topology.Service;
+
+import java.util.List;
+
+public class SecureQueryDeploymentContributor
+ extends ProviderDeploymentContributorBase
+ implements ProviderDeploymentContributor {
+
+ public static final String PROVIDER_ROLE_NAME = "secure-query";
+ public static final String PROVIDER_IMPL_NAME = "default";
+
+ @Override
+ public String getRole() {
+ return PROVIDER_ROLE_NAME;
+ }
+
+ @Override
+ public String getName() {
+ return PROVIDER_IMPL_NAME;
+ }
+
+ @Override
+ public void contributeProvider( DeploymentContext context, Provider provider ) {
+ if( provider.isEnabled() ) {
+ //TODO: Do something with the keystore service.
+// UrlRewriteRulesDescriptor rules = context.getDescriptor( REWRITE_ROLE_NAME );
+// if( rules != null ) {
+// HostmapFunctionDescriptor func = rules.addFunction( HostmapFunctionDescriptor.FUNCTION_NAME );
+// if( func != null ) {
+// Asset asset = createAsset( provider );
+// context.getWebArchive().addAsWebInfResource(
+// asset, HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_FILE_NAME );
+// func.config( HostmapFunctionProcessor.DESCRIPTOR_DEFAULT_LOCATION );
+// }
+// }
+ }
+ }
+
+// private Asset createAsset( Provider provider ) {
+// StringWriter buffer = new StringWriter();
+// PrintWriter writer = new PrintWriter( buffer );
+// for( Map.Entry<String,String> entry : provider.getParams().entrySet() ) {
+// String externalHosts = entry.getKey();
+// String internalHosts = entry.getValue();
+// writer.print( externalHosts );
+// writer.print( "=" );
+// writer.println( internalHosts ) ;
+// }
+// writer.close();
+// String string = buffer.toString();
+// Asset asset = new StringAsset( string );
+// return asset;
+// }
+
+ @Override
+ public void contributeFilter(
+ DeploymentContext context,
+ Provider provider,
+ Service service,
+ ResourceDescriptor resource,
+ List<FilterParamDescriptor> params ) {
+ //TODO: Might need to add a filter as a way to propigate a keystore service to the processor.
+ // NoOp.
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
new file mode 100644
index 0000000..a29be4e
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeDescriptor.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
+
+public class SecureQueryEncodeDescriptor
+ extends UrlRewriteActionDescriptorBase
+ implements UrlRewriteActionDescriptor {
+
+ static final String STEP_NAME = "encode-query";
+
+ public SecureQueryEncodeDescriptor() {
+ super( STEP_NAME );
+ }
+
+ @Override
+ public String getParam() {
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
new file mode 100644
index 0000000..eff1908
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncodeProcessor.java
@@ -0,0 +1,77 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteEnvironment;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteContext;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepProcessor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteStepStatus;
+import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.gateway.util.urltemplate.Template;
+
+public class SecureQueryEncodeProcessor
+ implements UrlRewriteStepProcessor<SecureQueryEncodeDescriptor> {
+
+ private static final String ENCODED_PARAMETER_NAME = "_";
+
+ @Override
+ public String getType() {
+ return SecureQueryEncodeDescriptor.STEP_NAME;
+ }
+
+ @Override
+ public void initialize( UrlRewriteEnvironment environment, SecureQueryEncodeDescriptor descriptor ) throws Exception {
+ }
+
+ @Override
+ public UrlRewriteStepStatus process( UrlRewriteContext context ) throws Exception {
+ //TODO: Need some way to get a reference to the keystore service and the encryption key in particular.
+ Template url = context.getCurrentUrl();
+ String str = url.toString();
+ String path = str;
+ String query = null;
+ int index = str.indexOf( '?' );
+ if( index >= 0 ) {
+ path = str.substring( 0, index );
+ if( index < str.length() ) {
+ query = str.substring( index + 1 );
+ }
+ }
+ if( query != null ) {
+ query = Base64.encodeBase64String( query.getBytes( "UTF-8" ) );
+ query = removeTrailingEquals( query );
+ url = Parser.parse( path + "?" + ENCODED_PARAMETER_NAME +"=" + query );
+ context.setCurrentUrl( url );
+ }
+ return UrlRewriteStepStatus.SUCCESS;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ private static String removeTrailingEquals( String s ) {
+ int i = s.length()-1;
+ while( i > 0 && s.charAt( i ) == '=' ) {
+ i--;
+ }
+ return s.substring( 0, i+1 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/2f135e16/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
new file mode 100644
index 0000000..9f3d7b9
--- /dev/null
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/hadoop/gateway/securequery/SecureQueryEncryptDescriptor.java
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.gateway.securequery;
+
+import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteActionDescriptor;
+import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
+
+public class SecureQueryEncryptDescriptor
+ extends UrlRewriteActionDescriptorBase
+ implements UrlRewriteActionDescriptor {
+
+ static final String STEP_NAME = "encrypt-query";
+
+ public SecureQueryEncryptDescriptor() {
+ super( STEP_NAME );
+ }
+
+ @Override
+ public String getParam() {
+ return null;
+ }
+
+}