jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1575272 - /jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/
Date Fri, 07 Mar 2014 14:40:06 GMT
Author: angela
Date: Fri Mar  7 14:40:05 2014
New Revision: 1575272

URL: http://svn.apache.org/r1575272
Log:
OAK-1261: WIP

- move global @Ignore to individual tests (sync not yet implemented)
- rename ldaploginwithrepo test
- add test for GuestCredentials login
- add test for config with TokenLm, DefaultLm, LDAPLm
- add test for config with GuestLm, TokenLm, DefaultLm, LDAPLm

Added:
    jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java
      - copied, changed from r1575204, jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java
    jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java
  (with props)
    jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java
  (with props)
Removed:
    jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java
Modified:
    jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java

Copied: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java
(from r1575204, jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java?p2=jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java&p1=jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java&r1=1575204&r2=1575272&rev=1575272&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java
(original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java
Fri Mar  7 14:40:05 2014
@@ -17,15 +17,19 @@
 package org.apache.jackrabbit.oak.security.authentication.ldap;
 
 import java.util.Collections;
+import javax.jcr.GuestCredentials;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 
+import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
-import org.junit.Ignore;
+import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
+import org.junit.Test;
 
-@Ignore //ignore for the moment because "mvn test" runs into PermGen memory issues
-public class LdapLoginWithRepoLoginTest extends LdapLoginTestBase {
+import static org.junit.Assert.assertEquals;
+
+public class DefaultLdapLoginModuleTest extends LdapLoginTestBase {
 
     @Override
     protected Configuration getConfiguration() {
@@ -45,4 +49,19 @@ public class LdapLoginWithRepoLoginTest 
             }
         };
     }
+
+    /**
+     * Login with {@link javax.jcr.GuestCredentials} must succeed and result in
+     * an guest session as the SUFFICIENT
+     * {@link org.apache.jackrabbit.oak.spi.security.authentication.LoginModuleImpl}
+     * handles the guest login (in contrast to the ExternalLoginModule).
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testGuestLogin() throws Exception {
+        ContentSession cs = login(new GuestCredentials());
+        assertEquals(UserConstants.DEFAULT_ANONYMOUS_ID, cs.getAuthInfo().getUserID());
+        cs.close();
+    }
 }

Added: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java?rev=1575272&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java
(added)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java
Fri Mar  7 14:40:05 2014
@@ -0,0 +1,75 @@
+/*
+ * 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.jackrabbit.oak.security.authentication.ldap;
+
+import java.util.Collections;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+
+import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule;
+import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
+import org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule;
+import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
+import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class GuestTokenDefaultLdapLoginModuleTest extends TokenDefaultLdapLoginModuleTest
{
+
+    @Override
+    protected Configuration getConfiguration() {
+        return new Configuration() {
+            @Override
+            public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
+                return new AppConfigurationEntry[]{
+                        new AppConfigurationEntry(
+                                GuestLoginModule.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.OPTIONAL,
+                                Collections.<String, Object>emptyMap()),
+                        new AppConfigurationEntry(
+                                TokenLoginModule.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
+                                Collections.<String, Object>emptyMap()),
+                        new AppConfigurationEntry(
+                                LoginModuleImpl.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
+                                Collections.<String, Object>emptyMap()),
+                        new AppConfigurationEntry(
+                                ExternalLoginModule.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
+                                options)
+                };
+            }
+        };
+    }
+
+    /**
+     * Null login must succeed and result in an guest session as the OPTIONAL
+     * {@link GuestLoginModule} adds {@link javax.jcr.GuestCredentials} to the
+     * shared state.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testNullLogin() throws Exception {
+        ContentSession cs = login(null);
+        assertEquals(UserConstants.DEFAULT_ANONYMOUS_ID, cs.getAuthInfo().getUserID());
+        cs.close();
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/GuestTokenDefaultLdapLoginModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java?rev=1575272&r1=1575271&r2=1575272&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java
(original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java
Fri Mar  7 14:40:05 2014
@@ -16,13 +16,17 @@
  */
 package org.apache.jackrabbit.oak.security.authentication.ldap;
 
+import javax.jcr.GuestCredentials;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginException;
 
+import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
-import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
 
-@Ignore //ignore for the moment because "mvn test" runs into PermGen memory issues
 public class LdapLoginStandaloneTest extends LdapLoginTestBase {
 
     @Override
@@ -39,4 +43,15 @@ public class LdapLoginStandaloneTest ext
             }
         };
     }
+
+    @Test
+    public void testGuestLogin() throws Exception {
+        try {
+            ContentSession sc = login(new GuestCredentials());
+            sc.close();
+            fail("Guest login must fail.");
+        } catch (LoginException e) {
+            // success
+        }
+    }
 }

Added: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java?rev=1575272&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java
(added)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java
Fri Mar  7 14:40:05 2014
@@ -0,0 +1,51 @@
+/*
+ * 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.jackrabbit.oak.security.authentication.ldap;
+
+import java.util.Collections;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+
+import org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule;
+import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
+import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
+
+public class TokenDefaultLdapLoginModuleTest extends DefaultLdapLoginModuleTest {
+
+    @Override
+    protected Configuration getConfiguration() {
+        return new Configuration() {
+            @Override
+            public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
+                return new AppConfigurationEntry[]{
+                        new AppConfigurationEntry(
+                                TokenLoginModule.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
+                                Collections.<String, Object>emptyMap()),
+                        new AppConfigurationEntry(
+                                LoginModuleImpl.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
+                                Collections.<String, Object>emptyMap()),
+                        new AppConfigurationEntry(
+                                ExternalLoginModule.class.getName(),
+                                AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
+                                options)
+                };
+            }
+        };
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/TokenDefaultLdapLoginModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message