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

Don't add bad URIs, and log if they don't point to anything

This commit is contained in:
Joakim Erdfelt 2022-10-17 15:22:00 -05:00
parent b1c00223aa
commit bb887c9c81
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
View File

@ -148,7 +148,13 @@ public class MetaInfConfiguration extends AbstractConfiguration
Consumer<URI> addContainerResource = (uri) -> Consumer<URI> addContainerResource = (uri) ->
{ {
Resource resource = _resourceFactory.newResource(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); 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) 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; Resource resourcesDir = null;
if (cache != null && cache.containsKey(target)) if (cache != null && cache.containsKey(target))
{ {
@ -691,12 +701,19 @@ public class MetaInfConfiguration extends AbstractConfiguration
if (webInf == null || !webInf.exists() || !webInf.isDirectory()) if (webInf == null || !webInf.exists() || !webInf.isDirectory())
return List.of(); return List.of();
Resource webInfLib = webInf.resolve("/lib"); Resource webInfLib = webInf.resolve("lib");
return webInfLib.list().stream() if (webInfLib != null && webInfLib.exists() && webInfLib.isDirectory())
.filter((lib) -> FileID.isLibArchive(lib.getFileName())) {
.sorted(ResourceCollators.byName(true)) return webInfLib.list().stream()
.collect(Collectors.toList()); .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; return null;
Resource webInf = context.getWebInf(); Resource webInf = context.getWebInf();
// Find WEB-INF/classes // Find WEB-INF/classes
if (webInf != null && webInf.isDirectory()) if (webInf != null && webInf.isDirectory())
{ {
// Look for classes directory // Look for classes directory
Resource classes = webInf.resolve("classes/"); Resource webInfClassesDir = webInf.resolve("classes/");
if (classes.exists()) if (webInfClassesDir != null && webInfClassesDir.exists() && webInfClassesDir.isDirectory())
return classes; return webInfClassesDir;
} }
return null; return null;
} }