Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rejected commit: Default

Browse Source
This commit is contained in:
Arjen Poutsma
2007-05-20 11:04:39 +00:00
parent 8a496b4ab8
commit 16b096e396
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java
View File

@@ -17,7 +17,6 @@
package org.springframework.ws.soap.security.xwss.callback.acegi;
import java.io.IOException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -30,7 +29,7 @@ import org.acegisecurity.providers.dao.cache.NullUserCache;
import org.acegisecurity.userdetails.UserDetails;
import org.acegisecurity.userdetails.UserDetailsService;
import org.acegisecurity.userdetails.UsernameNotFoundException;
import org.springframework.dao.DataAccessException;
import org.springframework.util.Assert;
import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandler;
import org.springframework.ws.soap.security.xwss.callback.DefaultTimestampValidator;
@@ -57,16 +56,12 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallba
private UserDetailsService userDetailsService;
/**
* Sets the users cache. Not required, but can benefit performance.
*/
/** Sets the users cache. Not required, but can benefit performance. */
public void setUserCache(UserCache userCache) {
this.userCache = userCache;
}
/**
* Sets the Acegi user details service. Required.
*/
/** Sets the Acegi user details service. Required. */
public void setUserDetailsService(UserDetailsService userDetailsService) {
this.userDetailsService = userDetailsService;
}
@@ -83,7 +78,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallba
*/
protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException {
if (callback instanceof PasswordValidationCallback) {
PasswordValidationCallback passwordCallback = ((PasswordValidationCallback) callback);
PasswordValidationCallback passwordCallback = (PasswordValidationCallback) callback;
if (passwordCallback.getRequest() instanceof PasswordValidationCallback.DigestPasswordRequest) {
PasswordValidationCallback.DigestPasswordRequest request =
(PasswordValidationCallback.DigestPasswordRequest) passwordCallback.getRequest();
@@ -105,7 +100,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallba
throw new UnsupportedCallbackException(callback);
}
private UserDetails loadUserDetails(String username) {
private UserDetails loadUserDetails(String username) throws DataAccessException {
UserDetails user = userCache.getUserFromCache(username);
if (user == null) {