[jboss-cvs] JBossAS SVN: r86532 - in projects/security/security-jboss-sx/trunk/jbosssx/src: test/java/org/jboss/test and 1 other directory.

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

Author: mmoyses
Date: 2009-03-31 09:24:58 -0400 (Tue, 31 Mar 2009)
New Revision: 86532

Added:
   projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/SimplePrincipalEqualsTestCase.java
Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SimplePrincipal.java
Log:
SECURITY-404: system property is required to change equals behavior

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SimplePrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SimplePrincipal.java	2009-03-31 13:00:28 UTC (rev 86531)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SimplePrincipal.java	2009-03-31 13:24:58 UTC (rev 86532)
@@ -22,7 +22,9 @@
 package org.jboss.security;
 
 import java.io.Serializable;
+import java.security.AccessController;
 import java.security.Principal;
+import java.security.PrivilegedAction;
 
 /**
  * A simple String based implementation of Principal. Typically a SimplePrincipal is created given a userID which is
@@ -53,8 +55,14 @@
    {
       if (!(another instanceof Principal))
          return false;
-      if ("true".equals(System.getProperty(OVERRIDE_EQUALS_BEHAVIOR, "false")))
+      if ("true".equals(AccessController.doPrivileged(new PrivilegedAction()
       {
+         public Object run()
+         {
+            return System.getProperty(OVERRIDE_EQUALS_BEHAVIOR, "false");
+         }
+      })))
+      {
          if (!(another instanceof SimplePrincipal))
             return false;
       }

Added: projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/SimplePrincipalEqualsTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/SimplePrincipalEqualsTestCase.java	                        (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/SimplePrincipalEqualsTestCase.java	2009-03-31 13:24:58 UTC (rev 86532)
@@ -0,0 +1,104 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test;
+
+import java.security.Principal;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.jboss.security.SimplePrincipal;
+
+/** 
+ * Tests of the org.jboss.security.SimplePrincipal.equals method
+ * 
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 68749 $
+ */
+public class SimplePrincipalEqualsTestCase extends TestCase
+{
+
+   private static SimplePrincipal simplePrincipal = new SimplePrincipal("test");
+
+   private static CustomPrincipal customPrincipal = new CustomPrincipal("test");
+
+   private static String OVERRIDE_EQUALS_BEHAVIOR = "org.jboss.security.simpleprincipal.equals.override";
+
+   public SimplePrincipalEqualsTestCase(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * Test the normal behavior (compares only Principal.getName)
+    * 
+    * @throws Exception
+    */
+   public void testNormalBehavior() throws Exception
+   {
+      System.setProperty(OVERRIDE_EQUALS_BEHAVIOR, "false");
+      assertTrue("Principals should be equal", simplePrincipal.equals(customPrincipal));
+   }
+
+   /**
+    * Test using the system property to override the normal behavior
+    * (compares only instances of SimplePrincipals)
+    * 
+    * @throws Exception
+    */
+   public void testBehaviorOverridden() throws Exception
+   {
+      System.setProperty(OVERRIDE_EQUALS_BEHAVIOR, "true");
+      assertFalse("Principals should not be equal", simplePrincipal.equals(customPrincipal));
+   }
+
+   public static void main(java.lang.String[] args)
+   {
+      System.setErr(System.out);
+      TestSuite suite = new TestSuite(SimplePrincipalEqualsTestCase.class);
+      junit.textui.TestRunner.run(suite);
+   }
+
+   private static class CustomPrincipal implements Principal
+   {
+
+      private String name;
+
+      public CustomPrincipal(String name)
+      {
+         this.name = name;
+      }
+
+      public String getName()
+      {
+         return name;
+      }
+
+      public boolean equals(Object obj)
+      {
+         if (!(obj instanceof CustomPrincipal))
+            return false;
+         CustomPrincipal another = (CustomPrincipal) obj;
+         return (name == null ? another.getName() == null : name.equals(another.getName()));
+      }
+   }
+}