User: starksm
Date: 01/12/28 20:32:45
Modified: src/main/org/jboss/test Tag: Branch_2_4
LoginModulesTest.java SRPProtocolTest.java
SimpleSRPServer.java TestJCE.java TestProtocol.java
TestSRPLogin.java
Added: src/main/org/jboss/test Tag: Branch_2_4 UtilTest.java
Log:
Clean up the tests
Revision Changes Path
No revision
No revision
1.6.2.3 +73 -7 jbosssx/src/main/org/jboss/test/LoginModulesTest.java
Index: LoginModulesTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/LoginModulesTest.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- LoginModulesTest.java 2001/10/02 11:25:55 1.6.2.2
+++ LoginModulesTest.java 2001/12/29 04:32:45 1.6.2.3
@@ -9,6 +9,7 @@
import java.lang.reflect.Method;
import java.io.File;
import java.io.Serializable;
+import java.security.MessageDigest;
import java.security.Principal;
import java.security.acl.Group;
import java.sql.Connection;
@@ -33,15 +34,21 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.log4j.Category;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.PatternLayout;
+
+import org.jboss.logging.TracePriority;
import org.jboss.security.SimpleGroup;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.Util;
import org.jboss.security.auth.callback.UsernamePasswordHandler;
import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
/** Tests of the LoginModule classes.
@author [EMAIL PROTECTED]
- @version $Revision: 1.6.2.2 $
+ @version $Revision: 1.6.2.3 $
*/
public class LoginModulesTest extends TestCase
{
@@ -85,7 +92,7 @@
String name = "org.jboss.security.auth.spi.LdapLoginModule";
HashMap options = new HashMap();
options.put("java.naming.factory.initial",
"com.sun.jndi.ldap.LdapCtxFactory");
- options.put("java.naming.provider.url", "ldap://valkyrie-int/";);
+ options.put("java.naming.provider.url", "ldap://valkyrie/";);
options.put("java.naming.security.authentication", "simple");
options.put("principalDNPrefix", "uid=");
options.put("principalDNSuffix", ",ou=People,o=starkinternational.com");
@@ -155,13 +162,23 @@
{
return other();
}
+ AppConfigurationEntry[] testUsernamePasswordHash()
+ {
+ HashMap options = new HashMap();
+ options.put("hashAlgorithm", "MD5");
+ options.put("hashEncoding", "base64");
+ AppConfigurationEntry ace = new
AppConfigurationEntry(HashTestLoginModule.class.getName(),
+ AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
+ AppConfigurationEntry[] entry = {ace};
+ return entry;
+ }
AppConfigurationEntry[] testAnon()
{
String name = "org.jboss.security.auth.spi.AnonLoginModule";
HashMap options = new HashMap();
options.put("unauthenticatedIdentity", "nobody");
AppConfigurationEntry ace = new AppConfigurationEntry(name,
- AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
+ AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
AppConfigurationEntry[] entry = {ace};
return entry;
}
@@ -210,11 +227,34 @@
roles.addMember(new SimplePrincipal("Role2"));
return roleSets;
}
+ /** This represents the 'true' password
+ */
protected String getUsersPassword()
{
return "secret";
}
}
+ public static class HashTestLoginModule extends TestLoginModule
+ {
+ /** This represents the 'true' password in its hashed form
+ */
+ protected String getUsersPassword()
+ {
+ MessageDigest md = null;
+ try
+ {
+ md = MessageDigest.getInstance("MD5");
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ byte[] passwordBytes = "secret".getBytes();
+ byte[] hash = md.digest(passwordBytes);
+ String passwordHash = Util.encodeBase64(hash);
+ return passwordHash;
+ }
+ }
static class TestDS implements DataSource, Serializable
{
public java.sql.Connection getConnection() throws java.sql.SQLException
@@ -223,7 +263,7 @@
}
public java.sql.Connection getConnection(String user, String pass) throws
java.sql.SQLException
{
- String jdbcURL = "jdbc:HypersonicSQL:hsql://localhost:1476";
+ String jdbcURL = "jdbc:hsqldb:hsql://localhost:1476";
java.sql.Connection con = DriverManager.getConnection(jdbcURL, user, pass);
return con;
}
@@ -249,6 +289,15 @@
super(testName);
}
+ protected void setUp() throws Exception
+ {
+ // Set up a simple configuration that logs to LoginModulesTest.log
+ Category root = Category.getRoot();
+ root.setPriority(TracePriority.TRACE);
+ FileAppender appender = new FileAppender(new PatternLayout("%x%m%n"),
"LoginModulesTest.log");
+ root.addAppender(appender);
+ }
+
public void testUsernamePassword() throws Exception
{
System.out.println("testUsernamePassword");
@@ -265,6 +314,23 @@
lc.logout();
}
+ public void testUsernamePasswordHash() throws Exception
+ {
+ System.out.println("testUsernamePasswordHash");
+ UsernamePasswordHandler handler = new UsernamePasswordHandler("scott",
"secret".toCharArray());
+ LoginContext lc = new LoginContext("testUsernamePasswordHash", handler);
+ lc.login();
+ Subject subject = lc.getSubject();
+ Set groups = subject.getPrincipals(Group.class);
+ assert("Principals contains scott", subject.getPrincipals().contains(new
SimplePrincipal("scott")));
+ assert("Principals contains Roles", groups.contains(new
SimplePrincipal("Roles")));
+ Group roles = (Group) groups.iterator().next();
+ assert("TestRole is a role", roles.isMember(new SimplePrincipal("TestRole")));
+ assert("Role2 is a role", roles.isMember(new SimplePrincipal("Role2")));
+
+ lc.logout();
+ }
+
public void testJaasServer() throws Exception
{
System.out.println("testJaasServer");
@@ -508,11 +574,11 @@
System.out.println("testJdbc");
try
{
- Class.forName("org.hsql.jdbcDriver");
+ Class.forName("org.hsqldb.jdbcDriver");
}
catch(ClassNotFoundException e)
{ // Skip the test
- System.out.println("Skipping test because org.hsql.jdbcDriver was not
found");
+ System.out.println("Skipping test because org.hsqldb.jdbcDriver was not
found");
return;
}
// Create a DataSource binding
@@ -574,7 +640,7 @@
"-trace", "false"
};
// Start server
- org.hsql.Server.main(args);
+ org.hsqldb.Server.main(args);
}
});
1.1.4.1 +1 -1 jbosssx/src/main/org/jboss/test/SRPProtocolTest.java
Index: SRPProtocolTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/SRPProtocolTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SRPProtocolTest.java 2001/04/04 21:39:02 1.1
+++ SRPProtocolTest.java 2001/12/29 04:32:45 1.1.4.1
@@ -17,18 +17,18 @@
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
+import org.jboss.logging.TracePriority;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPServerInterface;
import org.jboss.security.srp.SRPServerInterface.SRPParameters;
import org.jboss.security.srp.SRPClientSession;
import org.jboss.security.srp.SRPServerSession;
-import org.jboss.security.srp.TracePriority;
/** Test of the SRP protocol msg exchange sequence.
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.1.4.1 $
*/
public class SRPProtocolTest extends junit.framework.TestCase
{
1.2.4.1 +1 -2 jbosssx/src/main/org/jboss/test/SimpleSRPServer.java
Index: SimpleSRPServer.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/SimpleSRPServer.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- SimpleSRPServer.java 2001/04/04 21:39:02 1.2
+++ SimpleSRPServer.java 2001/12/29 04:32:45 1.2.4.1
@@ -10,13 +10,12 @@
import org.jboss.security.srp.SRPServerInterface;
import org.jboss.security.srp.SRPServerInterface.SRPParameters;
import org.jboss.security.srp.SRPServerSession;
-import org.jboss.security.srp.TracePriority;
/** A simple hard coded implementation of SRPServerInterface that validates
any given username to the password and salt provided to its constructor.
@author [EMAIL PROTECTED]
-@version $Revision: 1.2 $
+@version $Revision: 1.2.4.1 $
*/
public class SimpleSRPServer implements SRPServerInterface
{
1.1.4.1 +1 -1 jbosssx/src/main/org/jboss/test/TestJCE.java
Index: TestJCE.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/TestJCE.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- TestJCE.java 2001/04/04 21:39:02 1.1
+++ TestJCE.java 2001/12/29 04:32:45 1.1.4.1
@@ -18,13 +18,13 @@
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
+import org.jboss.logging.TracePriority;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPServerInterface;
import org.jboss.security.srp.SRPServerInterface.SRPParameters;
import org.jboss.security.srp.SRPClientSession;
import org.jboss.security.srp.SRPServerSession;
-import org.jboss.security.srp.TracePriority;
/** Tests of the Java Cryptography framework
*/
1.1.4.2 +3 -3 jbosssx/src/main/org/jboss/test/TestProtocol.java
Index: TestProtocol.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/TestProtocol.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- TestProtocol.java 2001/11/09 10:31:37 1.1.4.1
+++ TestProtocol.java 2001/12/29 04:32:45 1.1.4.2
@@ -17,7 +17,7 @@
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
-import org.jboss.logging.log4j.TracePriority;
+import org.jboss.logging.TracePriority;
import org.jboss.security.Logger;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
@@ -29,11 +29,11 @@
/** Test of the SRP protocol msg exchange sequence.
@author [EMAIL PROTECTED]
-@version $Revision: 1.1.4.1 $
+@version $Revision: 1.1.4.2 $
*/
public class TestProtocol extends junit.framework.TestCase
{
- static Logger log = Logger.getInstance(TestProtocol.class);
+ static Logger log = Logger.getLogger(TestProtocol.class);
String username = "jduke";
String password = "theduke";
SRPServerInterface server;
1.2.2.1 +56 -56 jbosssx/src/main/org/jboss/test/TestSRPLogin.java
Index: TestSRPLogin.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/TestSRPLogin.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestSRPLogin.java 2001/04/12 02:53:57 1.2
+++ TestSRPLogin.java 2001/12/29 04:32:45 1.2.2.1
@@ -14,63 +14,63 @@
import org.jboss.security.auth.callback.UsernamePasswordHandler;
/** A test of the SRPLogin module
-
-@see org.jboss.security.srp.jaas.SRPLoginModule
-
-@author [EMAIL PROTECTED]
-@version $Revision: 1.2 $
-*/
+
+ @see org.jboss.security.srp.jaas.SRPLoginModule
+
+ @author [EMAIL PROTECTED]
+ @version $Revision: 1.2.2.1 $
+ */
public class TestSRPLogin extends junit.framework.TestCase
{
- public TestSRPLogin(String name)
- {
- super(name);
- }
-
- /** Create a SecurityPolicy from a xml policy file and install it as the
- JAAS Policy and Configuration implementations.
+ public TestSRPLogin(String name)
+ {
+ super(name);
+ }
+
+ /** Create a SecurityPolicy from a xml policy file and install it as the
+ JAAS Policy and Configuration implementations.
*/
- protected void setUp() throws Exception
- {
- // Create a subject security policy
- String policyName = "tst-policy.xml";
- URL policyURL = getClass().getClassLoader().getResource(policyName);
- if( policyURL == null )
- throw new IllegalStateException("Failed to find "+policyName+" in
classpath");
- SecurityPolicyParser policyStore = new SecurityPolicyParser(policyURL);
- SecurityPolicy policy = new SecurityPolicy(policyStore);
- policy.refresh();
- Policy.setPolicy(policy);
- Configuration.setConfiguration(policy.getLoginConfiguration());
- }
-
- public void testLogin()
- {
- CallbackHandler handler = new UsernamePasswordHandler("scott",
"stark".toCharArray());
- try
- {
- LoginContext lc = new LoginContext("srp-login", handler);
- lc.login();
- Subject subject = lc.getSubject();
- System.out.println("Subject="+subject);
- }
- catch(LoginException e)
- {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public static void main(String args[])
- {
- try
- {
- TestSRPLogin tst = new TestSRPLogin("main");
- tst.setUp();
- }
- catch(Exception e)
- {
- e.printStackTrace(System.out);
- }
- }
+ protected void setUp() throws Exception
+ {
+ // Create a subject security policy
+ String policyName = "tst-policy.xml";
+ URL policyURL = getClass().getClassLoader().getResource(policyName);
+ if( policyURL == null )
+ throw new IllegalStateException("Failed to find "+policyName+" in
classpath");
+ SecurityPolicyParser policyStore = new SecurityPolicyParser(policyURL);
+ SecurityPolicy policy = new SecurityPolicy(policyStore);
+ policy.refresh();
+ Policy.setPolicy(policy);
+ Configuration.setConfiguration(policy.getLoginConfiguration());
+ }
+
+ public void testLogin()
+ {
+ CallbackHandler handler = new UsernamePasswordHandler("scott",
"stark".toCharArray());
+ try
+ {
+ LoginContext lc = new LoginContext("srp-login", handler);
+ lc.login();
+ Subject subject = lc.getSubject();
+ System.out.println("Subject="+subject);
+ }
+ catch(LoginException e)
+ {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public static void main(String args[])
+ {
+ try
+ {
+ TestSRPLogin tst = new TestSRPLogin("main");
+ tst.setUp();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace(System.out);
+ }
+ }
}
No revision
No revision
1.1.2.1 +56 -0 jbosssx/src/main/org/jboss/test/Attic/UtilTest.java
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
