Author: mposolda Date: 2011-11-23 17:25:44 -0500 (Wed, 23 Nov 2011) New Revision: 8124 Removed: components/wsrp/trunk/ws-security/jboss5/src/main/java/org/wsrp/wss/credentials/ Modified: components/wsrp/trunk/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java Log: Reverting previous commit Modified: components/wsrp/trunk/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java =================================================================== --- components/wsrp/trunk/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java 2011-11-23 22:14:59 UTC (rev 8123) +++ components/wsrp/trunk/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java 2011-11-23 22:25:44 UTC (rev 8124) @@ -36,7 +36,6 @@ import org.jboss.ws.core.CommonMessageContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.wsrp.wss.credentials.CredentialsAccessor; /** * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> @@ -46,13 +45,6 @@ { private static Logger log = LoggerFactory.getLogger(WSSecurityCredentialHandler.class); - private CredentialsAccessor credentialsAccessor; - - public WSSecurityCredentialHandler(CredentialsAccessor credentialsAccessor) - { - this.credentialsAccessor = credentialsAccessor; - } - public void close(MessageContext arg0) { //Nothing to do for now @@ -84,16 +76,24 @@ CommonMessageContext ctx = (CommonMessageContext) soapMessageContext; - Credentials credentials = credentialsAccessor.getCredentials(); - - if (credentials != null) + HttpServletRequest request = ServletAccess.getRequest(); + if (request != null && request.getSession() != null) { - ctx.put(BindingProvider.USERNAME_PROPERTY, credentials.getUsername()); - ctx.put(BindingProvider.PASSWORD_PROPERTY, credentials.getPassword()); + Credentials credentials = (Credentials)request.getSession().getAttribute(Credentials.CREDENTIALS); + if (credentials != null) + { + ctx.put(BindingProvider.USERNAME_PROPERTY, credentials.getUsername()); + ctx.put(BindingProvider.PASSWORD_PROPERTY, credentials.getPassword()); + } + else + { + log.debug("Could not find credentials to put in WS-Security header"); + return true; + } } else { - log.debug("Could not find credentials to put in WS-Security header"); + log.debug("Could not get current HttpServletRequest, cannot login."); } } catch (Exception e)