[jboss-cvs] JBossAS SVN: r64784 - in projects/security/security-jboss-sx/trunk/src: tests/org/jboss/test and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2007-08-22 13:50:49 -0400 (Wed, 22 Aug 2007)
New Revision: 64784

Added:
   projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/securityassociation/
   projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java
Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityAssociation.java
   projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/AbstractJBossSXTest.java
Log:
SECURITY-75: client side SecurityAssociation linking with SecurityContext

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityAssociation.java	2007-08-22 17:17:23 UTC (rev 64783)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityAssociation.java	2007-08-22 17:50:49 UTC (rev 64784)
@@ -337,6 +337,12 @@
       if (trace)
          log.trace("setPrincipal, sc="+sc);
       SecurityContext securityContext = SecurityContextAssociation.getSecurityContext();
+      //Clients code that may have set directly (Legacy)
+      if(!server && securityContext == null)
+      {
+         securityContext = SecurityContextFactory.createSecurityContext("CLIENT_SIDE");
+         SecurityContextAssociation.setSecurityContext(securityContext);
+      }
       if(securityContext != null)
       {
          if(trace)
@@ -344,8 +350,7 @@
          Object cred = securityContext.getUtil().getCredential();
          Subject subj = securityContext.getUtil().getSubject();
          securityContext.getUtil().createSubjectInfo(principal,cred, subj);
-      }
-      
+      } 
    } 
 
    /**
@@ -387,6 +392,13 @@
       if (trace)
          log.trace("setCredential, sc="+sc);
       SecurityContext securityContext = SecurityContextAssociation.getSecurityContext();
+      //Clients code that may have set directly (Legacy)
+      if(!server && securityContext == null)
+      {
+         securityContext = SecurityContextFactory.createSecurityContext("CLIENT_SIDE");
+         SecurityContextAssociation.setSecurityContext(securityContext);
+      }
+      
       if(securityContext != null)
       {
          if(trace)
@@ -748,6 +760,15 @@
          return ra;
       }
    }
+   
+   /**
+    * Indicate whether we are server side
+    * @return flag set by a {@link #setServer()} call
+    */
+   public static boolean isServer()
+   {
+      return server;
+   }
 
    /**
     * Set the server mode of operation. When the server property has been set to

Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/AbstractJBossSXTest.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/AbstractJBossSXTest.java	2007-08-22 17:17:23 UTC (rev 64783)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/AbstractJBossSXTest.java	2007-08-22 17:50:49 UTC (rev 64784)
@@ -21,6 +21,9 @@
   */
 package org.jboss.test;
 
+import org.jboss.security.SecurityContext;
+import org.jboss.security.plugins.SecurityContextAssociation;
+
 //$Id$
 
 /**
@@ -47,4 +50,14 @@
       super.setUp();
       configureLogging();
    }
+   
+   public SecurityContext getSecurityContext()
+   {
+      return SecurityContextAssociation.getSecurityContext();
+   }
+   
+   public void setSecurityContext(SecurityContext sc)
+   {
+      SecurityContextAssociation.setSecurityContext(sc);
+   }
 }

Added: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java	                        (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/securityassociation/LegacySecurityAssociationTestCase.java	2007-08-22 17:50:49 UTC (rev 64784)
@@ -0,0 +1,69 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2007, 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.securityassociation;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.test.AbstractJBossSXTest;
+
+//$Id$
+
+/**
+ *  Legacy SecurityAssociation deeper integration test case
+ *  @author Anil.Saldhana at redhat.com
+ *  @since  Aug 22, 2007 
+ *  @version $Revision$
+ */
+public class LegacySecurityAssociationTestCase extends AbstractJBossSXTest
+{ 
+   public LegacySecurityAssociationTestCase(String name)
+   {
+      super(name); 
+   } 
+   
+   public void testClientSideSecurityAssociation()
+   {
+      assertFalse("Client Side", SecurityAssociation.isServer());
+      checkSA(); 
+   }
+   
+   public void testServerSideSecurityAssociation()
+   {
+      assertFalse("Client Side", SecurityAssociation.isServer());
+      SecurityAssociation.setServer();
+      assertTrue("Server Side", SecurityAssociation.isServer());
+      checkSA();
+   }
+
+   private void checkSA()
+   {
+      SecurityAssociation.setPrincipal(new SimplePrincipal("Anil"));
+      SecurityAssociation.setCredential("p".toCharArray());
+      
+      //Check the security context
+      SecurityContext sc = getSecurityContext();
+      assertEquals("Principal=Anil","Anil", sc.getUtil().getUserPrincipal().getName());
+      Object cred = sc.getUtil().getCredential();
+      assertEquals("Cred=p","p", new String((char[])cred));
+   }
+}