From 0c16b11dc6d544c74f0cda1d53913e8073c7803e Mon Sep 17 00:00:00 2001 From: shimingxy Date: Thu, 25 Jun 2020 18:00:01 +0800 Subject: [PATCH] jks --- .../configuration/ApplicationConfig.java | 11 +++++++++++ .../contorller/SAML20DetailsController.java | 5 +++-- .../resources/config/samlServerKeystore.jks | Bin 2253 -> 2253 bytes .../resources/config/samlServerKeystore.jks | Bin 2253 -> 2253 bytes 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java index e82a51e6..924ad175 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java @@ -55,6 +55,9 @@ public class ApplicationConfig { @Value("${config.identity.kafkasupport:false}") private boolean kafkaSupport; + @Value("${config.maxkey.uri}") + private String maxKeyUri; + public int getPort() { return port; } @@ -209,6 +212,14 @@ public class ApplicationConfig { this.kafkaSupport = kafkaSupport; } + public String getMaxKeyUri() { + return maxKeyUri; + } + + public void setMaxKeyUri(String maxKeyUri) { + this.maxKeyUri = maxKeyUri; + } + /* * public boolean isWhiteList() { return whiteList; } * diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java index b8ca6eb4..f4674681 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java @@ -7,6 +7,7 @@ import java.security.cert.X509Certificate; import java.util.List; import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil; +import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; @@ -47,7 +48,7 @@ public class SAML20DetailsController extends BaseAppContorller { AppsSaml20DetailsService saml20DetailsService; @Autowired - String maxKeyURI; + ApplicationConfig applicationConfig; @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd() { @@ -87,7 +88,7 @@ public class SAML20DetailsController extends BaseAppContorller { decoderSecret(saml20Details); WebContext.setAttribute(saml20Details.getId(), saml20Details.getIcon()); modelAndView.addObject("model",saml20Details); - modelAndView.addObject("maxKeyURI",maxKeyURI); + modelAndView.addObject("maxKeyURI",applicationConfig.getMaxKeyUri()); return modelAndView; } /** diff --git a/maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks b/maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks index 09073676e6390be4bdd73ecfe79c69657abc6894..29945eafca18afe8d84796765e4168f29f105385 100644 GIT binary patch delta 1318 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 delta 1318 zcmV+>1=;$|5zP^h8GmnbX8-^JaDr z=oe(tcyEmwDA`8`3m`mYqAK#gj!d@M&YIj(cr9Ta+f=*E+nDj3TM?nUAZCQa2PS!o zqGrz6C=Jggw*9A7o6_VR;*=X;YLsMeb)FPPfqlsh6ArK;_kXTer=if;Z0KS*RbSa< zog9YX$BW_CFjD+(T40I(UI3s!FZT4Y3~e%hJB_O7mnc5$+z}*_={>~R7Wo``ilxuH z5%>9IRmb{-#07;Uvp=E(_(;eh(opXy(z(Uv${jJLxZ+E%!WEe0=5lV|07<0@%-ZgB zB5u{aLk6W;Xn(X?=q;sMbAb*^49W#GhLve_Pt#&G$};HxXklE*GnP3D9qv+L-4ohJ z|JlAI_?DRJ@>Gr9H&0?HRltZ#W0ld1MTHI}#4b0u(#M0~FG><;dDV*@_T6AAj0?-! zu2-*s2*=_j%@j7 zL`W0adgcf%cqt90Wh|c7L4h4bx&}B$A6xaHYk!l<`2?9m0Bv9~Xr{4@h@QCkU!L+V zXky@>Kr!pMNKeqrHU$E!^6o8FTn{oF`Jrm>T5OmsElB z?dkMfBH3%4e2{{UaqhXO?&B3^r9tH_fpt&~YP{3eDtKak;Mp!4vF2WfH7uJq7M|Cw83?VPT1s?QDf|sZ?$I9W(`2@N`Hu-hVld z?dmicx{uo=92xnwSHM4BYRsSNVF!JHjpm!KOFc_HzD)Q1&z^(H?dX3bqrXscUBHO; zTVLUGsCqTvMH$C94~>&^ZV^C}SqT{*(4U-cE`6M2)c&V5gjNh^?~oRZ4|t<{b5xj9 zi^Ai!(2nQx?r?g;VgEj!A(i+ zk5}I@MU>ei{*+tc{>f1;r^R6}+wCkuVN+pxwO|9FYhF7xs4zw7i}X>@?M0yuxNqHi z!eqSgsjw+`w{{(%h)+jJ(#7|AK>h#yC7|9mN&8=D)duyVy8+3DB^j!>&;`(Bw|^+J c6a}RN6hA@0kMH&_