Merge branch 'async-support' into bugs/231-julroot

jetty-project · Aug 10, 2016 · cf4ce6a · cf4ce6a
2 parents dd4bc90 + 9172a68
commit cf4ce6a
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 2 deletions.
diff --git a/jetty9-base/pom.xml b/jetty9-base/pom.xml
@@ -125,7 +125,7 @@
           <arguments>
             <argument>-jar</argument>
             <argument>../jetty-distribution-${jetty.version}/start.jar</argument>
-            <argument>--add-to-startd=gae,http,deploy,jsp,jstl</argument>
+            <argument>--add-to-startd=gae,http,jsp,jstl</argument>
           </arguments>
         </configuration>
       </plugin>

diff --git a/jetty9-base/src/main/jetty-base/etc/gae-web.xml b/jetty9-base/src/main/jetty-base/etc/gae-web.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+  <!-- Protect app.yaml -->
+  <Get id="protected" name="ProtectedTargets"/>
+  <Set name="ProtectedTargets">
+    <Call class="org.eclipse.jetty.util.ArrayUtil" name="addToArray">
+      <Arg><Ref refid="protected"/></Arg>
+      <Arg>/app.yaml</Arg>
+      <Arg></Arg>
+    </Call>
+  </Set>
+
+</Configure>
+
diff --git a/jetty9-base/src/main/jetty-base/etc/gae.xml b/jetty9-base/src/main/jetty-base/etc/gae.xml
@@ -69,6 +69,16 @@
     </Call>
   </Ref>
 
+  <Ref refid="DeploymentManager">
+    <Call name="addLifeCycleBinding">
+      <Arg>
+        <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
+          <Set name="jettyXml"><Property name="jetty.base"/>/etc/gae-web.xml</Set>
+        </New>
+      </Arg>
+    </Call>
+  </Ref>
+
   <!-- TODO remove when this has been added to jetty.xml -->
   <Set name="stopTimeout"><Property name="jetty.server.stopTimeout" default="30000"/></Set>
 

diff --git a/jetty9-base/src/main/jetty-base/modules/gae.mod b/jetty9-base/src/main/jetty-base/modules/gae.mod
@@ -5,6 +5,7 @@
 [depend]
 resources
 server
+deploy
 
 [optional]
 

diff --git a/...pat-base/src/main/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContext.java b/...pat-base/src/main/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContext.java
@@ -49,6 +49,7 @@
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.util.ArrayUtil;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.log.JavaUtilLog;
 import org.eclipse.jetty.util.resource.Resource;
@@ -343,6 +344,8 @@ public void init(String appengineWebXmlFile) throws AppEngineConfigException, IO
     getSessionHandler().setSessionManager(sessionManager);
 
     VmRuntimeInterceptor.init(appEngineWebXml);
+
+    setProtectedTargets(ArrayUtil.addToArray(getProtectedTargets(), "/app.yaml", String.class));
   }
 
   @Override

diff --git a/...ase/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java b/...ase/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java
@@ -90,6 +90,15 @@ public void testWelcomeServlet() throws Exception {
     assertTrue(Arrays.asList(lines).contains("Hello, World!"));
   }
 
+  /**
+   * Tests that app.yaml is protected
+   */
+  public void testAppYamlHidden() throws Exception {
+    HttpURLConnection connection = (HttpURLConnection) createUrl("/app.yaml").openConnection();
+    connection.connect();
+    assertEquals(404, connection.getResponseCode());
+  }
+
   /**
    * Test that the API Proxy was configured by the VmRuntimeFilter.
    */

diff --git a/jetty9-compat/src/main/docker/Dockerfile b/jetty9-compat/src/main/docker/Dockerfile
@@ -29,7 +29,7 @@ ADD jetty-base jetty_run.sh $JETTY_BASE/
 WORKDIR $JETTY_BASE
 RUN sed -i 's/^\([a-zA-Z\.]*=\).*/#\1(see gae.ini)/' start.d/server.ini \
  && java -jar $JETTY_HOME/start.jar --dry-run \
-  | sed 's/^.*java /& ${JAVA_OPTS} /' > jetty_cmd.sh \
+  | sed 's/^.*java /exec & ${JAVA_OPTS} /' > jetty_cmd.sh \
  && chown -R jetty:jetty $JETTY_BASE \
  && chmod +x $JETTY_BASE/jetty_run.sh
 

diff --git a/testwebapp/src/main/webapp/app.yaml b/testwebapp/src/main/webapp/app.yaml
@@ -0,0 +1 @@
+# dummy app.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     [depend]
     resources
     server
+    deploy
     [optional]
@@ Expand Down @@