From 025912d1435644d4df35a9747950651181ae5676 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Thu, 27 Feb 2020 22:29:57 +0800 Subject: [PATCH] metadata --- .../authz/saml20/metadata/endpoint/MetadataEndpoint.java | 2 +- .../main/resources/config/applicationConfig.properties | 8 ++++---- .../src/main/resources/config/applicationLogin.properties | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java index e9b43d9c..3a8ea0fb 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java @@ -52,7 +52,7 @@ public class MetadataEndpoint { private Credential signingCredential; - @RequestMapping(value = "/{appid}",produces = "application/xml") + @RequestMapping(value = "/{appid}.xml",produces = "application/xml") public ModelAndView metadata(HttpServletRequest request, HttpServletResponse response, @PathVariable("appid") String appId) { diff --git a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties index 504995db..a80f2d6c 100644 --- a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties +++ b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties @@ -89,8 +89,8 @@ 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 -config.oidc.metadata.authorizationEndpoint=http://sso.maxkey.org/maxkey/oauth/v20/authorize -config.oidc.metadata.tokenEndpoint=http://sso.maxkey.org/maxkey/oauth/v20/token -config.oidc.metadata.userinfoEndpoint=http://sso.maxkey.org/maxkey/api/connect/userinfo +config.oidc.metadata.issuer=${config.server.name}/maxkey +config.oidc.metadata.authorizationEndpoint=${config.server.name}/maxkey/oauth/v20/authorize +config.oidc.metadata.tokenEndpoint=${config.server.name}/maxkey/oauth/v20/token +config.oidc.metadata.userinfoEndpoint=${config.server.name}/maxkey/api/connect/userinfo ############################################################################# \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties index 8f4c7301..b0708cdb 100644 --- a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties +++ b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties @@ -71,10 +71,10 @@ config.support.wsfederation.logoutUrl=https://adfs.maxkey.org/adfs/ls/?wa=wsigno ############################################################################# ############################################################################# -config.oidc.metadata.issuer=http://${config.server.name}/maxkey -config.oidc.metadata.authorizationEndpoint=http://${config.server.name}/maxkey/oauth/v20/authorize -config.oidc.metadata.tokenEndpoint=http://${config.server.name}/maxkey/oauth/v20/token -config.oidc.metadata.userinfoEndpoint=http://${config.server.name}/maxkey/api/connect/userinfo +config.oidc.metadata.issuer=${config.server.name}/maxkey +config.oidc.metadata.authorizationEndpoint=${config.server.name}/maxkey/oauth/v20/authorize +config.oidc.metadata.tokenEndpoint=${config.server.name}/maxkey/oauth/v20/token +config.oidc.metadata.userinfoEndpoint=${config.server.name}/maxkey/api/connect/userinfo #############################################################################