MaxKey 3 роки тому
батько
коміт
fdfcf44ccb

+ 48 - 0
maxkey-core/src/main/java/org/maxkey/web/MetadataEndpoint.java

@@ -0,0 +1,48 @@
+package org.maxkey.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.SystemUtils;
+import org.joda.time.DateTime;
+import org.maxkey.constants.ContentType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class MetadataEndpoint {
+
+	@RequestMapping(value = "/metadata/version",produces = ContentType.TEXT_PLAIN_UTF8, method={RequestMethod.GET})
+	@ResponseBody
+	public String  metadata(HttpServletRequest request,HttpServletResponse response) {
+		StringBuffer version =
+				new StringBuffer("---------------------------------------------------------------------------------\n");
+				  version.append("+                                MaxKey \n");
+				  version.append("+                      Single   Sign   On ( SSO ) \n");
+				  version.append("+                           Version "); 
+				  version.append(WebContext.properties.getProperty("application.formatted-version")+"\n");
+				  version.append("+\n");
+				  version.append(String.format("+                 %sCopyright 2018 - %s https://www.maxkey.top/\n",
+	        			    (char)0xA9 , new DateTime().getYear()
+	        			));
+				  version.append("+                 Licensed under the Apache License, Version 2.0 \n");
+
+			        
+				  version.append("---------------------------------------------------------------------------------\n");
+				  version.append("+                                JAVA    \n");
+				  version.append(String.format("+                  %s java version %s, class %s\n",
+			                        SystemUtils.JAVA_VENDOR,
+			                        SystemUtils.JAVA_VERSION,
+			                        SystemUtils.JAVA_CLASS_VERSION
+			                    ));
+				  version.append(String.format("+                  %s (build %s, %s)\n",
+			                        SystemUtils.JAVA_VM_NAME,
+			                        SystemUtils.JAVA_VM_VERSION,
+			                        SystemUtils.JAVA_VM_INFO
+			                    ));
+				  version.append("---------------------------------------------------------------------------------\n");
+		return version.toString();
+	}
+}

+ 1 - 1
maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java

@@ -155,7 +155,7 @@ public class JwtAuthorizeEndpoint  extends AuthorizeBaseEndpoint{
 				jwkSetString = jwkSetString + "," +jwtDetails.getAlgorithmKey();
 			}
 		}
-		
+		 
 		JWKSetKeyStore jwkSetKeyStore = new JWKSetKeyStore("{\"keys\": [" + jwkSetString + "]}");
 		
 		return PrettyFactory.getJsonPretty().format(

+ 2 - 2
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/MetadataEndpoint.java → maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java

@@ -57,9 +57,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Tag(name = "2-2-SAML v2.0 API文档模块")
 @Controller
 @RequestMapping(value = { "/metadata/saml20/" })
-public class MetadataEndpoint {
+public class SamlMetadataEndpoint {
 	private final static Logger logger = LoggerFactory
-			.getLogger(MetadataEndpoint.class);
+			.getLogger(SamlMetadataEndpoint.class);
 
 	@Autowired
 	@Qualifier("keyStoreLoader")