From f15766dd48820b94878c8f3d6f2062bce7212696 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 1 Jul 2024 12:26:29 -0700
Subject: [PATCH] [JENKINS-73381] Downloading `tar.gz` artifacts in Firefox is
 broken (#397)

---
 src/main/resources/winstone/mime.properties |   6 +++--
 src/test/java/winstone/LauncherTest.java    |  24 ++++++++++++++++++++
 src/testwebapp/lipsum.tar.gz                | Bin 0 -> 1345 bytes
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/testwebapp/lipsum.tar.gz

diff --git a/src/main/resources/winstone/mime.properties b/src/main/resources/winstone/mime.properties
index e5768c1b..76b659ab 100644
--- a/src/main/resources/winstone/mime.properties
+++ b/src/main/resources/winstone/mime.properties
@@ -279,7 +279,8 @@ gtm=application/vnd.groove-tool-message
 gtw=model/vnd.gtw
 gv=text/vnd.graphviz
 gxt=application/vnd.geonext
-gz=application/x-gzip
+gz=application/gzip
+gzip=application/gzip
 h261=video/h261
 h263=video/h263
 h264=video/h264
@@ -765,6 +766,7 @@ sxw=application/vnd.sun.xml.writer
 taglet=application/vnd.mynfc
 tao=application/vnd.tao.intent-module-archive
 tar=application/x-tar
+tar.gz=application/gzip
 tcap=application/vnd.3gpp2.tcap
 tcl=application/x-tcl
 teacher=application/vnd.smart.teacher
@@ -776,7 +778,7 @@ texinfo=application/x-texinfo
 text=text/plain
 tfi=application/thraud+xml
 tfm=application/x-tex-tfm
-tgz=application/x-gzip
+tgz=application/x-gtar
 thmx=application/vnd.ms-officetheme
 tiff=image/tiff
 tif=image/tiff
diff --git a/src/test/java/winstone/LauncherTest.java b/src/test/java/winstone/LauncherTest.java
index b4e99d14..577b26ce 100644
--- a/src/test/java/winstone/LauncherTest.java
+++ b/src/test/java/winstone/LauncherTest.java
@@ -17,6 +17,7 @@
 import java.util.zip.GZIPInputStream;
 import org.eclipse.jetty.server.ServerConnector;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -97,4 +98,27 @@ public void mimeType() throws Exception {
         assertEquals("text/xxx", response.headers().firstValue("Content-Type").get());
         assertEquals("Hello", response.body());
     }
+
+    @Issue("JENKINS-60409")
+    @Test
+    public void doubleGzip() throws Exception {
+        Map<String, String> args = new HashMap<>();
+        args.put("warfile", "target/test-classes/test.war");
+        args.put("prefix", "/");
+        args.put("httpPort", "0");
+        winstone = new Launcher(args);
+        int port = ((ServerConnector) winstone.server.getConnectors()[0]).getLocalPort();
+        HttpRequest request = HttpRequest.newBuilder(new URI("http://127.0.0.2:" + port + "/lipsum.tar.gz"))
+                .header("Accept-Encoding", "gzip")
+                .GET()
+                .build();
+        HttpResponse<byte[]> response =
+                HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofByteArray());
+        assertEquals(HttpURLConnection.HTTP_OK, response.statusCode());
+        assertEquals(
+                "application/gzip",
+                response.headers().firstValue("Content-Type").orElseThrow());
+        assertFalse(response.headers().firstValue("Content-Encoding").isPresent());
+        assertEquals(1345, response.body().length);
+    }
 }
diff --git a/src/testwebapp/lipsum.tar.gz b/src/testwebapp/lipsum.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8d7ecfd029aa61ac16f2795092eb79a28bcabf38
GIT binary patch
literal 1345
zcmV-H1-|+piwFP!000001MODJj@w2M-1C0Ld;lTrdcB*o;amd5MuH%@x5$yy!EmUZ
zhp?ZY>gGIX14&Ls;D8MXlE`^<S5?=H<7>?GA-$!$Zx#=TmzVeQ{rJQ4!}eR^`T6DH
z?(zN0(-VF^K4IMByT`|Ocjn>SrPL$GM8TN5BSm)qFz(;pf2Z;D66|bL1ZG;?5=`V|
zXtrrE<Km+olTA4on)u3bWPdi+aXOfvyh(v$;@51=&0cuSj?9sd)=v<W`Cz>zZ*nq@
z&+_VKoxy}04L&1QOXh;H!3J6G_hf7~o{tyvnmL+l4j5UNGttgh8;rN3@r&1S2lI(C
z7BplcUD<lwfx?)LTaHUec*Q>1py~V)7WT%TZPNS=jbol8`N5Er5|Ad1*ztOyU{jz0
z8MqsJXk(@r>0mx*=V-=1-82V}F*g+HNp_-C;3EKc%kG*JCA&iSn(-DO0>Fk#LP6MW
z;<M)%c{W#U%bKZm&LZz9z_v;fzOXvr?5IaNb4s%4Z#iB86jrk4ijj$B@QFrt95LJ3
z1r;OrH=eVMx09Iw+7T&$YN@+aTkt@kGAE;$6MG%EOuQWK?>}chZgME(V)4Fj7r`g8
zBLKoCi?f)~b2d|EO{u(S_zFQ0pSSH3FPl~}RhVb&y{bv%0?7GhLm(&wS*beh>BJ)g
z_MviClB6<!013`vg_Zf4G%sa)5HW59aQ1|ZRC+qN>PavG1V<Yd2nMfg0M)88O+*3g
zV0E@Jq0nHRok2G=ezN(@GQB2V5NI7)vR}pj2j6HG;_9xgS4xxBNk>Oe23qVxAy!A<
z7MIhN@c3f@KT8<7z=1-Rm~F774uKwp51UN4#!&DmT+ybf3m5nIUnp8ItV{~iLR});
z64DNCz0K106W6Yd04y#OK{JvatQ%W@%z=)AR}+Cc2w@ZKB+1^$IcXE9qJTWCB9j7}
z8$pUrq_j>{M~owiMjn#5JRU?t1yHpBL-|~aQpExSaUo4s?MT)-2fFb@o&JOQQ8Lst
zYtFJ7WObpqiZVOsX0*u1s|dvU)(o-En4}HX7sVOsCQb}}Fg(?6U!SZzu8eYYRayXN
z;=*ca<<bCHpr&A~hh*D7_FYRMr|=a{Yc~lZ)nmW%w2QC>U{Fpt^48B_jiZ>6womyn
z3)z`a*$HyiCSI+y3*c{r4YmceVirQlpqw-mNr+fvjOa>dm-07SZ(6PA1V(9xRS1=P
zFgY)iw)Ifjv`be+fHo-3?@Em#{YsJSU!EhKp`WLT{m4`HswQdTHD4*C(4~~l+-!Ty
zA$Egu1oAOJ+!mHr4$A5@?SPQsWPyKD$fP&GzaZ3IaAQlVUK!X=7!lR5;;jj+;;a}!
z6F5acp%vtFYJe$J+ZJB2iy~O8C21Eo8rDj0a#|d-6Y~&NmW4`AsHw?R6Bvy8(zpb<
zK71ilb?s&}+N^n$PWls9LfCod?_@&}gEWx{D<PNlHi8BD1jm#12gQ|yjX`z_H`_PE
z>}ywBDTexMF1Aya>{pFbz%7gwT{%En&1_>4QI&~ahGrg$W2geG9H>J-?P_<ea;h^s
zv7!Z)cuf6>|I!{xKSt>*QOG0?At!LfMx9bLuF!5SH5Hnz@l|p5f}5M(C~)p~sMXk{
zZ;=mB6K%C)uftB#Q0;U{tF_lcTaM)l+)ijc5zDGWHIn9)BKNB5x|HIk0+*YnxJkV_
zwOiof{=dHO@3F@od+f2t9((Mu#~yp^vBw^J?6Jold+f2t9((NZ|Bk-^GSO@`04M+e
D*UFA$

literal 0
HcmV?d00001