diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index d122f33e9deb..30bdfe2f97f1 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -1122,6 +1122,14 @@ private void writeHeaders(int status, MimeHeaders headers) { int size = headers.size(); for (int i = 0; i < size; i++) { + // RFC 9110, section 5.1 requires a field name to be a token + if (!HttpParser.isToken(headers.getName(i).toString())) { + log.warn(sm.getString("http11processor.response.invalidHeader", headers.getName(i), + headers.getValue(i))); + headers.removeHeader(i--); + size--; + continue; + } try { outputBuffer.sendHeader(headers.getName(i), headers.getValue(i)); } catch (IllegalArgumentException iae) { diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java index ad059c2ea69f..771a9ced92f3 100644 --- a/test/org/apache/coyote/http11/TestHttp11Processor.java +++ b/test/org/apache/coyote/http11/TestHttp11Processor.java @@ -2380,4 +2380,62 @@ public void testAltServiceInvalidValue() { protocol.setAltService(null); Assert.assertNull(protocol.getAltService()); } + + + /* + * RFC 9110, section 5.1 requires a field name to be a token. Header fields with any other name are not sent. + */ + @Test + public void testResponseHeaderNameNotToken() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + // No file system docBase required + Context ctx = getProgrammaticRootContext(); + + Tomcat.addServlet(ctx, "InvalidHeaderNameServlet", new InvalidHeaderNameServlet()); + ctx.addServletMapping("/*", "InvalidHeaderNameServlet"); + + tomcat.start(); + + // @formatter:off + String request = + "GET /anything HTTP/1.1" + CRLF + + "Host: any" + CRLF + + "Connection: close" + CRLF + + CRLF; + // @formatter:on + + Client client = new Client(tomcat.getConnector().getLocalPort()); + client.setRequest(new String[] { request }); + + client.connect(); + client.processRequest(); + + Assert.assertTrue(client.isResponse200()); + List headers = client.getResponseHeaders(); + Assert.assertTrue(headers.toString(), headers.contains("X-Valid: v")); + for (String header : headers) { + for (String name : InvalidHeaderNameServlet.INVALID_NAMES) { + Assert.assertFalse(header, header.startsWith(name)); + } + } + } + + + private static final class InvalidHeaderNameServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + private static final String[] INVALID_NAMES = { "bad name", "X(Y)", "X:Y", "Xé" }; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + for (String name : INVALID_NAMES) { + resp.setHeader(name, "v"); + } + resp.setHeader("X-Valid", "v"); + resp.setContentType("text/plain"); + resp.getWriter().print("test - data"); + } + } }