Author: thomas.heute(a)jboss.com Date: 2010-04-14 05:06:06 -0400 (Wed, 14 Apr 2010) New Revision: 2620 Modified: components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java Log: GTNPORTAL-1046: GateIn and secure CAS integration: problem with renew parameter Modified: components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java =================================================================== --- components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-14 09:03:01 UTC (rev 2619) +++ components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-14 09:06:06 UTC (rev 2620) @@ -46,6 +46,7 @@ private String ssoServerUrl; private String ssoCookieName; + private boolean casRenewTicket; @Override @@ -55,6 +56,12 @@ this.ssoServerUrl = this.getServletConfig().getInitParameter("ssoServerUrl"); this.ssoCookieName = this.getServletConfig().getInitParameter("ssoCookieName"); + + String casRenewTicketConfig = this.getServletConfig().getInitParameter("casRenewTicket"); + if(casRenewTicketConfig != null) + { + this.casRenewTicket = Boolean.parseBoolean(casRenewTicketConfig); + } } @Override @@ -96,7 +103,9 @@ if (ticket != null && ticket.trim().length() > 0) { - CASAgent.getInstance(this.ssoServerUrl).validateTicket(httpRequest, ticket); + CASAgent casagent = CASAgent.getInstance(this.ssoServerUrl); + casagent.setRenewTicket(this.casRenewTicket); + casagent.validateTicket(httpRequest, ticket); } else if (jossoAssertion != null && jossoAssertion.trim().length() > 0) { Modified: components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java =================================================================== --- components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-04-14 09:03:01 UTC (rev 2619) +++ components/sso/branches/1.0.0-epp-5.0.0-CR01-Branch/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-04-14 09:06:06 UTC (rev 2620) @@ -41,6 +41,7 @@ private static CASAgent singleton; private String casServerUrl; + private boolean renewTicket; private CASAgent(String casServerUrl) { @@ -62,10 +63,21 @@ return CASAgent.singleton; } + + public boolean isRenewTicket() + { + return renewTicket; + } + + public void setRenewTicket(boolean renewTicket) + { + this.renewTicket = renewTicket; + } + public void validateTicket(HttpServletRequest httpRequest, String ticket) throws Exception { Cas20ProxyTicketValidator ticketValidator = new Cas20ProxyTicketValidator(casServerUrl); - ticketValidator.setRenew(true); + ticketValidator.setRenew(this.renewTicket); String serviceUrl = "http://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() + httpRequest.getContextPath() +"/private/classic";