From 08a84ca0be46125ffc0f98bb952f333786a00824 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 30 Apr 2008 19:20:18 +0000 Subject: [PATCH] SWS-341 --- .../SpringDigestPasswordValidationCallbackHandler.java | 3 ++- .../acegi/AcegiDigestPasswordValidationCallbackHandler.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java index 5f0764a0..7a7b026d 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java @@ -75,9 +75,10 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractWsPas protected void handleUsernameTokenPrincipal(UsernameTokenPrincipalCallback callback) throws IOException, UnsupportedCallbackException { + UserDetails user = loadUserDetails(callback.getPrincipal().getName()); WSUsernameTokenPrincipal principal = callback.getPrincipal(); UsernamePasswordAuthenticationToken authRequest = - new UsernamePasswordAuthenticationToken(principal, principal.getPassword()); + new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), user.getAuthorities()); if (logger.isDebugEnabled()) { logger.debug("Authentication success: " + authRequest.toString()); } diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java index fdd3ace2..c9b55be5 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java @@ -77,9 +77,10 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractWsPass protected void handleUsernameTokenPrincipal(UsernameTokenPrincipalCallback callback) throws IOException, UnsupportedCallbackException { + UserDetails user = loadUserDetails(callback.getPrincipal().getName()); WSUsernameTokenPrincipal principal = callback.getPrincipal(); UsernamePasswordAuthenticationToken authRequest = - new UsernamePasswordAuthenticationToken(principal, principal.getPassword()); + new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), user.getAuthorities()); if (logger.isDebugEnabled()) { logger.debug("Authentication success: " + authRequest.toString()); }