From oak-commits-return-1875-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Oct 10 12:04:37 2012 Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E745CD107 for ; Wed, 10 Oct 2012 12:04:37 +0000 (UTC) Received: (qmail 39816 invoked by uid 500); 10 Oct 2012 12:04:37 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 39790 invoked by uid 500); 10 Oct 2012 12:04:37 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 39777 invoked by uid 99); 10 Oct 2012 12:04:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 12:04:37 +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, 10 Oct 2012 12:04:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0219323889B8; Wed, 10 Oct 2012 12:03:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396557 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication: ./ callback/ token/ Date: Wed, 10 Oct 2012 12:03:52 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121010120353.0219323889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Oct 10 12:03:52 2012 New Revision: 1396557 URL: http://svn.apache.org/viewvc?rev=1396557&view=rev Log: OAK-91 - Implement Authentication Support (WIP) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContext.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContext.java?rev=1396557&r1=1396556&r2=1396557&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContext.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContext.java Wed Oct 10 12:03:52 2012 @@ -28,10 +28,19 @@ import javax.security.auth.login.LoginEx */ public interface LoginContext { + /** + * @see javax.security.auth.login.LoginContext#getSubject() + */ Subject getSubject(); + /** + * @see javax.security.auth.login.LoginContext#login() + */ void login() throws LoginException; + /** + * @see javax.security.auth.login.LoginContext#logout() + */ void logout() throws LoginException; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java?rev=1396557&r1=1396556&r2=1396557&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java Wed Oct 10 12:03:52 2012 @@ -52,9 +52,7 @@ public class RepositoryCallback implemen public Root getRoot() { if (nodeStore != null) { try { - // FIXME: need a direct and fast way to create Root from the node store - // FIXME: - without login - // FIXME: - without ContentSession#getLatestRoot which is unbearably slow + // FIXME: need a direct and fast way to create Root from the node store without having to call login SecurityProvider sp = new OpenSecurityProvider(); return new ContentRepositoryImpl(nodeStore, null, sp).login(null, workspaceName).getLatestRoot(); } catch (LoginException e) { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java?rev=1396557&r1=1396556&r2=1396557&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java Wed Oct 10 12:03:52 2012 @@ -20,8 +20,6 @@ import javax.annotation.CheckForNull; import javax.security.auth.callback.Callback; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * SecurityProviderCallback... TODO Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java?rev=1396557&r1=1396556&r2=1396557&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java Wed Oct 10 12:03:52 2012 @@ -22,7 +22,7 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.api.security.authentication.token.TokenCredentials; /** - * TokenInfo... TODO document, move to spi/api + * TokenInfo... TODO */ public interface TokenInfo { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java?rev=1396557&r1=1396556&r2=1396557&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java Wed Oct 10 12:03:52 2012 @@ -20,14 +20,14 @@ import javax.annotation.CheckForNull; import javax.jcr.Credentials; /** - * TokenProvider... TODO document, move to spi/api + * TokenProvider... TODO */ public interface TokenProvider { /** * Optional configuration parameter to set the token expiration time in ms. */ - public static final String PARAM_TOKEN_EXPIRATION = "tokenExpiration"; + String PARAM_TOKEN_EXPIRATION = "tokenExpiration"; /** * Default expiration time in ms for login tokens is 2 hours.