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 AC1A81057B for ; Thu, 15 Aug 2013 08:35:32 +0000 (UTC) Received: (qmail 79661 invoked by uid 500); 15 Aug 2013 08:35:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 79238 invoked by uid 500); 15 Aug 2013 08:35:26 -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 79224 invoked by uid 99); 15 Aug 2013 08:35:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 08:35:25 +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; Thu, 15 Aug 2013 08:35:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BE50623888E2; Thu, 15 Aug 2013 08:35:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1514198 - in /cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2: tokens/refresh/ tokens/refresh/RefreshToken.java utils/OAuthConstants.java Date: Thu, 15 Aug 2013 08:35:01 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130815083501.BE50623888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Aug 15 08:35:01 2013 New Revision: 1514198 URL: http://svn.apache.org/r1514198 Log: [CXF-5180] Adding a simple RefreshToken implementation, patch on behalf of Thorsten Hoeger applied Added: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java (with props) Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java Added: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.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/refresh/RefreshToken.java?rev=1514198&view=auto ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java (added) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java Thu Aug 15 08:35:01 2013 @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.rs.security.oauth2.tokens.refresh; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.cxf.rs.security.oauth2.common.Client; +import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken; +import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants; +import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils; + +/** + * Simple Refresh Token implementation + */ +public class RefreshToken extends ServerAccessToken { + + private Set accessTokens = new HashSet(); + + public RefreshToken(Client client, + long lifetime) { + super(client, + OAuthConstants.REFRESH_TOKEN_TYPE, + OAuthUtils.generateRandomTokenKey(), + lifetime, + System.currentTimeMillis() / 1000); + } + + public RefreshToken(Client client, + String tokenKey, + long lifetime, + long issuedAt) { + super(client, + OAuthConstants.REFRESH_TOKEN_TYPE, + tokenKey, + lifetime, + issuedAt); + } + + public Set getAccessTokens() { + return accessTokens; + } + + public void setAccessTokens(Set accessTokens) { + this.accessTokens = accessTokens; + } + + public void addAccessToken(String token) { + accessTokens.add(token); + } + + public boolean removeAccessToken(String token) { + return accessTokens.remove(token); + } +} Propchange: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java?rev=1514198&r1=1514197&r2=1514198&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java Thu Aug 15 08:35:01 2013 @@ -32,6 +32,8 @@ public final class OAuthConstants { public static final String ACCESS_TOKEN = "access_token"; public static final String ACCESS_TOKEN_TYPE = "token_type"; public static final String ACCESS_TOKEN_EXPIRES_IN = "expires_in"; + // CXF-Specific + public static final String ACCESS_TOKEN_ISSUED_AT = "issued_at"; public static final String GRANT_TYPE = "grant_type"; public static final String RESPONSE_TYPE = "response_type"; public static final String TOKEN_RESPONSE_TYPE = "token"; @@ -47,7 +49,9 @@ public final class OAuthConstants { // Well-known token types public static final String BEARER_TOKEN_TYPE = "bearer"; public static final String MAC_TOKEN_TYPE = "mac"; - + // CXF-specific + public static final String REFRESH_TOKEN_TYPE = "refresh"; + // MAC token parameters // Set by Access Token Service public static final String MAC_TOKEN_KEY = "mac_key"; @@ -103,11 +107,6 @@ public final class OAuthConstants { public static final String REVOKED_TOKEN_TYPE_HINT = "token_type_hint"; public static final String UNSUPPORTED_TOKEN_TYPE = "unsupported_token_type"; - // CXF-Specific parameters - public static final String ACCESS_TOKEN_ISSUED_AT = "issued_at"; - // End Of CXF-Specific - - private OAuthConstants() { }