Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2021-07-23 13:00:43 -05:00
parent 7d47ca9d9f c4021023ee
commit 92c2af3649
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
View File

@ -386,7 +386,7 @@ public class ErrorHandler extends AbstractHandler
writeErrorPageStacks(request, writer); writeErrorPageStacks(request, writer);
Request.getBaseRequest(request).getHttpChannel().getHttpConfiguration() Request.getBaseRequest(request).getHttpChannel().getHttpConfiguration()
.writePoweredBy(writer, "<hr>", "<hr/>\n"); .writePoweredBy(writer, "<hr/>", "<hr/>\n");
} }
protected void writeErrorPageMessage(HttpServletRequest request, Writer writer, int code, String message, String uri) protected void writeErrorPageMessage(HttpServletRequest request, Writer writer, int code, String message, String uri)

19
jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
View File

@ -13,10 +13,15 @@
package org.eclipse.jetty.server; package org.eclipse.jetty.server;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher; import jakarta.servlet.RequestDispatcher;
@ -38,6 +43,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
import org.w3c.dom.Document;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.anyOf;
@ -561,7 +567,7 @@ public class ErrorHandlerTest
} }
} }
private String assertContent(HttpTester.Response response) private String assertContent(HttpTester.Response response) throws Exception
{ {
String contentType = response.get(HttpHeader.CONTENT_TYPE); String contentType = response.get(HttpHeader.CONTENT_TYPE);
String content = response.getContent(); String content = response.getContent();
@ -572,6 +578,17 @@ public class ErrorHandlerTest
assertThat(content, not(containsString("<glossary>"))); assertThat(content, not(containsString("<glossary>")));
assertThat(content, not(containsString("<!DOCTYPE>"))); assertThat(content, not(containsString("<!DOCTYPE>")));
assertThat(content, not(containsString("&euro;"))); assertThat(content, not(containsString("&euro;")));
// we expect that our generated output conforms to text/xhtml is well formed
DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
xmlDocumentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder db = xmlDocumentBuilderFactory.newDocumentBuilder();
try (ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)))
{
// We consider this content to be XML well formed if these 2 lines do not throw an Exception
Document doc = db.parse(inputStream);
doc.getDocumentElement().normalize();
}
} }
else if (contentType.contains("text/json")) else if (contentType.contains("text/json"))
{ {