Jetty 12.0.x 11377 fix jettyhome osgi path (#11418)

* Issue #11377 fix jettyhome osgi path and WebInfConfiguration.unpack for windows
jetty · Feb 26, 2024 · a1cb475 · a1cb475
1 parent 1ca1c96
commit a1cb475
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java
@@ -16,7 +16,9 @@
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -28,26 +30,31 @@
 
 import org.eclipse.jetty.osgi.OSGiServerConstants;
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.URIUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Various useful functions utility methods for OSGi wide use.
  */
 public class Util
 {
+     private static final Logger LOG = LoggerFactory.getLogger(Util.class);
+
     /**
      * Resolve a path either absolutely or against the bundle install location, or
      * against jetty home.
      * 
      * @param path the path to resolve
      * @param bundle the bundle
      * @param jettyHome the path to jetty home
-     * @return the URI within the bundle as a usable URI
+     * @return the URI resolved either absolutely or against the bundle install location or jetty home.
      */
     public static URI resolvePathAsLocalizedURI(String path, Bundle bundle, Path jettyHome)
     throws Exception
@@ -56,7 +63,21 @@ public static URI resolvePathAsLocalizedURI(String path, Bundle bundle, Path jet
             return null;
 
         if (path.startsWith("/") || path.startsWith("file:/")) //absolute location
-            return Paths.get(path).toUri();
+            return URIUtil.toURI(path);
+        else
+        {
+            try
+            {
+                Path p = FileSystems.getDefault().getPath(path);
+                if (p.isAbsolute())
+                    return p.toUri();
+            }
+            catch (InvalidPathException x)
+            {
+                //ignore and try via the jetty bundle instead
+                LOG.trace("IGNORED", x);
+            }
+        }
 
         //relative location
         //try inside the bundle first

diff --git a/...gi/jetty-ee10-osgi-boot/src/main/java/org/eclipse/jetty/ee10/osgi/boot/EE10Activator.java b/...gi/jetty-ee10-osgi-boot/src/main/java/org/eclipse/jetty/ee10/osgi/boot/EE10Activator.java
@@ -48,6 +48,7 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.FileID;
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.resource.URLResourceFactory;
@@ -357,7 +358,7 @@ public ContextHandler createContextHandler(AbstractContextProvider provider, App
         {
             OSGiApp osgiApp = OSGiApp.class.cast(app);
             String jettyHome = (String)app.getDeploymentManager().getServer().getAttribute(OSGiServerConstants.JETTY_HOME);
-            Path jettyHomePath = (StringUtil.isBlank(jettyHome) ? null : Paths.get(jettyHome));
+            Path jettyHomePath = StringUtil.isBlank(jettyHome) ? null : Paths.get(URIUtil.toURI(jettyHome));
 
             WebAppContext webApp = new WebAppContext();
 

diff --git a/...10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebInfConfiguration.java b/...10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebInfConfiguration.java
@@ -239,7 +239,8 @@ public void unpack(WebAppContext context) throws IOException
 
                 if (war != null)
                 {
-                    Path warPath = Path.of(war);
+                    Path warPath = Path.of(URIUtil.toURI(war));
+
                     // look for a sibling like "foo/" to a "foo.war"
                     if (FileID.isWebArchive(warPath) && Files.exists(warPath))
                     {

diff --git a/...-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java b/...-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java
@@ -49,6 +49,7 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.FileID;
 import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.resource.URLResourceFactory;
@@ -356,7 +357,7 @@ public ContextHandler createContextHandler(AbstractContextProvider provider, App
         {
             OSGiApp osgiApp = OSGiApp.class.cast(app);
             String jettyHome = (String)app.getDeploymentManager().getServer().getAttribute(OSGiServerConstants.JETTY_HOME);
-            Path jettyHomePath = (StringUtil.isBlank(jettyHome) ? null : Paths.get(jettyHome));
+            Path jettyHomePath = StringUtil.isBlank(jettyHome) ? null : Paths.get(URIUtil.toURI(jettyHome));
 
             WebAppContext webApp = new WebAppContext();