From fbf4601db5fe5edec955dac1c892da06d261161b Mon Sep 17 00:00:00 2001 From: Dank074 Date: Tue, 17 Dec 2019 21:09:13 -0600 Subject: [PATCH] forgot urlencoding for user and password --- .../krews/apollyon/ftp/FTPUploadService.java | 3 ++- target/Apollyon-1.jar | Bin 17013 -> 17056 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/krews/apollyon/ftp/FTPUploadService.java b/src/main/java/org/krews/apollyon/ftp/FTPUploadService.java index 6e9950c..f26f7a2 100644 --- a/src/main/java/org/krews/apollyon/ftp/FTPUploadService.java +++ b/src/main/java/org/krews/apollyon/ftp/FTPUploadService.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.OutputStream; import java.net.URL; import java.net.URLConnection; +import java.net.URLEncoder; public class FTPUploadService { private static final String ftpUrl = "ftp://%s:%s@%s/%s;type=i"; @@ -15,7 +16,7 @@ public class FTPUploadService { String user = Emulator.getConfig().getValue("ftp.user"); String pass = Emulator.getConfig().getValue("ftp.password"); - String uploadURL = String.format(ftpUrl, user, pass, host, uploadPath); + String uploadURL = String.format(ftpUrl, URLEncoder.encode(user, "UTF-8"), URLEncoder.encode(pass, "UTF-8"), host, uploadPath); URL url = new URL(uploadURL); URLConnection conn = url.openConnection(); diff --git a/target/Apollyon-1.jar b/target/Apollyon-1.jar index bd6a1a4e9f0a66a4fd6f01d78e3ff00dcc727b8b..bf9298ee248422c55a67d186a79be04462d7398d 100644 GIT binary patch delta 1513 zcmZXUe>9VO9LJw+ek_KwxXU)K9}^)~v#!arvDNLSj^8aRKNfDe7uBH@qqWnu(G2Tx zuev&{a)nqiq%Kk-BBX|`6d4JxY@AEm&IiL6JF9>M{ z!YE)nO2+`uKA3We#K;b1r~$PYRZu383|hfhSgjQyYlJJzKm-M*0O5|xFOxtm2wN@X z9IZ?-`zT*x?Yi;Wb<|T=HNGMD3Kd+pP9U7A;r+}p ziX?{K-O`vw$~#V&BQ!hbRaq!{yAK$h?Q*f zM%L18{V;InET#vH{xo0zx=n~Qdh)iZ)b^%}`#A;lN_3$h3TNteW`Gy)-Hc`Ps=ik} zL6w^}wcW9=_mlGN-HfBdh4-GAHl+9*Ef*i^ta)*=KW&=B;9OnFnCj%_v^+2G8c?FP zm9~jLw5w_a6`N;Ki=O*nbGkoT+o#xgRl5Hg)GZ6 zTx;1wrzLdu}m|Wk}Du|k>R2{i;A8#GJdyd2(w*d=ciW)Q9-jy%Oe3z#%=M&hjpZ!`> zE(v{}DY7pYz4s&6wd`5Ey&So4b}W*%Os!5mVE!WFU89F_2v0cH7$Iyn?Wc>~B3$S9 z-*{8utKo6vJ1p z*O={~QcYfcF(Wd<)(+?cfZ7BAHhyJ3LxRm!By+79{$Pt25!vRfk-veuoDHBQFDFD9 zTbd>cra%xCsi8hhHY6NAdR=Va#*e!DHW%DH^j)oP!-vJ4 z+Ggt(r6pZFX0h(&(_OvNKTaO={j;WidNkXo{>KNyUPx=0&Fffx=&S36;^@K`tb1LV zmrn~3II7gKy>-4vSo~)u{e6iF!RvCQPw1_TO;eYSQ@B2<&b@8+qQ~C6%XS^QFSc;` zeg4TeE6#WGgh*+<*}1>H$iC>P!_R-lqB~L^uFF}M&s(Ef7Hw4Xs#NuNzxrX9z4}!w z7WL8hc7E0K_EmYlR5aOoO3L!~Yp#2aFRRw-+NnB`XD6?V3s>uwq}O%LUP5c@l#cSI zyfHd`?&dl!Cg#n@Kb0s?xO*d*QCnu}k!BS&Zp~k8X_vhGcb?t;Y0c*8|6iPHv=f;b z@u=EcH8Ff$#jVLNCod8=>1sBfVODtipivl4L`k}1{cD55;|F7}@CUC{b8nBjzK^S% zcTT;3`O4mxvtFNb-MaI|vzQ|ZhIM8WuG=yPyX%=-`)k}hV#~h2q0Ta2dQs;(s|e@I zM|L&y-Z8&ew4qa%{q_vAf?vIwU!T>R1(b$=jh(rpdeP;;cSZIeUDs$Vy)fC(w(iYW zo{-a1k8Rwvj%#WC>^fhkg^gjZ2jXp)9RK`2-1Gj8hXvD~pH@!GyrMe8YUbtbZmqQk zckZ%cN?BfbY461ymltys%uv7Lz~;Uhi3#lQsuj&T2(o_4)dg zQO)}r<>kC#wkogVPlgrOPx*A%vWAIgv44A- z$One`hEk6=yKU||A@JI4U&0jCB*}QAQ-a@R_8pS>d*Q`r3;$^I8@qeB)~*pU^xnc< zqsM0%R|U_z9H6|rIhVtM6O=JGZxDRV4ra`gWZ?ocmMUv;fEkyxr}BUpld~+e!1Qzr zbFjoki+xOBfl1aTpdw)MNo#v>?&h}92h+ATreOI}8#^$)&Bh5#J32~E7O~X>t8uk8 z0@GEt)qJQ0!DMDTUj>j5^IxxwHyjKM8bS;Vmf&IsLM&-C<(T|XTXeF&J^$nd9O9Gj z*h3t;%TAi9LJ%(X+fE*At*pH?Q<@}H*brjj>JD0rwUdJ!ESTOJPwsJWWbBxH&cRq7