Author: ningjiang
Date: Thu Apr 17 00:35:22 2008
New Revision: 648988
URL: http://svn.apache.org/viewvc?rev=648988&view=rev
Log:
CXF-1531 Added the address checking with the path separator
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java?rev=648988&r1=648987&r2=648988&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
Thu Apr 17 00:35:22 2008
@@ -31,12 +31,12 @@
private boolean contextMatchExact;
private JettyHTTPDestination jettyHTTPDestination;
private ServletContext servletContext;
-
+
public JettyHTTPHandler(JettyHTTPDestination jhd, boolean cmExact) {
contextMatchExact = cmExact;
jettyHTTPDestination = jhd;
}
-
+
public void setServletContext(ServletContext sc) {
servletContext = sc;
if (jettyHTTPDestination != null) {
@@ -46,24 +46,32 @@
public void setName(String name) {
urlName = name;
}
-
+
public String getName() {
return urlName;
}
-
+
+ boolean checkContextPath(String target) {
+ String pathString = urlName;
+ if (!pathString.endsWith("/")) {
+ pathString = pathString + "/";
+ }
+ return target.startsWith(pathString);
+ }
+
public void handle(String target, HttpServletRequest req,
- HttpServletResponse resp, int dispatch) throws
IOException {
+ HttpServletResponse resp, int dispatch) throws
IOException {
if (contextMatchExact) {
if (target.equals(urlName)) {
jettyHTTPDestination.doService(servletContext, req, resp);
}
} else {
- if (target.startsWith(urlName)) {
+ if (target.equals(urlName) || checkContextPath(target)) {
jettyHTTPDestination.doService(servletContext, req, resp);
}
}
}
-
-
+
+
}
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=648988&r1=648987&r2=648988&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Thu Apr 17 00:35:22 2008
@@ -50,72 +50,72 @@
private Bus bus;
private IMocksControl control;
private JettyHTTPServerEngineFactory factory;
-
+
@Before
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
bus = control.createMock(Bus.class);
factory = new JettyHTTPServerEngineFactory();
factory.setBus(bus);
-
- Configurer configurer = new ConfigurerImpl();
-
- bus.getExtension(Configurer.class);
- EasyMock.expectLastCall().andReturn(configurer).anyTimes();
- control.replay();
+
+ Configurer configurer = new ConfigurerImpl();
+
+ bus.getExtension(Configurer.class);
+ EasyMock.expectLastCall().andReturn(configurer).anyTimes();
+ control.replay();
}
-
+
@Test
public void testEngineRetrieval() throws Exception {
- JettyHTTPServerEngine engine =
+ JettyHTTPServerEngine engine =
factory.createJettyHTTPServerEngine(9234, "http");
-
+
assertTrue(
"Engine references for the same port should point to the same
instance",
engine == factory.retrieveJettyHTTPServerEngine(9234));
-
+
factory.destroyForPort(1234);
}
-
+
@Test
public void testHttpAndHttps() throws Exception {
- JettyHTTPServerEngine engine =
+ JettyHTTPServerEngine engine =
factory.createJettyHTTPServerEngine(9234, "http");
-
- assertTrue("Protocol must be http",
+
+ assertTrue("Protocol must be http",
"http".equals(engine.getProtocol()));
-
+
engine = new JettyHTTPServerEngine();
engine.setPort(9235);
engine.setTlsServerParameters(new TLSServerParameters());
engine.finalizeConfig();
-
+
List<JettyHTTPServerEngine> list = new
ArrayList<JettyHTTPServerEngine>();
list.add(engine);
factory.setEnginesList(list);
-
+
engine = factory.createJettyHTTPServerEngine(9235, "https");
-
- assertTrue("Protocol must be https",
+
+ assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
-
+
factory.setTLSServerParametersForPort(9234, new TLSServerParameters());
engine = factory.createJettyHTTPServerEngine(9234, "https");
- assertTrue("Protocol must be https",
+ assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
-
+
factory.setTLSServerParametersForPort(9236, new TLSServerParameters());
engine = factory.createJettyHTTPServerEngine(9236, "https");
- assertTrue("Protocol must be https",
+ assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
-
+
factory.destroyForPort(9234);
factory.destroyForPort(9235);
factory.destroyForPort(9236);
}
-
-
- @Test
+
+
+ @Test
public void testSetConnector() throws Exception {
JettyHTTPServerEngine engine = new JettyHTTPServerEngine();
Connector conn = new SslSocketConnector();
@@ -125,10 +125,10 @@
engine.finalizeConfig();
fail("We should get the connector not set with TSLServerParameter
exception.");
} catch (Exception ex) {
- // expect the excepion
+ // expect the excepion
}
-
- engine = new JettyHTTPServerEngine();
+
+ engine = new JettyHTTPServerEngine();
conn = new SelectChannelConnector();
conn.setPort(9002);
engine.setConnector(conn);
@@ -137,9 +137,9 @@
engine.finalizeConfig();
fail("We should get the connector not set right port exception.");
} catch (Exception ex) {
- // expect the exception
+ // expect the exception
}
-
+
engine = new JettyHTTPServerEngine();
conn = new SslSocketConnector();
conn.setPort(9003);
@@ -148,20 +148,20 @@
engine.setTlsServerParameters(new TLSServerParameters());
engine.finalizeConfig();
}
-
- @Test
+
+ @Test
public void testaddServants() throws Exception {
String urlStr = "http://localhost:9234/hello/test";;
String urlStr2 = "http://localhost:9234/hello233/test";;
- JettyHTTPServerEngine engine =
+ JettyHTTPServerEngine engine =
factory.createJettyHTTPServerEngine(9234, "http");
- JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1");
- JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2");
+ JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
+ JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
engine.addServant(new URL(urlStr), handler1);
String response = null;
response = getResponse(urlStr);
assertEquals("The jetty http handler did not take effect", response,
"string1");
-
+
engine.addServant(new URL(urlStr), handler2);
response = getResponse(urlStr);
assertEquals("The jetty http handler did not take effect", response,
"string1string2");
@@ -171,24 +171,24 @@
response = getResponse(urlStr2);
assertEquals("The jetty http handler did not take effect", response,
"string2");
// set the get request
- factory.destroyForPort(9234);
-
+ factory.destroyForPort(9234);
+
}
-
- @Test
+
+ @Test
public void testSetHandlers() throws Exception {
URL url = new URL("http://localhost:9235/hello/test";);
- JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1");
- JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2");
-
+ JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
+ JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
+
JettyHTTPServerEngine engine = new JettyHTTPServerEngine();
engine.setPort(9235);
-
+
List<Handler> handlers = new ArrayList<Handler>();
handlers.add(handler1);
engine.setHandlers(handlers);
engine.finalizeConfig();
-
+
engine.addServant(url, handler2);
String response = null;
try {
@@ -199,23 +199,23 @@
}
engine.stop();
}
-
- @Test
+
+ @Test
public void testGetContextHandler() throws Exception {
String urlStr = "http://localhost:9234/hello/test";;
- JettyHTTPServerEngine engine =
+ JettyHTTPServerEngine engine =
factory.createJettyHTTPServerEngine(9234, "http");
ContextHandler contextHandler = engine.getContextHandler(new
URL(urlStr));
// can't find the context handler here
assertNull(contextHandler);
- JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1");
- JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2");
+ JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
+ JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
engine.addServant(new URL(urlStr), handler1);
-
+
contextHandler = engine.getContextHandler(new URL(urlStr));
contextHandler.setHandler(handler2);
contextHandler.start();
-
+
String response = null;
try {
response = getResponse(urlStr);
@@ -225,14 +225,47 @@
assertEquals("the jetty http handler did not take effect", response,
"string2");
factory.destroyForPort(9234);
}
-
+
+ @Test
+ public void testJettyHTTPHandler() throws Exception {
+ String urlStr1 = "http://localhost:9236/hello/test";;
+ String urlStr2 = "http://localhost:9236/hello/test2";;
+ JettyHTTPServerEngine engine =
+ factory.createJettyHTTPServerEngine(9236, "http");
+ ContextHandler contextHandler = engine.getContextHandler(new
URL(urlStr1));
+ // can't find the context handler here
+ assertNull(contextHandler);
+ JettyHTTPHandler handler1 = new JettyHTTPTestHandler("test", false);
+ JettyHTTPHandler handler2 = new JettyHTTPTestHandler("test2", false);
+ engine.addServant(new URL(urlStr1), handler1);
+ engine.addServant(new URL(urlStr2), handler2);
+
+
+ String response = null;
+ try {
+ response = getResponse(urlStr1 + "/test");
+ } catch (Exception ex) {
+ fail("Can't get the reponse from the server " + ex);
+ }
+ assertEquals("the jetty http handler did not take effect", response,
"test");
+
+ try {
+ response = getResponse(urlStr2 + "/test");
+ } catch (Exception ex) {
+ fail("Can't get the reponse from the server " + ex);
+ }
+ assertEquals("the jetty http handler did not take effect", response,
"test2");
+
+ factory.destroyForPort(9236);
+ }
+
private String getResponse(String target) throws Exception {
- URL url = new URL(target);
-
- URLConnection connection = url.openConnection();
-
+ URL url = new URL(target);
+
+ URLConnection connection = url.openConnection();
+
assertTrue(connection instanceof HttpURLConnection);
- connection.connect();
+ connection.connect();
InputStream in = connection.getInputStream();
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
IOUtils.copy(in, buffer);
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java?rev=648988&r1=648987&r2=648988&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
Thu Apr 17 00:35:22 2008
@@ -25,19 +25,31 @@
import javax.servlet.http.HttpServletResponse;
public class JettyHTTPTestHandler extends JettyHTTPHandler {
- String string;
+ private boolean contextMatchExact;
+ private String response;
- public JettyHTTPTestHandler(String s) {
- super(null, true);
- string = s;
+ public JettyHTTPTestHandler(String s, boolean cmExact) {
+ super(null, cmExact);
+ contextMatchExact = cmExact;
+ response = s;
}
-
+
public void handle(String target, HttpServletRequest req,
- HttpServletResponse resp, int dispatch) throws
IOException {
-
- resp.getOutputStream().write(string.getBytes());
- resp.flushBuffer();
-
+ HttpServletResponse resp, int dispatch) throws
IOException {
+
+ if (contextMatchExact) {
+ // just return the response for testing
+ resp.getOutputStream().write(response.getBytes());
+ resp.flushBuffer();
+
+ } else {
+ if (target.equals(getName()) || checkContextPath(target)) {
+ resp.getOutputStream().write(response.getBytes());
+ resp.flushBuffer();
+ }
+ }
}
+
+
}
