Make salt sources pluggable.

core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java

@@ -0,0 +1,94 @@
+/* Copyright 2004 Acegi Technology Pty Limited
+ *
+ * Licensed 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 net.sf.acegisecurity.providers.dao.salt;
+
+import junit.framework.TestCase;
+
+import net.sf.acegisecurity.AuthenticationServiceException;
+import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.GrantedAuthorityImpl;
+import net.sf.acegisecurity.providers.dao.User;
+
+
+/**
+ * Tests {@link ReflectionSaltSource}.
+ *
+ * @author Ben Alex
+ * @version $Id$
+ */
+public class ReflectionSaltSourceTests extends TestCase {
+    //~ Constructors ===========================================================
+
+    public ReflectionSaltSourceTests() {
+        super();
+    }
+
+    public ReflectionSaltSourceTests(String arg0) {
+        super(arg0);
+    }
+
+    //~ Methods ================================================================
+
+    public final void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(ReflectionSaltSourceTests.class);
+    }
+
+    public void testDetectsMissingUserPropertyToUse() throws Exception {
+        ReflectionSaltSource saltSource = new ReflectionSaltSource();
+
+        try {
+            saltSource.afterPropertiesSet();
+            fail("Should have thrown IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            assertEquals("A userPropertyToUse must be set",
+                expected.getMessage());
+        }
+    }
+
+    public void testExceptionWhenInvalidPropertyRequested() {
+        ReflectionSaltSource saltSource = new ReflectionSaltSource();
+        saltSource.setUserPropertyToUse("getDoesNotExist");
+
+        User user = new User("scott", "wombat", true,
+                new GrantedAuthority[] {new GrantedAuthorityImpl("HOLDER")});
+
+        try {
+            saltSource.getSalt(user);
+            fail("Should have thrown AuthenticationServiceException");
+        } catch (AuthenticationServiceException expected) {
+            assertTrue(true);
+        }
+    }
+
+    public void testGettersSetters() {
+        ReflectionSaltSource saltSource = new ReflectionSaltSource();
+        saltSource.setUserPropertyToUse("getUsername");
+        assertEquals("getUsername", saltSource.getUserPropertyToUse());
+    }
+
+    public void testNormalOperation() {
+        ReflectionSaltSource saltSource = new ReflectionSaltSource();
+        saltSource.setUserPropertyToUse("getUsername");
+
+        User user = new User("scott", "wombat", true,
+                new GrantedAuthority[] {new GrantedAuthorityImpl("HOLDER")});
+        assertEquals("scott", saltSource.getSalt(user));
+    }
+}

core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java

@@ -0,0 +1,70 @@
+/* Copyright 2004 Acegi Technology Pty Limited
+ *
+ * Licensed 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 net.sf.acegisecurity.providers.dao.salt;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests {@link SystemWideSaltSource}.
+ *
+ * @author Ben Alex
+ * @version $Id$
+ */
+public class SystemWideSaltSourceTests extends TestCase {
+    //~ Constructors ===========================================================
+
+    public SystemWideSaltSourceTests() {
+        super();
+    }
+
+    public SystemWideSaltSourceTests(String arg0) {
+        super(arg0);
+    }
+
+    //~ Methods ================================================================
+
+    public final void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(SystemWideSaltSourceTests.class);
+    }
+
+    public void testDetectsMissingSystemWideSalt() throws Exception {
+        SystemWideSaltSource saltSource = new SystemWideSaltSource();
+
+        try {
+            saltSource.afterPropertiesSet();
+            fail("Should have thrown IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            assertEquals("A systemWideSalt must be set", expected.getMessage());
+        }
+    }
+
+    public void testGettersSetters() {
+        SystemWideSaltSource saltSource = new SystemWideSaltSource();
+        saltSource.setSystemWideSalt("helloWorld");
+        assertEquals("helloWorld", saltSource.getSystemWideSalt());
+    }
+
+    public void testNormalOperation() {
+        SystemWideSaltSource saltSource = new SystemWideSaltSource();
+        saltSource.setSystemWideSalt("helloWorld");
+        assertEquals("helloWorld", saltSource.getSalt(null));
+    }
+}