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 2905DD436 for ; Fri, 24 Aug 2012 12:46:30 +0000 (UTC) Received: (qmail 27484 invoked by uid 500); 24 Aug 2012 12:46:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27352 invoked by uid 500); 24 Aug 2012 12:46:28 -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 27327 invoked by uid 99); 24 Aug 2012 12:46:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2012 12:46:28 +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; Fri, 24 Aug 2012 12:46:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E771C2388994; Fri, 24 Aug 2012 12:45:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1376897 - /cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java Date: Fri, 24 Aug 2012 12:45:41 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120824124541.E771C2388994@eris.apache.org> Author: sergeyb Date: Fri Aug 24 12:45:41 2012 New Revision: 1376897 URL: http://svn.apache.org/viewvc?rev=1376897&view=rev Log: Adding two more MAC token constructors Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java?rev=1376897&r1=1376896&r2=1376897&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/MacAccessToken.java Fri Aug 24 12:45:41 2012 @@ -24,6 +24,12 @@ import org.apache.cxf.rs.security.oauth2 import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils; public class MacAccessToken extends ServerAccessToken { + + public MacAccessToken(Client client, + long lifetime) { + this(client, HmacAlgorithm.HmacSHA256, lifetime); + } + public MacAccessToken(Client client, String macAuthAlgo, long lifetime) { @@ -45,12 +51,23 @@ public class MacAccessToken extends Serv long lifetime, long issuedAt) { super(client, OAuthConstants.MAC_TOKEN_TYPE, tokenKey, lifetime, issuedAt); - this.setExtraParameters(algo); + this.setExtraParameters(algo, null); + } + + public MacAccessToken(Client client, + HmacAlgorithm algo, + String tokenKey, + String tokenSecret, + long lifetime, + long issuedAt) { + super(client, OAuthConstants.MAC_TOKEN_TYPE, tokenKey, lifetime, issuedAt); + this.setExtraParameters(algo, tokenSecret); } - private void setExtraParameters(HmacAlgorithm algo) { + private void setExtraParameters(HmacAlgorithm algo, String secret) { + String theSecret = secret == null ? HmacUtils.generateSecret(algo) : secret; super.getParameters().put(OAuthConstants.MAC_TOKEN_SECRET, - HmacUtils.generateSecret(algo)); + theSecret); super.getParameters().put(OAuthConstants.MAC_TOKEN_ALGORITHM, algo.getOAuthName()); }