[jboss-svn-commits] JBL Code SVN: r34479 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src: test/java/org/jboss/labs/sbs/plugin/nukesauth/struts and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-08-03 08:40:01 -0400 (Tue, 03 Aug 2010)
New Revision: 34479

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountActionTest.java
Log:
Improved validation on username - based on regexp

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountAction.java	2010-08-03 11:13:16 UTC (rev 34478)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountAction.java	2010-08-03 12:40:01 UTC (rev 34479)
@@ -32,10 +32,16 @@
 public class CreateNewJBossUserAccountAction extends CreateNewUserAccountAction {
 
   /**
+   * Allowed chars in a username are word chars (a-z0-9_) and dash, and dot.
+   */
+  public static final String ALLOWED_CHARS_REGEXP = "[a-z0-9_.\\-]*";
+
+  /**
    * Add validation on @ character. User cannot put his e-mail.
    */
   @Override
   protected boolean usernameInvalid(String username) {
-    return super.usernameInvalid(username) || username.indexOf('@') != -1;
+    return super.usernameInvalid(username) || !username.matches(ALLOWED_CHARS_REGEXP);
   }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountActionTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountActionTest.java	2010-08-03 11:13:16 UTC (rev 34478)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/test/java/org/jboss/labs/sbs/plugin/nukesauth/struts/CreateNewJBossUserAccountActionTest.java	2010-08-03 12:40:01 UTC (rev 34479)
@@ -10,10 +10,17 @@
   @Test
   public void testUsernameInvalidString() {
     CreateNewJBossUserAccountAction action = new CreateNewJBossUserAccountAction();
+    assertFalse(action.usernameInvalid("admin"));
+    assertFalse(action.usernameInvalid("test123"));
+    assertFalse(action.usernameInvalid("test_123"));
+    assertFalse(action.usernameInvalid("test.123"));
+    assertFalse(action.usernameInvalid("test-123"));
+
     assertTrue(action.usernameInvalid("mail at mail.org"));
     assertTrue(action.usernameInvalid("@"));
     assertTrue(action.usernameInvalid("mail@"));
-    assertFalse(action.usernameInvalid("admin"));
+    assertTrue(action.usernameInvalid("krzy" + "\u017C" + "anek"));
+
   }
 
 }