From e0d24b45178c36a8f8cd8759762d677692afa1b2 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Tue, 1 Aug 2017 00:46:10 +0300 Subject: [PATCH] Fix Keystore --- .../java/com/djrapitops/plan/Settings.java | 2 +- .../plan/ui/webserver/WebServer.java | 7 +++++-- Plan/src/main/resources/Cert.keystore | Bin 2253 -> 2252 bytes 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/Settings.java b/Plan/src/main/java/com/djrapitops/plan/Settings.java index 717ca160d..6f0ec63ff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Settings.java +++ b/Plan/src/main/java/com/djrapitops/plan/Settings.java @@ -48,7 +48,7 @@ public enum Settings { ANALYSIS_EXPORT_PATH("Settings.Analysis.Export.DestinationFolder"), WEBSERVER_CERTIFICATE_PATH("Settings.WebServer.Security.Certificate.KeyStorePath"), WEBSERVER_CERTIFICATE_KEYPASS("Settings.WebServer.Security.Certificate.KeyPass"), - WEBSERVER_CERTIFICATE_STOREPASS("Settings.WebServer.Security.Certificate.KeyPass"), + WEBSERVER_CERTIFICATE_STOREPASS("Settings.WebServer.Security.Certificate.StorePass"), WEBSERVER_CERTIFICATE_ALIAS("Settings.WebServer.Security.Certificate.Alias"), LINK_PROTOCOL("Settings.WebServer.ExternalWebServerLinkProtocol"), // diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java index 0bd9c6dbe..b1ab4dc6e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java @@ -72,6 +72,7 @@ public class WebServer { Log.debug(usingHttps ? "Https Start Successful." : "Https Start Failed."); if (!usingHttps) { + Log.infoColor(ChatColor.YELLOW + "User Authorization Disabled! (Not possible over http)"); server = HttpServer.create(new InetSocketAddress(port), 10); } @@ -171,7 +172,7 @@ public class WebServer { private boolean startHttpsServer() throws IOException { String keyStorePath = Settings.WEBSERVER_CERTIFICATE_PATH.toString(); if (!Paths.get(keyStorePath).isAbsolute()) { - keyStorePath = plugin.getDataFolder() + keyStorePath; + keyStorePath = plugin.getDataFolder() + File.separator + keyStorePath; } char[] storepass = Settings.WEBSERVER_CERTIFICATE_STOREPASS.toString().toCharArray(); char[] keypass = Settings.WEBSERVER_CERTIFICATE_KEYPASS.toString().toCharArray(); @@ -216,7 +217,9 @@ public class WebServer { } catch (FileNotFoundException e) { Log.infoColor(ChatColor.YELLOW + "WebServer: SSL Certificate KeyStore File not Found: " + keyStorePath); Log.info("No Certificate -> Using Http server for Visualization."); - Log.infoColor(ChatColor.YELLOW + "User Authorization Disabled! (Not possible over http)"); + } catch (IOException e) { + Log.error("WebServer: " + e); + Log.toLog(this.getClass().getName(), e); } catch (KeyStoreException | CertificateException | UnrecoverableKeyException e) { Log.error("WebServer: SSL Certificate loading Failed."); Log.toLog(this.getClass().getName(), e); diff --git a/Plan/src/main/resources/Cert.keystore b/Plan/src/main/resources/Cert.keystore index 4ddf94995a307f1abe07a821c2c3c4f499966163..9f95d38078a346f829ad23ca06a128fd257d68a0 100644 GIT binary patch delta 1941 zcmV;G2Wt4u5zG;gCJUNo-2eau0Wg9D{gE*ff9d`W?w@xkVHa9qD#?{8q%#i$iFgR9 zNRJeBv2@cVMKYM`CiT1)Hjdhze$9sxo`Z?_Nk>QpRF{dDb7*ag{+w2^@D^_P3?=Ic z;O$WLJQ3z^UW9SxJq0IJi9fPMVWcs+Z^e(-4ymn4kgkhYu)3MaP*c5wziAlwoop+Xu{&n^%qOtznFbjrK^$)ky_Pl>JFbu6mP+YbNablHzOP zc@1X)=BTmhWFJzh*(D&kgsyTNV{550fBmS9B<5wybJeM+vT@P3FEH(ZT2(X|nW)f% zhb!=PALjXlJ+O>ONapz!H9%wdi6h61u)+%#n}UEZs!#mXze<6sHCa4J;~kTaKfglH zxB=T?$3->)VO^30&{GD`UE>$Mjb2p<={Z5MGZzWU~J4M*TC_YAOZf2Jz8 z-1B)ts_h>Bx44XiIeykZ!ZP2qQ@IGUsy^z`=z_)y6$0n9m&_QYyzHyU5+}iq0^?|l zbGiVVg>mmW|8cffWo(EqNYX|=0^-;;Mn0iD9J-AhRqcj-b{I25#Dvwr-YAL2Qls*X zV||`xa3<%`5+?}aMy$ay(WbkCf0dM|2$ebiYE=0eA335!0q^XdOPLpQ{lDl$7HBe6 zF*39l+UOGl58%9O*-TwWrMQU+0-y~TJ6gzqLEQ;KU!6wf=h{jRJIk;&RY5%kx*ssQ zOp_!)_i6}su8M2*)|kr4nJorXS^FtQr6}A%6hFD#AAOoE(>4c=AuX*`f6C1L^p;wU z#rd;RvQ__YH;WgQkrD5c~mu9#T zq6-e7mwpfh&(MN=SQp1X-|@Z{mYT~IbQ#-eGBA^dF{Xo*?f7K^Cs?+pJUV(Af1Y~!y_Y;qG)77Tz52w<8ipmDqc`&DtKkml^~XAHJ)XMC zSp?U&X-f6*;mqErEqa=Z{;To(4r*%P_09&bCd7|3ZLaJLlUzi-s3*HJJxAOolh=*w znOQ({>$Tgf@*1w;o4U1tpp}&Qu`2l^7B5Rqn_CE4+5vHF3&@4-e`<;5S^?T^+oGkb zc%d-0okvBAIGH!WmcrnO6ibkZuDY(pSsXv@Ex1)Dn@Ij4cad!gF7+CF@zk4UhyE>q zw-7}{pne9Bn3c@=V;}(LIlMhLfb7)Be^eNGL4uk|KAK{SVYM65-vi_~@#k^vdA`najna?f&qo%HxBU-TlFm`5CnvB!t zqmA7#(v7%M~O z+NFB~(2wtH8l43^e3(Pw5JU>Y}(0Z<>(u;D7-*j@yRfM+o=Kr z0RRD`Aut~>9R>qc9S#H*1Qf(5*tiCh^ZkDKrcF*HpC|>r6qhg!1_>&LNQU zq|%Huckx!Wdno={Hph&7v5`uD{XM&Kkqt_3GWpp_cL%fj(fM9zo;gSTgbSbl zL5Uk{#ZAOCk^?rcm5<(?zukt3)LJFpg=M?x delta 1941 zcmV;G2Wt4t5zP^hCJR@?H~;_z0x*IE{*f^gf9eO&GGc_OEyF1QH$_~g5-G-K8i622 zX;%w^Q$va+H-vI5v3qoFQMoWIsDYxE{$96T!L*R#EA{0iZgg5}sI&NXciesO=C=IZ zy!dKI)Y?XdBPJ{pq!&18(}sL!0UINB4KGq9nKVkG{301GfXCu7!9Couf&AlM{~Lrd ze>UEqj}ibb6#TngdV$9GOJcMNABE2cSyY-!qs!W*@z}Tvm3q#;Zg=Z0kWrkbYyz}- zAQ3<&ovtV=RTgb(;${3NCdeZ!>yy4+2u7mBGRhjmWl~w_#VZarYLer#3`@GJr_NJ9 z#7ZMXC~NT6o8*wW*cKg3O0QWY5zL`kfA%V93aTn{oPSsLf$xdUxi%=5NQWB%OSoUl+M0l(WNmC&c*5R-zJAzp`)JhESNlqLQDiO}Z zvmjlMmgT~tJxU>>Qhu6U{3X-$4*mQVHm_?v#p7uy?Zxrkuc!re@PrN z6j{c8j4XK+l=y1gG*fmpm4OY-9ZW|2o#*yykX+gwCqW|{&pb-7P3-m>|gbQuvE zXooWeXPSXlVw9^zE%UyzeGuDyq0bW@pk-r6Ja{F&qDh;yKsdJQKpiNoQsiSIrrSRq_mtf zQl!KMk|Njk<>Kot<+}5bf2qo;JYhfL9VydzFQ&{47c}Z{lUOGRb|p0DoC7eqNGEf^ zq|EJGeEWnSw*}2{-=z^FNVXZ%`es!072&BEaSrTaxq!wKp7OQZG->;W?+}|=f6xLOu+_qQkJx+G zO&&1(5clXSP>wIjKc{NUCL{)C*Y&#DsV!-nQK2Z;%Y2J-9n7IIU~_lYpF=cVTp5XH zVe0os&`KIqWr7Y#8tF)%VYGB7hRGC5k4Uj=WITm~S2 z$mQFa8{2Fq7!nxa7?FXQOa0`&gpS!cidc4v8n?#x{%_NZ!kg<6|&3r|D$Xzrh5Bo&@}N=+H4LR0CC9DTuX zys+VJB>yuslqKWHA`oAx79R>qc9S#H*1QawA4WbAWB1lX!)aY&A)ewOS^JOp%1_>&LNQU4b`ls^NqQ#3Q`(qn!TSK>58()hn15E$%s9wuP(oX`=IfeQiy*&Mq8c(m znk8OnM_X2)tcd#wQI_tYoL?<}AEK=lwAUR@`tkxeyDyL8@@lxt+Q{m&`BkZBfk3$} zDQ865@>-4hF$H||(1%MJ*UR6nd_m`DjXJsAb=g!yij_*Rmv~P#MPbgLR0mT(ydd*5 z{yKDevVHB^jj8=~Iluv4efjfyjIpBX bP-IE9@){v;W!FvgU6iIl7ndW;_2XZ^jIxr)