From e49a53558e6dcdd7701f6c98cbbfa534491d6d72 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 20 Dec 2023 19:49:44 +0800 Subject: [PATCH] CAS format --- .../authz/cas/endpoint/Cas20AuthorizeEndpoint.java | 6 +++--- .../authz/cas/endpoint/Cas30AuthorizeEndpoint.java | 6 +++--- .../endpoint/response/ProxyServiceResponseBuilder.java | 4 ++++ .../cas/endpoint/response/ServiceResponseBuilder.java | 9 +++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index e7e1998ed..fafc2b5f5 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -200,7 +200,7 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message e.printStackTrace(); } } - ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); + ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(format); if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); @@ -328,7 +328,7 @@ Response on ticket validation failure: e.printStackTrace(); } } - ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); + ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(format); if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); @@ -420,7 +420,7 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message +" , targetService " + targetService +" , format " + format ); - ProxyServiceResponseBuilder proxyServiceResponseBuilder=new ProxyServiceResponseBuilder(); + ProxyServiceResponseBuilder proxyServiceResponseBuilder=new ProxyServiceResponseBuilder(format); ProxyGrantingTicketImpl proxyGrantingTicketImpl = (ProxyGrantingTicketImpl)casProxyGrantingTicketServices.get(pgt); if(proxyGrantingTicketImpl != null) { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 8fb508845..5e5085683 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -82,7 +82,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ e.printStackTrace(); } } - ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); + ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(format); if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); @@ -134,7 +134,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ +" , targetService " + targetService +" , format " + format ); - ProxyServiceResponseBuilder proxyServiceResponseBuilder=new ProxyServiceResponseBuilder(); + ProxyServiceResponseBuilder proxyServiceResponseBuilder=new ProxyServiceResponseBuilder(format); ProxyGrantingTicketImpl proxyGrantingTicketImpl = (ProxyGrantingTicketImpl)casProxyGrantingTicketServices.get(pgt); if(proxyGrantingTicketImpl != null) { ProxyTicketImpl ProxyTicketImpl = new ProxyTicketImpl(proxyGrantingTicketImpl.getAuthentication(),proxyGrantingTicketImpl.getCasDetails()); @@ -173,7 +173,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ e.printStackTrace(); } } - ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); + ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(format); if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java index 8ff1bee6e..1679b7454 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java @@ -24,6 +24,10 @@ public class ProxyServiceResponseBuilder extends ServiceResponseBuilder{ public ProxyServiceResponseBuilder() { } + + public ProxyServiceResponseBuilder(String format) { + this.format = format; + } @Override public String serviceResponseBuilder() { diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java index 6beddcd8a..3846312b0 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java @@ -27,6 +27,15 @@ import org.slf4j.LoggerFactory; public class ServiceResponseBuilder extends CasServiceResponse { final static Logger _logger = LoggerFactory.getLogger(ServiceResponseBuilder.class); + + public ServiceResponseBuilder(){ + + } + + public ServiceResponseBuilder(String format){ + this.format = format; + } + @Override public String serviceResponseBuilder() { String responseString = "";