jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
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 GMT
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 <code>DefaultLoginModulePlugin</code> class provides a default
  * implementation of the {@link LoginModulePlugin} interface. It may be used as
@@ -87,7 +89,7 @@
      * on the <code>DefaultLoginModule</code> 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 <code>LoginModulePlugin</code> interface defines the API to be
  * implemented by a pluggable login module. Instances of this interface are
@@ -133,7 +135,7 @@
      *         Otherwise <code>false</code> 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;
         }
 



Mime
View raw message