[jboss-svn-commits] JBL Code SVN: r21122 - 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
jboss-svn-commits at lists.jboss.org
Fri Jul 18 11:10:05 EDT 2008
Author: beve
Date: 2008-07-18 11:10:05 -0400 (Fri, 18 Jul 2008)
New Revision: 21122
Added:
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
Modified:
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.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/SecurityService.java
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceImpl.java
Log:
some refactoring.
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-07-18 15:01:52 UTC (rev 21121)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2008-07-18 15:10:05 UTC (rev 21122)
@@ -55,6 +55,7 @@
import org.jboss.soa.esb.services.security.JaasSecurityContext;
import org.jboss.soa.esb.services.security.SecurityConfigInfo;
import org.jboss.soa.esb.services.security.SecurityConfigUtil;
+import org.jboss.soa.esb.services.security.SecurityContext;
import org.jboss.soa.esb.services.security.SecurityServiceFactory;
import org.jboss.soa.esb.util.Util;
@@ -546,7 +547,7 @@
class TransactionalRunner implements Runnable
{
- private JaasSecurityContext securityContext;
+ private SecurityContext securityContext;
public TransactionalRunner (PickUpOnlyCourier courier, Message pipelineMessage, Object txHandle)
{
@@ -555,7 +556,7 @@
_txHandle = txHandle;
}
- public TransactionalRunner (PickUpOnlyCourier courier, Message pipelineMessage, Object txHandle, JaasSecurityContext context)
+ public TransactionalRunner (PickUpOnlyCourier courier, Message pipelineMessage, Object txHandle, SecurityContext context)
{
this(courier, pipelineMessage, txHandle);
this.securityContext = context;
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-18 15:01:52 UTC (rev 21121)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/JaasSecurityContext.java 2008-07-18 15:10:05 UTC (rev 21122)
@@ -20,6 +20,8 @@
*/
package org.jboss.soa.esb.services.security;
+import java.io.Serializable;
+
import javax.security.auth.Subject;
/**
@@ -27,17 +29,16 @@
* @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
*
*/
-public class JaasSecurityContext
+public class JaasSecurityContext implements SecurityContext, Serializable
{
+ private static final long serialVersionUID = 1L;
+
private Subject subject;
private SecurityConfigInfo configInfo;
- public JaasSecurityContext( final Subject subject )
+ public JaasSecurityContext(final Subject subject)
{
- if ( subject == null )
- this.subject = new Subject();
- else
- this.subject = subject;
+ this.subject = subject == null ? this.subject = new Subject():subject;
}
public JaasSecurityContext( final SecurityConfigInfo configInfo )
@@ -45,32 +46,40 @@
this.configInfo = configInfo;
}
- public JaasSecurityContext(SecurityConfigInfo configInfo, Subject subject)
+ public JaasSecurityContext(final SecurityConfigInfo configInfo, final Subject subject)
{
this(subject);
this.configInfo = configInfo;
}
+ /* (non-Javadoc)
+ * @see org.jboss.soa.esb.services.security.SecurityContext2#getConfigInfo()
+ */
public SecurityConfigInfo getConfigInfo()
{
return configInfo;
}
+ /* (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()
{
return subject;
}
+ @Override
public String toString()
{
return "SecurityContext [ configinfo=" + configInfo + ", subject=" + subject + "]";
}
-
-
}
Added: 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 (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java 2008-07-18 15:10:05 UTC (rev 21122)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors 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.soa.esb.services.security;
+
+import javax.security.auth.Subject;
+
+public interface SecurityContext
+{
+ SecurityConfigInfo getConfigInfo();
+
+ void setConfigInfo(SecurityConfigInfo configInfo);
+
+ Subject getSubject();
+
+}
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java 2008-07-18 15:01:52 UTC (rev 21121)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityService.java 2008-07-18 15:10:05 UTC (rev 21122)
@@ -35,5 +35,5 @@
{
void addPolicy(final URL policyUrl) throws ConfigurationException;
- void authenticate(final JaasSecurityContext securityContext) throws LoginException;
+ void authenticate(final SecurityContext securityContext) throws LoginException;
}
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceImpl.java 2008-07-18 15:01:52 UTC (rev 21121)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceImpl.java 2008-07-18 15:10:05 UTC (rev 21122)
@@ -41,7 +41,14 @@
private Logger log = Logger.getLogger(SecurityServiceImpl.class);
- public void authenticate( final JaasSecurityContext context) throws LoginException
+ /**
+ * Authenticates a Subject using the information contained in the passed in
+ * Security context
+ *
+ * @param context the security context to be used.
+ * @throws LoginException if the authentication fails
+ */
+ public void authenticate( final SecurityContext context) throws LoginException
{
log.info( context );
System.setProperty("java.security.auth.login.config", context.getConfigInfo().getPolicyConfig().toExternalForm() );
More information about the jboss-svn-commits
mailing list