Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B0718E083 for ; Wed, 16 Jan 2013 11:01:53 +0000 (UTC) Received: (qmail 97784 invoked by uid 500); 16 Jan 2013 11:01:52 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97657 invoked by uid 500); 16 Jan 2013 11:01:52 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 97636 invoked by uid 99); 16 Jan 2013 11:01:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 11:01:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 11:01:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AA65523889E1; Wed, 16 Jan 2013 11:01:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1433895 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Date: Wed, 16 Jan 2013 11:01:29 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130116110129.AA65523889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Jan 16 11:01:29 2013 New Revision: 1433895 URL: http://svn.apache.org/viewvc?rev=1433895&view=rev Log: [CXF-4742] - Not possible to disable token renewal in STS client Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1433895&r1=1433894&r2=1433895&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Wed Jan 16 11:01:29 2013 @@ -146,63 +146,7 @@ public class IssuedTokenInterceptorProvi SecurityToken tok = retrieveCachedToken(message); if (tok == null) { - STSClient client = STSUtils.getClient(message, "sts", itok); - AddressingProperties maps = - (AddressingProperties)message - .get("javax.xml.ws.addressing.context.outbound"); - if (maps == null) { - maps = (AddressingProperties)message - .get("javax.xml.ws.addressing.context"); - } - synchronized (client) { - try { - // Transpose ActAs/OnBehalfOf info from original request to the STS client. - Object token = - message.getContextualProperty(SecurityConstants.STS_TOKEN_ACT_AS); - if (token != null) { - client.setActAs(token); - } - token = - message.getContextualProperty(SecurityConstants.STS_TOKEN_ON_BEHALF_OF); - if (token != null) { - client.setOnBehalfOf(token); - } - Map ctx = client.getRequestContext(); - mapSecurityProps(message, ctx); - - Object o = message.getContextualProperty(SecurityConstants.STS_APPLIES_TO); - String appliesTo = o == null ? null : o.toString(); - appliesTo = appliesTo == null - ? message.getContextualProperty(Message.ENDPOINT_ADDRESS).toString() - : appliesTo; - boolean enableAppliesTo = client.isEnableAppliesTo(); - - client.setMessage(message); - Element onBehalfOfToken = client.getOnBehalfOfToken(); - Element actAsToken = client.getActAsToken(); - - SecurityToken secToken = - handleDelegation( - message, onBehalfOfToken, actAsToken, appliesTo, enableAppliesTo - ); - if (secToken == null) { - secToken = getTokenFromSTS(message, client, aim, maps, itok, appliesTo); - } - tok = secToken; - storeDelegationTokens( - message, tok, onBehalfOfToken, actAsToken, appliesTo, enableAppliesTo - ); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new Fault(e); - } finally { - client.setTrust((Trust10)null); - client.setTrust((Trust13)null); - client.setTemplate(null); - client.setAddressingNamespace(null); - } - } + tok = issueToken(message, aim, itok); } else { tok = renewToken(message, aim, itok, tok); } @@ -413,11 +357,18 @@ public class IssuedTokenInterceptorProvi IssuedToken itok, SecurityToken tok ) { + // If the token has not expired then we don't need to renew it if (!tok.isExpired()) { return tok; } + // If the user has explicitly disabled Renewing then we can't renew a token, + // so just get a new one STSClient client = STSUtils.getClient(message, "sts", itok); + if (!client.isAllowRenewing()) { + return issueToken(message, aim, itok); + } + AddressingProperties maps = (AddressingProperties)message .get("javax.xml.ws.addressing.context.outbound"); @@ -454,6 +405,70 @@ public class IssuedTokenInterceptorProvi } } + private SecurityToken issueToken( + Message message, + AssertionInfoMap aim, + IssuedToken itok + ) { + STSClient client = STSUtils.getClient(message, "sts", itok); + AddressingProperties maps = + (AddressingProperties)message + .get("javax.xml.ws.addressing.context.outbound"); + if (maps == null) { + maps = (AddressingProperties)message + .get("javax.xml.ws.addressing.context"); + } + synchronized (client) { + try { + // Transpose ActAs/OnBehalfOf info from original request to the STS client. + Object token = + message.getContextualProperty(SecurityConstants.STS_TOKEN_ACT_AS); + if (token != null) { + client.setActAs(token); + } + token = + message.getContextualProperty(SecurityConstants.STS_TOKEN_ON_BEHALF_OF); + if (token != null) { + client.setOnBehalfOf(token); + } + Map ctx = client.getRequestContext(); + mapSecurityProps(message, ctx); + + Object o = message.getContextualProperty(SecurityConstants.STS_APPLIES_TO); + String appliesTo = o == null ? null : o.toString(); + appliesTo = appliesTo == null + ? message.getContextualProperty(Message.ENDPOINT_ADDRESS).toString() + : appliesTo; + boolean enableAppliesTo = client.isEnableAppliesTo(); + + client.setMessage(message); + Element onBehalfOfToken = client.getOnBehalfOfToken(); + Element actAsToken = client.getActAsToken(); + + SecurityToken secToken = + handleDelegation( + message, onBehalfOfToken, actAsToken, appliesTo, enableAppliesTo + ); + if (secToken == null) { + secToken = getTokenFromSTS(message, client, aim, maps, itok, appliesTo); + } + storeDelegationTokens( + message, secToken, onBehalfOfToken, actAsToken, appliesTo, enableAppliesTo + ); + return secToken; + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new Fault(e); + } finally { + client.setTrust((Trust10)null); + client.setTrust((Trust13)null); + client.setTemplate(null); + client.setAddressingNamespace(null); + } + } + } + } static class IssuedTokenInInterceptor extends AbstractPhaseInterceptor {