Initial Contribution
Signed-off-by: Vinay Vishal <vinay.vishal@oracle.com>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
new file mode 100644
index 0000000..0ad211e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for 6170450 ("request.getScheme() does not return the correct
+ * protocol when using passthrough plugin").
+ *
+ * This test includes a 'Proxy-keysize' header in the request and therefore
+ * expects the scheme of the URL returned as the value of the 'Location'
+ * response header to be HTTPS (as opposed to regular HTTP).
+ */
+public class WebTest {
+
+ private static SimpleReporterAdapter stat
+ = new SimpleReporterAdapter("appserv-tests");
+ private static final String TEST_NAME = "web-proxy-keysize";
+
+ private String host;
+ private String port;
+ private String contextRoot;
+
+ public WebTest(String[] args) {
+ host = args[0];
+ port = args[1];
+ contextRoot = args[2];
+ }
+
+ public static void main(String[] args) {
+ stat.addDescription("Unit test for 6170450");
+ WebTest webTest = new WebTest(args);
+ webTest.doTest();
+ stat.printSummary(TEST_NAME);
+ }
+
+ public void doTest() {
+
+ try {
+ invokeJsp();
+ } catch (Exception ex) {
+ stat.addStatus(TEST_NAME, stat.FAIL);
+ ex.printStackTrace();
+ }
+ }
+
+ private void invokeJsp() throws Exception {
+
+ Socket sock = null;
+ OutputStream os = null;
+ InputStream is = null;
+ BufferedReader bis = null;
+ String line = null;
+ try {
+ sock = new Socket(host, new Integer(port).intValue());
+ os = sock.getOutputStream();
+ String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
+ System.out.println(get);
+ os.write(get.getBytes());
+ os.write("Proxy-keysize: 512\n".getBytes());
+ os.write("\n".getBytes());
+
+ is = sock.getInputStream();
+ bis = new BufferedReader(new InputStreamReader(is));
+
+ while ((line = bis.readLine()) != null) {
+ if (line.startsWith("Location:")) {
+ break;
+ }
+ }
+ } finally {
+ try {
+ if (sock != null) {
+ sock.close();
+ }
+ } catch(IOException ioe) {
+ // ignore
+ }
+ try {
+ if (os != null) {
+ os.close();
+ }
+ } catch(IOException ioe) {
+ // ignore
+ }
+ try {
+ if (is != null) {
+ is.close();
+ }
+ } catch(IOException ioe) {
+ // ignore
+ }
+ try {
+ if (bis != null) {
+ bis.close();
+ }
+ } catch(IOException ioe) {
+ // ignore
+ }
+ }
+
+ if (line != null) {
+ System.out.println("Location header: " + line);
+
+ String location = line.substring("Location:".length()).trim();
+ if (location.startsWith("https")) {
+ stat.addStatus(TEST_NAME, stat.PASS);
+ } else {
+ System.err.println("Wrong schema in Location response header, "
+ + "expected: https");
+ stat.addStatus(TEST_NAME, stat.FAIL);
+ }
+ } else {
+ System.err.println("Missing Location response header");
+ stat.addStatus(TEST_NAME, stat.FAIL);
+ }
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
new file mode 100644
index 0000000..bc42e12
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
@@ -0,0 +1,25 @@
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+
+<property name="module" value="web"/>
+<property name="appname" value="${module}-proxy-keysize"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="web.xml" value="descriptor/web.xml"/>
+<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
+<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
new file mode 100644
index 0000000..ffb6657
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+ &commonSetup;
+ &commonBuild;
+ &testproperties;
+ &run;
+
+ <target name="all" depends="setup,build,deploy,run,undeploy,restore"/>
+
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
+
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="servlet"/>
+ </antcall>
+ </target>
+
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes"/>
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="yes"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
+ </antcall>
+
+ <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+ includes="WebTest.java"/>
+ </target>
+
+ <target name="build-publish-war" depends="build, publish-war-common" />
+
+ <target name="setup" depends="init-common">
+ <antcall target="asadmin-common-ignore-fail">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled=true"/>
+ </antcall>
+ </target>
+
+ <target name="re-deploy" depends="init-common">
+ <antcall target="deploy-war-common"/>
+ </target>
+
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-war-common"/>
+ </target>
+
+ <target name="run" depends="init-common">
+ <java classname="WebTest">
+ <arg value="${http.host}"/>
+ <arg value="${http.port}"/>
+ <arg value="${contextroot}"/>
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+ <pathelement location="."/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common"/>
+ </target>
+
+ <target name="restore" depends="init-common">
+ <antcall target="asadmin-common-ignore-fail">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.auth-pass-through-enabled="/>
+ </antcall>
+ </target>
+
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/descriptor/web.xml
new file mode 100644
index 0000000..b9c6785
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/descriptor/web.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd"
+ version="2.4">
+
+</web-app>
+
+
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/docroot/jsp/test.jsp b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/docroot/jsp/test.jsp
new file mode 100644
index 0000000..63e096b
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/docroot/jsp/test.jsp
@@ -0,0 +1,21 @@
+<%--
+
+ Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%
+response.sendRedirect("/redirectTarget");
+ %>
