Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 81934 invoked from network); 1 Feb 2010 10:55:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Feb 2010 10:55:13 -0000 Received: (qmail 14035 invoked by uid 500); 1 Feb 2010 10:55:12 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 13980 invoked by uid 500); 1 Feb 2010 10:55:11 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 13964 invoked by uid 99); 1 Feb 2010 10:55:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2010 10:55:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 01 Feb 2010 10:55:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6033F23888D1; Mon, 1 Feb 2010 10:54:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905245 - in /jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: api/security/DefaultLoginModulePlugin.java api/security/LoginModulePlugin.java osgi/security/PluggableDefaultLoginModule.java Date: Mon, 01 Feb 2010 10:54:47 -0000 To: commits@jackrabbit.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100201105447.6033F23888D1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Mon Feb 1 10:54:46 2010 New Revision: 905245 URL: http://svn.apache.org/viewvc?rev=905245&view=rev Log: Provide the Jackrabbit User to the authenticate method to implement checks based on user setup Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/DefaultLoginModulePlugin.java jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/LoginModulePlugin.java jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/osgi/security/PluggableDefaultLoginModule.java Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/DefaultLoginModulePlugin.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/DefaultLoginModulePlugin.java?rev=905245&r1=905244&r2=905245&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/DefaultLoginModulePlugin.java (original) +++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/DefaultLoginModulePlugin.java Mon Feb 1 10:54:46 2010 @@ -29,6 +29,8 @@ import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; +import org.apache.jackrabbit.api.security.user.User; + /** * The DefaultLoginModulePlugin class provides a default * implementation of the {@link LoginModulePlugin} interface. It may be used as @@ -87,7 +89,7 @@ * on the DefaultLoginModule to authenticate the principal with * the credentials. */ - public boolean authenticate(Principal principal, Credentials credentials) { + public boolean authenticate(User user, Principal principal, Credentials credentials) { return false; } Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/LoginModulePlugin.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/LoginModulePlugin.java?rev=905245&r1=905244&r2=905245&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/LoginModulePlugin.java (original) +++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/api/security/LoginModulePlugin.java Mon Feb 1 10:54:46 2010 @@ -27,6 +27,8 @@ import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; +import org.apache.jackrabbit.api.security.user.User; + /** * The LoginModulePlugin interface defines the API to be * implemented by a pluggable login module. Instances of this interface are @@ -133,7 +135,7 @@ * Otherwise false to indicate the plugin cannot * identify the principal from the credentials. */ - boolean authenticate(Principal principal, Credentials credentials); + boolean authenticate(User user, Principal principal, Credentials credentials); /** * Returns a code indicating either the status of the impersonation attempt, Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/osgi/security/PluggableDefaultLoginModule.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/osgi/security/PluggableDefaultLoginModule.java?rev=905245&r1=905244&r2=905245&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/osgi/security/PluggableDefaultLoginModule.java (original) +++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/osgi/security/PluggableDefaultLoginModule.java Mon Feb 1 10:54:46 2010 @@ -229,7 +229,7 @@ @Override protected boolean authenticate(Principal principal, Credentials credentials) throws FailedLoginException, RepositoryException { - if (activePlugin.authenticate(principal, credentials)) { + if (activePlugin.authenticate(user, principal, credentials)) { return true; }