From aa7daafde90b6c6ca296531dae70c6b776e8f90f Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@163.com>
Date: Thu, 27 Feb 2020 10:59:32 +0800
Subject: [PATCH] JKS update

---
 .../src/main/resources/application.properties |   2 +-
 .../config/applicationConfig.properties       |  24 +++++++++---------
 .../main/resources/config/clientKeystore.jks  | Bin 2176 -> 0 bytes
 .../main/resources/config/connsecKeystore.jks | Bin 2154 -> 0 bytes
 .../resources/config/samlClientKeystore.jks   | Bin 0 -> 2275 bytes
 .../resources/config/samlServerKeystore.jks   | Bin 0 -> 2253 bytes
 .../src/main/resources/application.properties |   2 +-
 .../config/applicationSaml.properties         |  24 +++++++++---------
 .../main/resources/config/clientKeystore.jks  | Bin 2176 -> 0 bytes
 .../main/resources/config/connsecKeystore.jks | Bin 2154 -> 0 bytes
 .../resources/config/samlClientKeystore.jks   | Bin 0 -> 2275 bytes
 .../resources/config/samlServerKeystore.jks   | Bin 0 -> 2253 bytes
 12 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 maxkey-web-manage/src/main/resources/config/clientKeystore.jks
 delete mode 100644 maxkey-web-manage/src/main/resources/config/connsecKeystore.jks
 create mode 100644 maxkey-web-manage/src/main/resources/config/samlClientKeystore.jks
 create mode 100644 maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks
 delete mode 100644 maxkey-web-maxkey/src/main/resources/config/clientKeystore.jks
 delete mode 100644 maxkey-web-maxkey/src/main/resources/config/connsecKeystore.jks
 create mode 100644 maxkey-web-maxkey/src/main/resources/config/samlClientKeystore.jks
 create mode 100644 maxkey-web-maxkey/src/main/resources/config/samlServerKeystore.jks

diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties
index fbcc41b8..8f6564dc 100644
--- a/maxkey-web-manage/src/main/resources/application.properties
+++ b/maxkey-web-manage/src/main/resources/application.properties
@@ -6,7 +6,7 @@ server.port=9521
 server.servlet.context-path=/maxkey-mgt
 
 application.name=MaxKey-Mgt
-application.formatted-version=v1.2 GA
+application.formatted-version=(v1.2 GA)
 
 #for freemarker
 spring.freemarker.template-loader-path=classpath:/templates/views
diff --git a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties
index 234dbce2..504995db 100644
--- a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties
+++ b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties
@@ -72,21 +72,21 @@ config.saml.v20.replay.cache.life.in.millis=14400000
 config.saml.v20.issue.instant.check.clock.skew.in.seconds=90
 config.saml.v20.issue.instant.check.validity.time.in.seconds=300
 
-
 #saml idp keystore
-config.saml.v20.idp.keystore.password=connsec
-config.saml.v20.idp.keystore.private.key.password=connsec
-config.saml.v20.idp.keystore=classpath\:config/connsecKeystore.jks
-config.saml.v20.idp.issuing.entity.id=connsec.com
-config.saml.v20.idp.issuer=http://connsec.com
-
-config.saml.v20.idp.receiver.endpoint=http://sso.maxkey.org/
+config.saml.v20.idp.keystore.password=maxkey
+config.saml.v20.idp.keystore.private.key.password=maxkey
+config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
+#keystore id for sec
+config.saml.v20.idp.issuing.entity.id=maxkey.org
+config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml
+ 
+config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/
 
 #saml sp keystore
-config.saml.v20.sp.keystore.password=connsec
-config.saml.v20.sp.keystore.private.key.password=connsec
-config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
-config.saml.v20.sp.issuing.entity.id=client.connsec.com
+config.saml.v20.sp.keystore.password=maxkey
+config.saml.v20.sp.keystore.private.key.password=maxkey
+config.saml.v20.sp.keystore=classpath\:config/samlClientKeystore.jks
+config.saml.v20.sp.issuing.entity.id=client.maxkey.org
 
 ############################################################################ 
 config.oidc.metadata.issuer=http://sso.maxkey.org
diff --git a/maxkey-web-manage/src/main/resources/config/clientKeystore.jks b/maxkey-web-manage/src/main/resources/config/clientKeystore.jks
deleted file mode 100644
index 45d6bf0d92bf18e8b51ad95d76b04dd6be7e7ec6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2176
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
LirZM@gY$m^CcD}@

diff --git a/maxkey-web-manage/src/main/resources/config/connsecKeystore.jks b/maxkey-web-manage/src/main/resources/config/connsecKeystore.jks
deleted file mode 100644
index 7fef7c6dc06b2489ec039e2529c9d9bfeb892f02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2154
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

diff --git a/maxkey-web-manage/src/main/resources/config/samlClientKeystore.jks b/maxkey-web-manage/src/main/resources/config/samlClientKeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..c94ae41775ba580ff09d8773af4dc81ed25772f5
GIT binary patch
literal 2275
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

literal 0
HcmV?d00001

diff --git a/maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks b/maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..09073676e6390be4bdd73ecfe79c69657abc6894
GIT binary patch
literal 2253
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
bX;@91Nk`U~E!2W6Wy+thaZcV~2gmsf+*sQ~

literal 0
HcmV?d00001

diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties
index 4ac0292b..649e959c 100644
--- a/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-web-maxkey/src/main/resources/application.properties
@@ -14,7 +14,7 @@ server.ssl.key-store-type=JKS
 server.servlet.context-path=/maxkey
 
 application.name=MaxKey
-application.formatted-version=v1.2 GA
+application.formatted-version=(v1.2 GA)
 
 #for freemarker
 spring.freemarker.template-loader-path=classpath:/templates/views
diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties b/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
index cecaf58b..ecd11b69 100644
--- a/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
+++ b/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
@@ -11,28 +11,28 @@ config.saml.v20.issue.instant.check.validity.time.in.seconds=300
 
 
 #saml idp keystore
-config.saml.v20.idp.keystore.password=connsec
-config.saml.v20.idp.keystore.private.key.password=connsec
-config.saml.v20.idp.keystore=classpath\:config/connsecKeystore.jks
+config.saml.v20.idp.keystore.password=maxkey
+config.saml.v20.idp.keystore.private.key.password=maxkey
+config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
 #keystore id for sec
-config.saml.v20.idp.issuing.entity.id=connsec.com
-config.saml.v20.idp.issuer=https://login.connsec.com/maxkey/saml
+config.saml.v20.idp.issuing.entity.id=maxkey.org
+config.saml.v20.idp.issuer=https://sso.maxkey.org/maxkey/saml
  
-config.saml.v20.idp.receiver.endpoint=https\://login.connsec.com/
+config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.org/
 
 #saml sp keystore
-config.saml.v20.sp.keystore.password=connsec
-config.saml.v20.sp.keystore.private.key.password=connsec
-config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
-config.saml.v20.sp.issuing.entity.id=client.connsec.com
+config.saml.v20.sp.keystore.password=maxkey
+config.saml.v20.sp.keystore.private.key.password=maxkey
+config.saml.v20.sp.keystore=classpath\:config/samlClientKeystore.jks
+config.saml.v20.sp.issuing.entity.id=client.maxkey.org
 
 #Saml v20 Metadata
 config.saml.v20.metadata.orgName=maxkey
 config.saml.v20.metadata.orgDisplayName=maxkey
-config.saml.v20.metadata.orgURL=http://www.maxkey.org
+config.saml.v20.metadata.orgURL=https://github.com/shimingxy/MaxKey
 config.saml.v20.metadata.contactType=technical
 config.saml.v20.metadata.company=maxkey
 config.saml.v20.metadata.givenName=maxkey
 config.saml.v20.metadata.surName=maxkey
-config.saml.v20.metadata.emailAddress=admin@maxkey.com
+config.saml.v20.metadata.emailAddress=shimingxy@163.com
 config.saml.v20.metadata.telephoneNumber=4008981111
\ No newline at end of file
diff --git a/maxkey-web-maxkey/src/main/resources/config/clientKeystore.jks b/maxkey-web-maxkey/src/main/resources/config/clientKeystore.jks
deleted file mode 100644
index 45d6bf0d92bf18e8b51ad95d76b04dd6be7e7ec6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2176
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
LirZM@gY$m^CcD}@

diff --git a/maxkey-web-maxkey/src/main/resources/config/connsecKeystore.jks b/maxkey-web-maxkey/src/main/resources/config/connsecKeystore.jks
deleted file mode 100644
index 7fef7c6dc06b2489ec039e2529c9d9bfeb892f02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2154
zcmb`I`8N~_8^>q0GZ@pvwS|%}W@H(%ltChfkz{U-K?*YwV_q8TjIvFZB70e~Q^pdJ
zC`>8I646}UE|PueDm%UNcJ4i=Kj3}Nd4Bjl=Q-!u&iOohi+hUz006{y;7=Fz3h?)*
zd3&L}0<Q35W(h;$=>Px}fM!8<&=LY7ngT!w@CZl>2!sM4EXYicLXC(0EJVJgQ2U2|
zebc>mDAVQ=#bo|o+5>+Z;p<|(2m2Glu8ZllsNVK$Dc@v#?~*u{=GxvNj_gUiulv9p
zowMMCQ#B}x4{<zxUI1K)Hp1DWz8{IrzIx)dN7?pxmyOQiCJw^9XmNf^2CsZvk!97)
zSTbD&_#9mDG>+)zcJ??_Nc^=})e40Z)U#x9anChh<VYQ%(5hxb+C%3HP)jF=g=;Cl
zBMU<^>;2s|Z+rj)MDNftV>?VM$RQUSj}Lt1#o6TT1ba8hkjcAXa>|5sZQNmfb&MeK
z=?A^j1cc8u_buI{*Ej?1*$1i-J@%jFwPp|PGI30xERQkh8H;cS-FGb9uC>tbYv_f^
z+&NebTT|X`-q-IKkzUWe<CT{)5(N*;XWMv2!n!2d4dM3dbJt4pZuc{9k?-N}q$UfP
z=D9s#l69(rmIvndw;Ja<#ze;S+|xT7uyemDdS6mQRKtmQL(-G2yE=V#dsNTuWHu=1
znTIn=BU=qolXM0w%Ep<i7oSz#tnnS_Dt<11`M30tUK8&O5$YKb4=DTaYm0qNNp2WG
zq|l2B$<St(!DG^2Ny`IB#%DW9H>6bMOxzdR-m%8+G~+d?Qltn}V=F}p<6H&Xz^lVd
ztqr6ihTH1Bbz5;26G1Vr-;4&Y*7-K9i(DKPo+&tKi(iW*B5fWz-SuuS?b8c;wOA6o
zb>$hoDdk<25V=Iqy2FhV_@FVpFt|)XHk@*JV>aS%ncHRwwvB}4MNu}4>&I%+`;t*9
za^5hYuPM6Pl(2c>%{*0-;oP58PA{H`<Z+YQqs>aJR#A9B)}p}Zc<N&-o6We9%0MF3
zA^1q>;Nq5I@NKSvvAJS;)D&{!w316pniO_t>Za=Dg@MZ0WA9NPwIvChGBdHX>$-$V
zh+hv<1zG*0>Qnr)3`g?FOQ#)%;MrP3jLXQAD7abzbcGOX$*y*n(W4Z8m7RFIrX>WC
z9rzgV&1GkW25rjrIdm0E$xOwJ6=mr)S7r_nu?a|hw|(sILzq7^OINzb4{)qLfn8Sc
ztD<^31xWPnSfPO$dy|;p<6x}Z?SAcn`1A$)sLS#<wp~&?$r(7B`1?QR2RE^}%sluo
zwZ(PirSe7^w(Xob9qvOn6(y*}JG?uQ$;e0;t?{nT4a<5vEQisZ^j)4XK1O~`)CSaP
zFcj5?77Q+wl6!>P9wA{d9w+`<)jEtg-6D;ce-Y?;b${muho_RTK4kU7@1R@v<4)|W
z2bRPs1<1#o3eg6<fo1rXiM{K$=;||jau@WQw?-Lep`5+0_IC^Mm->Ad2mkZlp_2={
zGKhFQVTYA+T?#z)UhS>$E9>*J`75Uvc6GJ<>c;w2`om7FWT4}(F>ge{*Bm`eB`9Y<
zMH+Ek%^Cs*CmylWAMWdNA?@T*yxCS~j)vzq`ID!omazwzPT78ycK8Nbn7ApmXrs(d
zr`NUvl{xiUYvE;TA8bt7+-XvUxbD+v6p>;fq$M9cI;_ltj~RdHrqL5_(z7a_2<_5@
zHPm7+!IzhBm=}+gmuR;NUZ!qPN_wHBeBeN<Fn+3*lRK2$oJ##Ve5zk<naXLk^V(=r
zSVrg84!t*5sn+U?#pc$*XHaj4lTXn@#e#Dx%>A!ic$g=F&9+@=(N*jG2}kHTls?)B
z001kZSztLd3j`_vgMc6q#EJcQ8!av%d?eN;c3qs$Mm{j{7*Vva0N4d000-e5{uM%S
zkh9IdLhz@M<a3puCIT1yhrJjXwDkWXVEC^zMk^x4F-Ot-1~7X1d?O;o_0VV|UA=$g
z|Gyv$sPgMjeBy&yKp6iO07XD7AP|sCONo?}SorbfvXRfrh`*u7>xJUhrmIRzl}L$y
z@J1<hHJ^>=d>0Qfe<RJh?yPBgMg_$U=iK^Xg0OS^M1RObgq9oTPWAcrZ5MTqXrtmS
zl)B-VqWx@Y1Ie;C5;d~Dk(6@Xuln0+`InAW>lG)BbyYW2xdKGhMD95>Ie)Z?w_8)e
zlEclduO>%6GkNhUU3FiEBSj$?W(%!L&QYWH*4(vvJe??!d#NCl^>OX<_4Zn+ot8=C
z&9yGTp8~-Krz?2%I#}r!LyGa8)=u{0tqi0XGh8cSb!^$zNQ_QDXFgYuT-0Nk9hjlM
zebavu^r*j!(%}I;w3wtu3*>^pKmhR94e`&;-w+UxQ!FpeO|Hwqu7|pCUiQyCQ;~hT
zGwl#(cc$Qj^}W&Pp%4<nW!2rd@#X<s_@jI)pLx_CA$X2nwV(vMxCia}da63aixKrE
z5jA7F<lRFA+?wQyjO5Qgm3e_bshv}&8c4N}oKA5`i?Ff~@gwDniRJnY7)}iAZE-?>
zKiYY)kJh3qWRq~?L%dZDXIG$vck5~cBQZT-j#xQi{ACGyRob~Z1LPbOO{mhi1>D$H
z_%@^IL&}h<ta2+8BRnUKy2@K-1>x_5>B?)hv~o9MK-yl4S)1yX^it8d!!`pFn)hv%
z1JrPf32$jl3b`q%9Wm*@tdu!)g%ELgT<PRspu5*L6L=rv(I7_ssLnMcCGGte1Ny)s

diff --git a/maxkey-web-maxkey/src/main/resources/config/samlClientKeystore.jks b/maxkey-web-maxkey/src/main/resources/config/samlClientKeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..c94ae41775ba580ff09d8773af4dc81ed25772f5
GIT binary patch
literal 2275
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

literal 0
HcmV?d00001

diff --git a/maxkey-web-maxkey/src/main/resources/config/samlServerKeystore.jks b/maxkey-web-maxkey/src/main/resources/config/samlServerKeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..09073676e6390be4bdd73ecfe79c69657abc6894
GIT binary patch
literal 2253
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
bX;@91Nk`U~E!2W6Wy+thaZcV~2gmsf+*sQ~

literal 0
HcmV?d00001