Repository: knox Updated Branches: refs/heads/master e51dc99ac -> 4220e8bb2
KNOX-1412 - Adding UnitTest Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/4220e8bb Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/4220e8bb Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/4220e8bb Branch: refs/heads/master Commit: 4220e8bb2ebde6abe8c2b5ddec72de21097dec34 Parents: e51dc99 Author: Sandeep More <[email protected]> Authored: Tue Aug 7 12:05:36 2018 -0400 Committer: Sandeep More <[email protected]> Committed: Tue Aug 7 12:05:36 2018 -0400 ---------------------------------------------------------------------- .../rewrite/impl/UrlRewriteRequestTest.java | 200 ++++++++++++++++++- .../src/test/resources/KNOX-1412.xml.gz | Bin 0 -> 675 bytes 2 files changed, 190 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/4220e8bb/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java index 368a027..ac594f5 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java @@ -17,24 +17,42 @@ */ package org.apache.knox.gateway.filter.rewrite.impl; -import static org.junit.Assert.assertEquals; - -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import org.apache.http.HttpEntity; +import org.apache.http.entity.ContentType; +import org.apache.knox.gateway.dispatch.InputStreamEntity; import org.apache.knox.gateway.filter.AbstractGatewayFilter; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteEnvironment; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteProcessor; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRuleDescriptor; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletContextListener; +import org.apache.knox.gateway.filter.rewrite.ext.UrlRewriteActionRewriteDescriptorExt; +import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.util.urltemplate.Template; import org.easymock.EasyMock; import org.junit.Test; +import javax.servlet.FilterConfig; +import javax.servlet.ReadListener; +import javax.servlet.ServletContext; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; + public class UrlRewriteRequestTest { @Test public void testResolve() throws Exception { - + UrlRewriteProcessor rewriter = EasyMock.createNiceMock( UrlRewriteProcessor.class ); ServletContext context = EasyMock.createNiceMock( ServletContext.class ); @@ -54,7 +72,7 @@ public class UrlRewriteRequestTest { EasyMock.expect( request.getQueryString()).andReturn(null).anyTimes(); EasyMock.expect( request.getHeader("Host")).andReturn("sourcehost.com").anyTimes(); HttpServletResponse response = EasyMock.createNiceMock( HttpServletResponse.class ); -// EasyMock.replay( rewriter, context, config, request, response ); + // EasyMock.replay( rewriter, context, config, request, response ); EasyMock.replay( rewriter, context, config, request, response ); // instantiate UrlRewriteRequest so that we can use it as a Template factory for targetUrl @@ -74,11 +92,173 @@ public class UrlRewriteRequestTest { EasyMock.expect( request.getQueryString()).andReturn(null).anyTimes(); EasyMock.expect( request.getHeader("Host")).andReturn("sourcehost.com").anyTimes(); EasyMock.expect( request.getAttribute(AbstractGatewayFilter.TARGET_REQUEST_URL_ATTRIBUTE_NAME)) - .andReturn(target).anyTimes(); + .andReturn(target).anyTimes(); EasyMock.replay(request); String hostHeader = rewriteRequest.getHeader("Host"); assertEquals(hostHeader, "targethost.com"); } + + /** + * Test the case where a request has + * Content-Type:text/xml and Content-Encoding:gzip + * @since 1.1.0 + * @throws Exception + */ + @Test + public void testContentEncoding() throws Exception { + /* copy results */ + final ByteArrayOutputStream results = new ByteArrayOutputStream(); + + final InputStream input = Files.newInputStream( + Paths.get(ClassLoader.getSystemResource("KNOX-1412.xml.gz").toURI())); + final ServletInputStream payload = new ServletInputStream() { + + @Override + public int read() throws IOException { + return input.read(); + } + + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + }; + + GatewayServices gatewayServices = EasyMock + .createNiceMock(GatewayServices.class); + UrlRewriteEnvironment environment = EasyMock + .createNiceMock(UrlRewriteEnvironment.class); + EasyMock.expect( + environment.getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE)) + .andReturn(gatewayServices).anyTimes(); + EasyMock.expect( + environment.getAttribute("org.apache.knox.gateway.frontend.uri")) + .andReturn(new URI("https://test-location";)).anyTimes(); + EasyMock.expect(environment.resolve("cluster.name")) + .andReturn(Collections.singletonList("test-cluster-name")).anyTimes(); + + EasyMock.replay(gatewayServices, environment); + + UrlRewriteRulesDescriptor descriptor = UrlRewriteRulesDescriptorFactory + .create(); + UrlRewriteRuleDescriptor rule = descriptor.addRule("test-location"); + rule.pattern("{*}://{*}:{*}/{**}/?{**}"); + UrlRewriteActionRewriteDescriptorExt rewrite = rule.addStep("rewrite"); + rewrite.template("{$inboundurl[host]}"); + UrlRewriteProcessor rewriter = new UrlRewriteProcessor(); + rewriter.initialize(environment, descriptor); + + ServletContext context = EasyMock.createNiceMock(ServletContext.class); + EasyMock.expect(context.getServletContextName()) + .andReturn("test-cluster-name").anyTimes(); + EasyMock.expect(context.getInitParameter("test-init-param-name")) + .andReturn("test-init-param-value").anyTimes(); + EasyMock.expect(context.getAttribute( + UrlRewriteServletContextListener.PROCESSOR_ATTRIBUTE_NAME)) + .andReturn(rewriter).anyTimes(); + + FilterConfig config = EasyMock.createNiceMock(FilterConfig.class); + EasyMock.expect(config.getInitParameter("test-filter-init-param-name")) + .andReturn("test-filter-init-param-value").anyTimes(); + EasyMock.expect(config.getServletContext()).andReturn(context).anyTimes(); + + /* Request wih Content-Type:text/xml and Content-Encoding:gzip */ + HttpServletRequest request1 = EasyMock + .createNiceMock(HttpServletRequest.class); + EasyMock.expect(request1.getScheme()).andReturn("https").anyTimes(); + EasyMock.expect(request1.getServerName()).andReturn("targethost.com") + .anyTimes(); + EasyMock.expect(request1.getServerPort()).andReturn(80).anyTimes(); + EasyMock.expect(request1.getRequestURI()).andReturn("/").anyTimes(); + EasyMock.expect(request1.getQueryString()).andReturn(null).anyTimes(); + EasyMock.expect(request1.getInputStream()).andReturn(payload).anyTimes(); + EasyMock.expect(request1.getContentLength()).andReturn(input.available()) + .anyTimes(); + EasyMock.expect(request1.getContentType()).andReturn("text/xml").anyTimes(); + EasyMock.expect(request1.getHeader("Content-Encoding")).andReturn("gzip") + .anyTimes(); + EasyMock.expect(request1.getHeader("Host")).andReturn("sourcehost.com") + .anyTimes(); + + /* Request wih Content-Type:application/gzip and Content-Encoding:gzip */ + HttpServletRequest request2 = EasyMock + .createNiceMock(HttpServletRequest.class); + EasyMock.expect(request2.getScheme()).andReturn("https").anyTimes(); + EasyMock.expect(request2.getServerName()).andReturn("targethost.com") + .anyTimes(); + EasyMock.expect(request2.getServerPort()).andReturn(80).anyTimes(); + EasyMock.expect(request2.getRequestURI()).andReturn("/").anyTimes(); + EasyMock.expect(request2.getQueryString()).andReturn(null).anyTimes(); + EasyMock.expect(request2.getInputStream()).andReturn(payload).anyTimes(); + EasyMock.expect(request2.getContentLength()).andReturn(input.available()) + .anyTimes(); + EasyMock.expect(request2.getContentType()).andReturn("application/gzip") + .anyTimes(); + EasyMock.expect(request2.getHeader("Content-Encoding")).andReturn("gzip") + .anyTimes(); + EasyMock.expect(request2.getHeader("Host")).andReturn("sourcehost.com") + .anyTimes(); + + /* Request wih Content-Type:application/gzip no content encoding */ + HttpServletRequest request3 = EasyMock + .createNiceMock(HttpServletRequest.class); + EasyMock.expect(request3.getScheme()).andReturn("https").anyTimes(); + EasyMock.expect(request3.getServerName()).andReturn("targethost.com") + .anyTimes(); + EasyMock.expect(request3.getServerPort()).andReturn(80).anyTimes(); + EasyMock.expect(request3.getRequestURI()).andReturn("/").anyTimes(); + EasyMock.expect(request3.getQueryString()).andReturn(null).anyTimes(); + EasyMock.expect(request3.getInputStream()).andReturn(payload).anyTimes(); + EasyMock.expect(request3.getContentLength()).andReturn(input.available()) + .anyTimes(); + EasyMock.expect(request3.getContentType()).andReturn("application/gzip") + .anyTimes(); + EasyMock.expect(request3.getHeader("Host")).andReturn("sourcehost.com") + .anyTimes(); + + HttpServletResponse response = EasyMock + .createNiceMock(HttpServletResponse.class); + + EasyMock.replay(context, config, response, request1, request2, request3); + + /* make sure the following exception is not thrown + * java.lang.RuntimeException: com.ctc.wstx.exc.WstxUnexpectedCharException: + * Illegal character ((CTRL-CHAR, code 31)) + */ + + /* Test for condition where Content-Type:text/xml and Content-Encoding:gzip */ + UrlRewriteRequest rewriteRequest = new UrlRewriteRequest(config, request1); + ServletInputStream inputStream = rewriteRequest.getInputStream(); + HttpEntity entity = new InputStreamEntity(inputStream, + request1.getContentLength(), ContentType.parse("text/xml")); + entity.writeTo(results); + + /* Test for condition where Content-Type:application/gzip and Content-Encoding:gzip */ + rewriteRequest = new UrlRewriteRequest(config, request2); + inputStream = rewriteRequest.getInputStream(); + entity = new InputStreamEntity(inputStream, request1.getContentLength(), + ContentType.parse("application/gzip")); + entity.writeTo(results); + + /* Test for condition where Content-Type:application/gzip no content encoding */ + rewriteRequest = new UrlRewriteRequest(config, request3); + inputStream = rewriteRequest.getInputStream(); + entity = new InputStreamEntity(inputStream, request1.getContentLength(), + ContentType.parse("application/gzip")); + entity.writeTo(results); + + } + } http://git-wip-us.apache.org/repos/asf/knox/blob/4220e8bb/gateway-provider-rewrite/src/test/resources/KNOX-1412.xml.gz ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/resources/KNOX-1412.xml.gz b/gateway-provider-rewrite/src/test/resources/KNOX-1412.xml.gz new file mode 100644 index 0000000..6a63725 Binary files /dev/null and b/gateway-provider-rewrite/src/test/resources/KNOX-1412.xml.gz differ
