[jboss-svn-commits] JBL Code SVN: r21205 - in labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb: services/security and 1 other directory.

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

Author: beve
Date: 2008-07-24 02:16:37 -0400 (Thu, 24 Jul 2008)
New Revision: 21205

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/JaasSecurityContext.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
Log:
refactoring


Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-07-24 04:01:23 UTC (rev 21204)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-07-24 06:16:37 UTC (rev 21205)
@@ -357,21 +357,18 @@
 		
 		SecurityContext securityContext = new JaasSecurityContext(securityConf, subject);
 		
-		if (securityContext.requiresAuthentiation())
+		LOGGER.debug("Service requires Authentication: existing subject" + subject);
+		try
 		{
-			LOGGER.debug("Service requires Authentication: existing subject" + subject);
-    		try
-    		{
-    			SecurityServiceFactory.getSecurityService().authenticate(securityContext);
-    			message.getProperties().setProperty( "Subject", securityContext.getSubject());
-    			LOGGER.debug("Subject after authentication" + securityContext.getSubject());
-    		} 
-    		catch (final LoginException e)
-    		{
-    			LOGGER.error( "Authentication exception : ", e);
-    			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
-    			return false;
-    		}
+			SecurityServiceFactory.getSecurityService().authenticate(securityContext);
+			message.getProperties().setProperty( "Subject", securityContext.getSubject());
+			LOGGER.debug("Subject after authentication" + securityContext.getSubject());
+		} 
+		catch (final LoginException e)
+		{
+			LOGGER.error( "Authentication exception : ", e);
+			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
+			return false;
 		}
 		
 		PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() 

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/JaasSecurityContext.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/JaasSecurityContext.java	2008-07-24 04:01:23 UTC (rev 21204)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/JaasSecurityContext.java	2008-07-24 06:16:37 UTC (rev 21205)
@@ -25,7 +25,8 @@
 import javax.security.auth.Subject;
 
 /**
- * 
+ * JAAS Security context implementation 
+ * <p/>
  * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
  *
  */
@@ -61,14 +62,6 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.jboss.soa.esb.services.security.SecurityContext2#setConfigInfo(org.jboss.soa.esb.services.security.SecurityConfigInfo)
-	 */
-	public void setConfigInfo(SecurityConfigInfo configInfo)
-	{
-		this.configInfo = configInfo;
-	}
-
-	/* (non-Javadoc)
 	 * @see org.jboss.soa.esb.services.security.SecurityContext2#getSubject()
 	 */
 	public Subject getSubject()
@@ -82,14 +75,4 @@
 		return "SecurityContext [ configinfo=" + configInfo + ", subject=" + subject + "]";
 	}
 
-	public boolean requiresAuthentiation()
-	{
-		return configInfo.needsAuthentiation();
-	}
-
-	public boolean hasRunAs()
-	{
-		return configInfo.hasRunAs();
-	}
-
 }

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-07-24 04:01:23 UTC (rev 21204)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-07-24 06:16:37 UTC (rev 21205)
@@ -22,16 +22,14 @@
 
 import javax.security.auth.Subject;
 
+/**
+ * 
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ *
+ */
 public interface SecurityContext
 {
-	boolean requiresAuthentiation();
-	
-	boolean hasRunAs();
-	
 	SecurityConfigInfo getConfigInfo();
 
-	void setConfigInfo(SecurityConfigInfo configInfo);
-
 	Subject getSubject();
-
 }
\ No newline at end of file