From 975bf7700c0a4ef403b70ad39285feeab01bc70b Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Thu, 27 May 2010 03:09:39 +0000 Subject: [PATCH] CASC-110 added the reserved keyword to the list. --- .../java/org/jasig/cas/client/util/CommonUtils.java | 12 ++++-------- .../Cas20ProxyReceivingTicketValidationFilter.java | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java index bc6068e..52006dd 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java @@ -166,14 +166,11 @@ public final class CommonUtils { } public static void readAndRespondToProxyReceptorRequest(final HttpServletRequest request, final HttpServletResponse response, final ProxyGrantingTicketStorage proxyGrantingTicketStorage) throws IOException { - final String proxyGrantingTicketIou = request - .getParameter(PARAM_PROXY_GRANTING_TICKET_IOU); + final String proxyGrantingTicketIou = request.getParameter(PARAM_PROXY_GRANTING_TICKET_IOU); - final String proxyGrantingTicket = request - .getParameter(PARAM_PROXY_GRANTING_TICKET); + final String proxyGrantingTicket = request.getParameter(PARAM_PROXY_GRANTING_TICKET); - if (CommonUtils.isBlank(proxyGrantingTicket) - || CommonUtils.isBlank(proxyGrantingTicketIou)) { + if (CommonUtils.isBlank(proxyGrantingTicket) || CommonUtils.isBlank(proxyGrantingTicketIou)) { response.getWriter().write(""); return; } @@ -184,8 +181,7 @@ public final class CommonUtils { + proxyGrantingTicketIou + "]"); } - proxyGrantingTicketStorage.save(proxyGrantingTicketIou, - proxyGrantingTicket); + proxyGrantingTicketStorage.save(proxyGrantingTicketIou, proxyGrantingTicket); response.getWriter().write(""); response.getWriter().write(""); diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java index 921dbd7..3fbb431 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilter.java @@ -34,7 +34,7 @@ import org.jasig.cas.client.util.CommonUtils; */ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketValidationFilter { - private static final String[] RESERVED_INIT_PARAMS = new String[] {"proxyReceptorUrl", "acceptAnyProxy", "allowedProxyChains", "casServerUrlPrefix", "proxyCallbackUrl", "renew", "exceptionOnValidationFailure", "redirectAfterValidation", "useSession", "serverName", "service", "artifactParameterName", "serviceParameterName", "encodeServiceUrl", "millisBetweenCleanUps"}; + private static final String[] RESERVED_INIT_PARAMS = new String[] {"proxyGrantingTicketStorageClass", "proxyReceptorUrl", "acceptAnyProxy", "allowedProxyChains", "casServerUrlPrefix", "proxyCallbackUrl", "renew", "exceptionOnValidationFailure", "redirectAfterValidation", "useSession", "serverName", "service", "artifactParameterName", "serviceParameterName", "encodeServiceUrl", "millisBetweenCleanUps"}; private static final int DEFAULT_MILLIS_BETWEEN_CLEANUPS = 60 * 1000; @@ -157,7 +157,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal return true; } - CommonUtils.readAndRespondToProxyReceptorRequest(request, response, proxyGrantingTicketStorage); + CommonUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage); return false; } @@ -167,7 +167,7 @@ public class Cas20ProxyReceivingTicketValidationFilter extends AbstractTicketVal } public void setProxyGrantingTicketStorage(final ProxyGrantingTicketStorage storage) { - proxyGrantingTicketStorage = storage; + this.proxyGrantingTicketStorage = storage; } public void setTimer(final Timer timer) {