From 4ab08c0e80803e31b9b538d648cca80e52d3507b Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 10 May 2017 14:23:52 +0200
Subject: [PATCH] Issue #1539 decode path in jar:file

---
 .../jetty/util/resource/JarFileResource.java  |   3 ++-
 .../jetty/util/resource/JarResourceTest.java  |   8 ++++++++
 .../src/test/resources/TestData/test.zip      | Bin 1406 -> 1788 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
index 62f3f4bbcd9..dc95ab451fc 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
@@ -123,7 +124,7 @@ class JarFileResource extends JarResource
         
         int sep = _urlString.lastIndexOf("!/");
         _jarUrl=_urlString.substring(0,sep+2);
-        _path=_urlString.substring(sep+2);
+        _path=URIUtil.decodePath(_urlString.substring(sep+2));
         if (_path.length()==0)
             _path=null;   
         _jarFile=_jarConnection.getJarFile();
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/JarResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/JarResourceTest.java
index 95159783dc4..343f63774e0 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/JarResourceTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/JarResourceTest.java
@@ -201,5 +201,13 @@ public class JarResourceTest
         assertFalse(dest.exists());
     }
 
+    @Test
+    public void testEncodedFileName()
+    throws Exception
+    {
+        String s = "jar:"+testResURI+"TestData/test.zip!/file%20name.txt";
+        Resource r = Resource.newResource(s);
+        assertTrue(r.exists());
+    }
 
 }
diff --git a/jetty-util/src/test/resources/TestData/test.zip b/jetty-util/src/test/resources/TestData/test.zip
index 93d14cc0a3e700d50855143455798394a5cd68fc..e620b0ea7522e114e82336e6ee8717285e47c297 100644
GIT binary patch
literal 1788
zcmWIWW@Zs#;Nak3aLixj#ef7j8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&)4m<@0rs+-nx1hdA)VD&Yd~GImqCO@q?#DdS1Rdp1v1LSFvzL
zypTL1EhVXy@k3ly?fDWdi|68^PsCNHF<j05RP?ck5$p;9!DUJ=Ks#K47~zTuLB5($
zr-3PuV-s@<G7^(gONvX1$_h)1zkm4h>D$MzpZPg>xcE4Ex%)eM9x;K9<li9kTo$N7
z8i)}_GNFYEFHkluGbdFcFEKY&ucV?x+f!FBP~*JL$p8&K4<A3>XAsktD|jyy2C5ZA
zF%8{;>_FMP(%hufqGDqcBQrx&<Lw(v9zaYu#XIp4$Tn`M30w>eK>sX7^CHNE;?ks)
z%p!e+qi3Nh;zuYVJ2)WLuS7E$<UOeMKnlYl=*lIrDJR=WkaUY~hXgh|hz(?jk?7&a
zhcJ>@gCN0WgO++Yfd-YN7MCcX#uvIWF=S;Zsm=S$Y5kKPx<MMiRQC{)PVSra+y_N4
zD6Ir|Gct)Vpyp>-W(DPEQ~=MQpxlkF6*-52ax((h0-12FNO>FC1W-ap&QRcD18&4&
zAPW}j$htt84LRe0yo3N^jA&U8Su4mw<QxOa7YL97)C!F`kR~n$+?ffXX&F!xJVhhI
z6_hxTy#@+<1UQY*gzQ6@jp&ILlz$LF6&P1oaudRCkalFdLHP**La=E^b_FbHfQ&&7
zEKrs~fF0P3K?*&XDWHHrHU*SR5P+K*?iVDzuy8<6@t}->03krVNZAD8e~>oh^bX1>
c2vCiz4JF$Ic(byB)bRqL1W?sEAZB0y0OrMB&j0`b

delta 404
zcmeyv`;Ut+z?+#xgn<JD-2*fy@|m&2nBMM|5-%k+GgziS)BKU9CjL}BTx|N1XJXnF
z&s1M$ek%G{#K;if&CaoE@!cF31_lNYhM6|;bPx;BoC%XRG73*_V$^12n7ocr1xQ|I
z3<Fy?S(w=a$kk=i1ClXJ$w2Y|lP@15lL!OCHIwf#n+QOi1Gi<e5{nT~btsD|kUYks
zAS%Ylz>rs(o0M8q9N^8!#Kph`bO_KoF?k>j1rb0s#idCpnML{_H4sZC8?Y)c)=my&
z6=Q=6Sh6WFU1yve%_a#nJC{{~Nr7pyBa<ixT*n%qm_JBN*d#HhAR{p;wFF@v2gAxB
pU(Hjz6Cd#ct>p${37Gw0dNWv~EZnWEY#?Efdy|+L7}%IWJOJzuQlbC=