init
This commit is contained in:
153
test/org/apache/jasper/servlet/TestJspCServletContext.java
Normal file
153
test/org/apache/jasper/servlet/TestJspCServletContext.java
Normal file
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
* 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.jasper.servlet;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.servlet.descriptor.JspConfigDescriptor;
|
||||
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestJspCServletContext {
|
||||
|
||||
@Test
|
||||
public void testWebapp() throws Exception {
|
||||
File appDir = new File("test/webapp");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(3, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(1, context.getEffectiveMinorVersion());
|
||||
JspConfigDescriptor jspConfigDescriptor =
|
||||
context.getJspConfigDescriptor();
|
||||
Assert.assertTrue(jspConfigDescriptor.getTaglibs().isEmpty());
|
||||
Collection<JspPropertyGroupDescriptor> propertyGroups =
|
||||
jspConfigDescriptor.getJspPropertyGroups();
|
||||
Assert.assertEquals(4, propertyGroups.size());
|
||||
Iterator<JspPropertyGroupDescriptor> groupIterator =
|
||||
propertyGroups.iterator();
|
||||
JspPropertyGroupDescriptor groupDescriptor;
|
||||
|
||||
groupDescriptor = groupIterator.next();
|
||||
Assert.assertEquals("text/plain",
|
||||
groupDescriptor.getDefaultContentType());
|
||||
Collection<String> urlPatterns =groupDescriptor.getUrlPatterns();
|
||||
Assert.assertEquals(2, urlPatterns.size());
|
||||
Iterator<String> iterator = urlPatterns.iterator();
|
||||
Assert.assertEquals("/bug49nnn/bug49726a.jsp", iterator.next());
|
||||
Assert.assertEquals("/bug49nnn/bug49726b.jsp", iterator.next());
|
||||
|
||||
groupDescriptor = groupIterator.next();
|
||||
Assert.assertEquals(2, groupDescriptor.getIncludePreludes().size());
|
||||
Assert.assertEquals(2, groupDescriptor.getIncludeCodas().size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_2_2() throws Exception {
|
||||
File appDir = new File("test/webapp-2.2");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(2, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(2, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_2_3() throws Exception {
|
||||
File appDir = new File("test/webapp-2.3");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(2, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(3, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_2_4() throws Exception {
|
||||
File appDir = new File("test/webapp-2.4");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(2, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(4, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_2_5() throws Exception {
|
||||
File appDir = new File("test/webapp-2.5");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(2, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(5, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_3_0() throws Exception {
|
||||
File appDir = new File("test/webapp-3.0");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(3, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(0, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWebapp_3_1() throws Exception {
|
||||
File appDir = new File("test/webapp-3.1");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(3, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(1, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testWebresources() throws Exception {
|
||||
File appDir = new File("test/webresources/dir1");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
Assert.assertEquals(3, context.getEffectiveMajorVersion());
|
||||
Assert.assertEquals(1, context.getEffectiveMinorVersion());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testResourceJARs() throws Exception {
|
||||
File appDir = new File("test/webapp-fragments");
|
||||
JspCServletContext context = new JspCServletContext(
|
||||
null, appDir.toURI().toURL(), null, false, false);
|
||||
|
||||
Set<String> paths = context.getResourcePaths("/");
|
||||
Assert.assertEquals(10, paths.size());
|
||||
Assert.assertTrue(paths.contains("/WEB-INF/"));
|
||||
Assert.assertTrue(paths.contains("/folder/"));
|
||||
Assert.assertTrue(paths.contains("/'singlequote.jsp"));
|
||||
Assert.assertTrue(paths.contains("/'singlequote2.jsp"));
|
||||
Assert.assertTrue(paths.contains("/bug51396.jsp"));
|
||||
Assert.assertTrue(paths.contains("/jndi.jsp"));
|
||||
Assert.assertTrue(paths.contains("/resourceA.jsp"));
|
||||
Assert.assertTrue(paths.contains("/resourceB.jsp"));
|
||||
Assert.assertTrue(paths.contains("/resourceF.jsp"));
|
||||
Assert.assertTrue(paths.contains("/warDirContext.jsp"));
|
||||
|
||||
paths = context.getResourcePaths("/folder/");
|
||||
Assert.assertEquals(3, paths.size());
|
||||
Assert.assertTrue(paths.contains("/folder/resourceC.jsp"));
|
||||
Assert.assertTrue(paths.contains("/folder/resourceD.jsp"));
|
||||
Assert.assertTrue(paths.contains("/folder/resourceE.jsp"));
|
||||
}
|
||||
}
|
||||
108
test/org/apache/jasper/servlet/TestJspServlet.java
Normal file
108
test/org/apache/jasper/servlet/TestJspServlet.java
Normal file
@@ -0,0 +1,108 @@
|
||||
/*
|
||||
* 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.jasper.servlet;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.apache.catalina.Context;
|
||||
import org.apache.catalina.startup.Tomcat;
|
||||
import org.apache.catalina.startup.TomcatBaseTest;
|
||||
import org.apache.tomcat.util.buf.ByteChunk;
|
||||
import org.apache.tomcat.util.descriptor.web.ErrorPage;
|
||||
|
||||
public class TestJspServlet extends TomcatBaseTest {
|
||||
|
||||
@Test
|
||||
public void testBug56568a() throws Exception {
|
||||
Tomcat tomcat = getTomcatInstance();
|
||||
|
||||
// Use the test web application so JSP support is available and the
|
||||
// default JSP error page can be used.
|
||||
File appDir = new File("test/webapp");
|
||||
Context context = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
|
||||
|
||||
// Create a servlet that always throws an exception for a PUT request
|
||||
Tomcat.addServlet(context, "Bug56568Servlet", new Bug56568aServlet());
|
||||
context.addServletMappingDecoded("/bug56568", "Bug56568Servlet");
|
||||
|
||||
// Configure a JSP page to handle the 500 error response
|
||||
// The JSP page will see the same method as the original request (PUT)
|
||||
// PUT requests are normally blocked for JSPs
|
||||
ErrorPage ep = new ErrorPage();
|
||||
ep.setErrorCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
||||
ep.setLocation("/WEB-INF/jsp/error.jsp");
|
||||
context.addErrorPage(ep);
|
||||
|
||||
tomcat.start();
|
||||
|
||||
int rc = methodUrl("http://localhost:" + getPort() + "/test/bug56568",
|
||||
new ByteChunk(), 5000, null, null, "PUT");
|
||||
|
||||
// Make sure we get the original 500 response and not a 405 response
|
||||
// which would indicate that error.jsp is complaining about being called
|
||||
// with the PUT method.
|
||||
Assert.assertEquals(500, rc);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug56568b() throws Exception {
|
||||
getTomcatInstanceTestWebapp(false, true);
|
||||
|
||||
int rc = methodUrl("http://localhost:" + getPort() + "/test/jsp/error.jsp",
|
||||
new ByteChunk(), 500000, null, null, "PUT");
|
||||
|
||||
// Make sure we get a 200 response and not a 405 response
|
||||
// which would indicate that error.jsp is complaining about being called
|
||||
// with the PUT method.
|
||||
Assert.assertEquals(200, rc);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug56568c() throws Exception {
|
||||
getTomcatInstanceTestWebapp(false, true);
|
||||
|
||||
int rc = methodUrl("http://localhost:" + getPort() + "/test/jsp/test.jsp",
|
||||
new ByteChunk(), 500000, null, null, "PUT");
|
||||
|
||||
// Make sure we get a 405 response which indicates that test.jsp is
|
||||
// complaining about being called with the PUT method.
|
||||
Assert.assertEquals(405, rc);
|
||||
}
|
||||
|
||||
|
||||
private static class Bug56568aServlet extends HttpServlet {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
protected void doPut(HttpServletRequest req, HttpServletResponse resp)
|
||||
throws ServletException, IOException {
|
||||
throw new ServletException();
|
||||
}
|
||||
}
|
||||
}
|
||||
125
test/org/apache/jasper/servlet/TestTldScanner.java
Normal file
125
test/org/apache/jasper/servlet/TestTldScanner.java
Normal file
@@ -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.jasper.servlet;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.apache.catalina.Context;
|
||||
import org.apache.catalina.startup.Tomcat;
|
||||
import org.apache.catalina.startup.TomcatBaseTest;
|
||||
import org.apache.juli.logging.LogFactory;
|
||||
import org.apache.tomcat.Jar;
|
||||
import org.apache.tomcat.util.buf.ByteChunk;
|
||||
import org.apache.tomcat.util.scan.JarFactory;
|
||||
import org.apache.tomcat.util.scan.StandardJarScanner;
|
||||
import org.easymock.EasyMock;
|
||||
|
||||
public class TestTldScanner extends TomcatBaseTest {
|
||||
|
||||
@Test
|
||||
public void testWithWebapp() throws Exception {
|
||||
Tomcat tomcat = getTomcatInstance();
|
||||
File appDir = new File("test/webapp-3.0");
|
||||
Context context = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
|
||||
tomcat.start();
|
||||
|
||||
TldScanner scanner =
|
||||
new TldScanner(context.getServletContext(), true, true, true);
|
||||
scanner.scan();
|
||||
Assert.assertEquals(5, scanner.getUriTldResourcePathMap().size());
|
||||
Assert.assertEquals(1, scanner.getListeners().size());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testBug55807() throws Exception {
|
||||
Tomcat tomcat = getTomcatInstance();
|
||||
|
||||
File appDir = new File("test/webapp");
|
||||
Context context = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
|
||||
((StandardJarScanner) context.getJarScanner()).setScanAllDirectories(true);
|
||||
tomcat.start();
|
||||
|
||||
ByteChunk res = new ByteChunk();
|
||||
Map<String,List<String>> headers = new HashMap<>();
|
||||
|
||||
getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug55807.jsp",
|
||||
res, headers);
|
||||
|
||||
// Check request completed
|
||||
String result = res.toString();
|
||||
assertEcho(result, "OK");
|
||||
|
||||
// Check the dependencies count
|
||||
Assert.assertTrue(result.contains("<p>DependenciesCount: 1</p>"));
|
||||
|
||||
// Check the right timestamp was used in the dependency
|
||||
File tld = new File("test/webapp/WEB-INF/classes/META-INF/bug55807.tld");
|
||||
String expected = "<p>/WEB-INF/classes/META-INF/bug55807.tld : " +
|
||||
tld.lastModified() + "</p>";
|
||||
Assert.assertTrue(result.contains(expected));
|
||||
|
||||
|
||||
// Check content type
|
||||
String contentType = getSingleHeader("Content-Type", headers);
|
||||
Assert.assertTrue(contentType.startsWith("text/html"));
|
||||
}
|
||||
|
||||
|
||||
/** Assertion for text printed by tags:echo */
|
||||
private static void assertEcho(String result, String expected) {
|
||||
Assert.assertTrue(result, result.indexOf("<p>" + expected + "</p>") > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBug57647() throws Exception {
|
||||
TldScanner scanner = EasyMock.createMock(TldScanner.class);
|
||||
Field f = TldScanner.class.getDeclaredField("log");
|
||||
f.setAccessible(true);
|
||||
f.set(scanner, LogFactory.getLog(TldScanner.class));
|
||||
Constructor<TldScanner.TldScannerCallback> constructor =
|
||||
TldScanner.TldScannerCallback.class.getDeclaredConstructor(TldScanner.class);
|
||||
constructor.setAccessible(true);
|
||||
TldScanner.TldScannerCallback callback = constructor.newInstance(scanner);
|
||||
|
||||
File webappDir = new File("webapps/examples");
|
||||
Assert.assertFalse(callback.scanFoundNoTLDs());
|
||||
scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-spec-1.2.5.jar");
|
||||
Assert.assertTrue(callback.scanFoundNoTLDs());
|
||||
scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-impl-1.2.5.jar");
|
||||
Assert.assertTrue(callback.scanFoundNoTLDs());
|
||||
}
|
||||
|
||||
private static void scan(TldScanner.TldScannerCallback callback, File webapp, String path)
|
||||
throws Exception {
|
||||
String fullPath = new File(webapp, path).toURI().toString();
|
||||
URL jarUrl = new URL("jar:" + fullPath + "!/");
|
||||
try (Jar jar = JarFactory.newInstance(jarUrl)) {
|
||||
callback.scan(jar, path, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user