From 8568bfc6e21c898f1421062f8290ece4a3b73b2a Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 15 Dec 2024 12:49:23 -1000
Subject: [PATCH 1/2] [JENKINS-73942] Downloading tgz artifacts in Firefox is
 broken

(cherry picked from commit 171097618b5b2b70ec3142e3efc80b4f2aff9601)
---
 pom.xml     | 2 +-
 war/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c419384d2ce6..317b0e7555cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>8.1</winstone.version>
+    <winstone.version>8.4</winstone.version>
     <node.version>20.17.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
diff --git a/war/pom.xml b/war/pom.xml
index d7beb09ce5ea..e4b82c29a6a4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -637,7 +637,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty.ee9</groupId>
         <artifactId>jetty-ee9-maven-plugin</artifactId>
-        <version>12.0.13</version>
+        <version>12.0.16</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

From f11f8635ecde29380ccab5c42085f5e434731bb0 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 6 Jan 2025 11:40:19 -0800
Subject: [PATCH 2/2] [JENKINS-75003] Zip-based tool installer configuration
 incorrectly rejects non-HTTP(S) URLs (regression in 2.379)

(cherry picked from commit 34aba67577d043c7b44f206d7399fbb3ced54117)
---
 .../main/java/hudson/tools/ZipExtractionInstaller.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
index 1e1c171f6a95..4646980ea8d6 100644
--- a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
+++ b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
@@ -43,6 +43,8 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.file.FileSystemNotFoundException;
+import java.nio.file.Path;
 import jenkins.MasterToSlaveFileCallable;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
@@ -117,6 +119,14 @@ public FormValidation doCheckUrl(@QueryParameter String value) throws Interrupte
             } catch (URISyntaxException e) {
                 return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
             }
+            if (uri.getScheme() != null && !uri.getScheme().startsWith("http")) {
+                try {
+                    Path.of(uri);
+                    return FormValidation.ok();
+                } catch (FileSystemNotFoundException | IllegalArgumentException e) {
+                    return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
+                }
+            }
             HttpClient httpClient = ProxyConfiguration.newHttpClient();
             HttpRequest httpRequest;
             try {