[jboss-svn-commits] JBL Code SVN: r22756 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product: rosetta/src/org/jboss/soa/esb/services/security/auth and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Sep 14 06:54:01 EDT 2008
Author: beve
Date: 2008-09-14 06:54:00 -0400 (Sun, 14 Sep 2008)
New Revision: 22756
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecuritySoapExtractor.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_basic/src/org/jboss/soa/esb/samples/quickstart/securitybasic/test/SendEsbMessage.java
Log:
fixed a typo of the following method name: AuthenticationReqeustImpl.bulid -> AuthenticationRequest.build().
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -400,9 +400,8 @@
{
try
{
- // try to un-seal the object. Will be successful if from this vm.
+ // try to decrypt the security context.
securityContext = (SecurityContext) PrivateCryptoUtil.INSTANCE.decrypt(bytes);
- // the security context was sealed from this jvm. Don't need to authenticate again.
authenticate = false;
}
catch(final SecurityServiceException e)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestImpl.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -2,17 +2,17 @@
* 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
@@ -33,18 +33,18 @@
* AuthenticationRequestImpl is indended to transport security related information
* needed to authenticate a caller.
* </p>
- *
+ *
* @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
*
*/
public class AuthenticationRequestImpl implements Serializable, AuthenticationRequest
{
private static final long serialVersionUID = 1L;
-
+
private Principal principal;
private Set<?> credentials;
private Map<String,?> properties;
-
+
/* (non-Javadoc)
* @see org.jboss.soa.esb.services.security.auth.AuthenticationRequest#getCredentials()
*/
@@ -68,15 +68,15 @@
{
return principal;
}
-
+
public static class Builder
{
private Principal principal;
private Set<Object> credentials = new HashSet<Object>();
private Map<String,Object> properties = new HashMap<String,Object>();
-
+
public Builder() {}
-
+
public Builder(final Principal principal, final Set<Object> credentials)
{
this.principal = principal;
@@ -85,36 +85,36 @@
this.credentials.addAll(credentials);
}
}
-
+
public Builder property( final String name, final Object value)
{
properties.put(name, value);
return this;
}
-
+
public Builder username( final String username )
{
principal = new User( username );
return this;
}
-
+
public Builder password( final char[] password )
{
credentials.add(password);
return this;
}
-
- public AuthenticationRequest bulid()
+
+ public AuthenticationRequest build()
{
return new AuthenticationRequestImpl(this);
}
}
-
+
private AuthenticationRequestImpl(final Builder builder)
{
principal = builder.principal;
credentials = builder.credentials;
properties = builder.properties;
}
-
+
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/HttpSecurityInfoExtractor.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -59,7 +59,7 @@
credentials.add( pwd.toCharArray() );
pwd = null;
decoded = null;
- return new AuthenticationRequestImpl.Builder(new User(username), credentials ).bulid();
+ return new AuthenticationRequestImpl.Builder(new User(username), credentials ).build();
}
if ( authType.equals("DIGEST"))
{
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/http/JbrHttpSecurityInfoExtractor.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -62,7 +62,7 @@
}
}
- authRequest = new AuthenticationRequestImpl.Builder( user, credentials ).bulid();
+ authRequest = new AuthenticationRequestImpl.Builder( user, credentials ).build();
}
return authRequest;
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractor.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -110,7 +110,7 @@
{
credentials.add(binaryToken.getKey());
}
- return new AuthenticationRequestImpl.Builder(user, credentials ).bulid();
+ return new AuthenticationRequestImpl.Builder(user, credentials ).build();
}
private void createSmooks(final String configFile)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecuritySoapExtractor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecuritySoapExtractor.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/WSSecuritySoapExtractor.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -134,7 +134,7 @@
}
}
// build the AuthenticationRequest.
- return new AuthenticationRequestImpl.Builder(user, credentials ).bulid();
+ return new AuthenticationRequestImpl.Builder(user, credentials ).build();
}
catch (final SOAPException e)
{
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -75,7 +75,7 @@
Set<Object> credentials = new HashSet<Object>();
credentials.add(password);
- AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(principal, credentials).bulid();
+ AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder(principal, credentials).build();
SecurityContext context = new SecurityContext(subject);
service.configure();
service.authenticate(configInfo, context, authRequest);
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/AuthenticationRequestUnitTest.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -40,7 +40,7 @@
public void contruct()
{
final Principal principal = new TestPrincipal("testUser");
- AuthenticationRequest request = new AuthenticationRequestImpl.Builder(principal, null ).bulid();
+ AuthenticationRequest request = new AuthenticationRequestImpl.Builder(principal, null ).build();
assertEquals( principal, request.getPrincipal());
}
@@ -49,7 +49,7 @@
{
final String username = "Donald";
final String password = "Duck123";
- AuthenticationRequest request = new AuthenticationRequestImpl.Builder().username(username).password(password.toCharArray()).bulid();
+ AuthenticationRequest request = new AuthenticationRequestImpl.Builder().username(username).password(password.toCharArray()).build();
assertEquals( username, request.getPrincipal().getName() );
assertTrue( request.getCredentials().size() == 1 );
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SendEsbMessage.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -61,7 +61,7 @@
Message esbMessage = MessageFactory.getInstance().getMessage();
// create an AuthenticationRequest
- AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder().username(args[3]).password(args[4].toCharArray()).bulid();
+ AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder().username(args[3]).password(args[4].toCharArray()).build();
// set the authentication request on the message
esbMessage.getProperties().setProperty(SecurityService.AUTH_REQUEST, PublicCryptoUtil.INSTANCE.encrypt((Serializable) authRequest));
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_basic/src/org/jboss/soa/esb/samples/quickstart/securitybasic/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_basic/src/org/jboss/soa/esb/samples/quickstart/securitybasic/test/SendEsbMessage.java 2008-09-14 10:50:12 UTC (rev 22755)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/security_basic/src/org/jboss/soa/esb/samples/quickstart/securitybasic/test/SendEsbMessage.java 2008-09-14 10:54:00 UTC (rev 22756)
@@ -60,7 +60,7 @@
Message esbMessage = MessageFactory.getInstance().getMessage();
// create an AuthenticationRequest
- AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder().username(args[3]).password(args[4].toCharArray()).bulid();
+ AuthenticationRequest authRequest = new AuthenticationRequestImpl.Builder().username(args[3]).password(args[4].toCharArray()).build();
// set the authentication request on the message
esbMessage.getProperties().setProperty(SecurityService.AUTH_REQUEST, PublicCryptoUtil.INSTANCE.encrypt((Serializable) authRequest));
More information about the jboss-svn-commits
mailing list