From a1a9fab6d6ba29360f853f6d8be5ac25060b3a39 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Wed, 4 Dec 2024 14:34:55 +0800 Subject: [PATCH] =?UTF-8?q?CAS=E9=80=82=E9=85=8D=E5=99=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cas/endpoint/Cas20AuthorizeEndpoint.java | 16 ++++++++++------ .../cas/endpoint/Cas30AuthorizeEndpoint.java | 17 +++++++++++------ 2 files changed, 21 insertions(+), 12 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 dc05b2220..bd7991044 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 @@ -212,17 +212,19 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message if(ConstsBoolean.isTrue(storedTicket.getCasDetails().getIsAdapter())){ - Object samlAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); + Object casAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); try { - BeanUtils.setProperty(samlAdapter, "serviceResponseBuilder", serviceResponseBuilder); + BeanUtils.setProperty(casAdapter, "serviceResponseBuilder", serviceResponseBuilder); } catch (IllegalAccessException | InvocationTargetException e) { _logger.error("setProperty error . ", e); } - AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)samlAdapter; + AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)casAdapter; adapter.setPrincipal(authentication); adapter.setApp(storedTicket.getCasDetails()); adapter.generateInfo(); + }else { + _logger.error("Cas Adapter is not Set . "); } }else{ serviceResponseBuilder.failure() @@ -320,17 +322,19 @@ Response on ticket validation failure: if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); if(ConstsBoolean.isTrue(storedTicket.getCasDetails().getIsAdapter())){ - Object samlAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); + Object casAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); try { - BeanUtils.setProperty(samlAdapter, "serviceResponseBuilder", serviceResponseBuilder); + BeanUtils.setProperty(casAdapter, "serviceResponseBuilder", serviceResponseBuilder); } catch (IllegalAccessException | InvocationTargetException e) { _logger.error("setProperty error . ", e); } - AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)samlAdapter; + AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)casAdapter; adapter.setPrincipal(authentication); adapter.setApp(storedTicket.getCasDetails()); adapter.generateInfo(); + }else { + _logger.error("Cas Adapter is not Set . "); } }else{ serviceResponseBuilder.failure() 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 e33574686..eca6997ad 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 @@ -25,6 +25,7 @@ import java.lang.reflect.InvocationTargetException; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.SignPrincipal; +import org.dromara.maxkey.authz.cas.endpoint.adapter.CasPlainAdapter; import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; import org.dromara.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; @@ -95,17 +96,19 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ } if(ConstsBoolean.isTrue(storedTicket.getCasDetails().getIsAdapter())){ - Object samlAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); + Object casAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); try { - BeanUtils.setProperty(samlAdapter, "serviceResponseBuilder", serviceResponseBuilder); + BeanUtils.setProperty(casAdapter, "serviceResponseBuilder", serviceResponseBuilder); } catch (IllegalAccessException | InvocationTargetException e) { _logger.error("setProperty error . ", e); } - AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)samlAdapter; + AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)casAdapter; adapter.setPrincipal(authentication); adapter.setApp(storedTicket.getCasDetails()); adapter.generateInfo(); + }else { + _logger.error("Cas Adapter is not Set . "); } }else{ serviceResponseBuilder.failure() @@ -163,17 +166,19 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ if(storedTicket!=null){ SignPrincipal authentication = ((SignPrincipal)storedTicket.getAuthentication().getPrincipal()); if(ConstsBoolean.isTrue(storedTicket.getCasDetails().getIsAdapter())){ - Object samlAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); + Object casAdapter = Instance.newInstance(storedTicket.getCasDetails().getAdapter()); try { - BeanUtils.setProperty(samlAdapter, "serviceResponseBuilder", serviceResponseBuilder); + BeanUtils.setProperty(casAdapter, "serviceResponseBuilder", serviceResponseBuilder); } catch (IllegalAccessException | InvocationTargetException e) { _logger.error("setProperty error . ", e); } - AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)samlAdapter; + AbstractAuthorizeAdapter adapter =(AbstractAuthorizeAdapter)casAdapter; adapter.setPrincipal(authentication); adapter.setApp(storedTicket.getCasDetails()); adapter.generateInfo(); + }else { + _logger.error("Cas Adapter is not Set . "); } }else{ serviceResponseBuilder.failure()