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 45d6bf0d..00000000 Binary files a/maxkey-web-manage/src/main/resources/config/clientKeystore.jks and /dev/null differ 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 7fef7c6d..00000000 Binary files a/maxkey-web-manage/src/main/resources/config/connsecKeystore.jks and /dev/null differ 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 00000000..c94ae417 Binary files /dev/null and b/maxkey-web-manage/src/main/resources/config/samlClientKeystore.jks differ 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 00000000..09073676 Binary files /dev/null and b/maxkey-web-manage/src/main/resources/config/samlServerKeystore.jks differ 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 45d6bf0d..00000000 Binary files a/maxkey-web-maxkey/src/main/resources/config/clientKeystore.jks and /dev/null differ 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 7fef7c6d..00000000 Binary files a/maxkey-web-maxkey/src/main/resources/config/connsecKeystore.jks and /dev/null differ 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 00000000..c94ae417 Binary files /dev/null and b/maxkey-web-maxkey/src/main/resources/config/samlClientKeystore.jks differ 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 00000000..09073676 Binary files /dev/null and b/maxkey-web-maxkey/src/main/resources/config/samlServerKeystore.jks differ