Fix #5327 NPE in PushBuilder

Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Sep 27, 2020 · bd4b210 · bd4b210
1 parent d77911e
commit bd4b210
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -316,7 +316,7 @@ public PushBuilder newPushBuilder()
 
         HttpField authField = getHttpFields().getField(HttpHeader.AUTHORIZATION);
         //TODO check what to do for digest etc etc
-        if (getUserPrincipal() != null && authField.getValue().startsWith("Basic"))
+        if (authField != null && getUserPrincipal() != null && authField.getValue().startsWith("Basic"))
             fields.add(authField);
 
         String id;

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
@@ -1873,6 +1873,25 @@ public void testPushBuilder() throws Exception
         assertThat(builder.getHeader("Cookie"), not(containsString("bad")));
     }
 
+    @Test
+    public void testPushBuilderWithIdNoAuth() throws Exception
+    {
+        String uri = "/foo/something";
+        Request request = new TestRequest(null, null)
+        {
+            @Override
+            public Principal getUserPrincipal()
+            {
+                return () -> "test";
+            }
+        };
+        HttpFields.Mutable fields = HttpFields.build();
+        request.setMetaData(new MetaData.Request("GET", HttpURI.from(uri), HttpVersion.HTTP_1_0, fields));
+        assertTrue(request.isPushSupported());
+        PushBuilder builder = request.newPushBuilder();
+        assertNotNull(builder);
+    }
+
     @Test
     public void testServletPathMapping() throws Exception
     {