From bb887c9c810edc7ad600aa25d49c919bc8571698 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 17 Oct 2022 15:22:00 -0500
Subject: [PATCH] Don't add bad URIs, and log if they don't point to anything

---
 .../ee10/webapp/MetaInfConfiguration.java     | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
index 770d8676bcd..7118acab72b 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
@@ -148,7 +148,13 @@ public class MetaInfConfiguration extends AbstractConfiguration
         Consumer<URI> addContainerResource = (uri) ->
         {
             Resource resource = _resourceFactory.newResource(uri);
-            context.getMetaData().addContainerResource(resource);
+            if (resource == null || !resource.exists())
+            {
+                if (LOG.isDebugEnabled())
+                    LOG.debug("Classpath URI doesn't exist: " + uri);
+            }
+            else
+                context.getMetaData().addContainerResource(resource);
         };
 
         List<URI> containerUris = getAllContainerJars(context);
@@ -379,6 +385,10 @@ public class MetaInfConfiguration extends AbstractConfiguration
      */
     public void scanForResources(WebAppContext context, Resource target, ConcurrentHashMap<Resource, Resource> cache)
     {
+        // Resource target does not exist
+        if (target == null || !target.exists())
+            return;
+
         Resource resourcesDir = null;
         if (cache != null && cache.containsKey(target))
         {
@@ -691,12 +701,19 @@ public class MetaInfConfiguration extends AbstractConfiguration
         if (webInf == null || !webInf.exists() || !webInf.isDirectory())
             return List.of();
 
-        Resource webInfLib = webInf.resolve("/lib");
+        Resource webInfLib = webInf.resolve("lib");
 
-        return webInfLib.list().stream()
-            .filter((lib) -> FileID.isLibArchive(lib.getFileName()))
-            .sorted(ResourceCollators.byName(true))
-            .collect(Collectors.toList());
+        if (webInfLib != null && webInfLib.exists() && webInfLib.isDirectory())
+        {
+            return webInfLib.list().stream()
+                .filter((lib) -> FileID.isLibArchive(lib.getFileName()))
+                .sorted(ResourceCollators.byName(true))
+                .collect(Collectors.toList());
+        }
+        else
+        {
+            return List.of();
+        }
     }
 
     /**
@@ -733,14 +750,13 @@ public class MetaInfConfiguration extends AbstractConfiguration
             return null;
 
         Resource webInf = context.getWebInf();
-
         // Find WEB-INF/classes
         if (webInf != null && webInf.isDirectory())
         {
             // Look for classes directory
-            Resource classes = webInf.resolve("classes/");
-            if (classes.exists())
-                return classes;
+            Resource webInfClassesDir = webInf.resolve("classes/");
+            if (webInfClassesDir != null && webInfClassesDir.exists() && webInfClassesDir.isDirectory())
+                return webInfClassesDir;
         }
         return null;
     }