svn commit: r1396557 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication: ./ callback/ token/

[an...@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.