[jbossws-commits] JBossWS SVN: r12946 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.

[jbossws-commits at lists.jboss.org]

Author: sergeyb
Date: 2010-09-09 12:51:24 -0400 (Thu, 09 Sep 2010)
New Revision: 12946

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
Log:
[JBWS-2210] Removing the workaround code to do with handling digest passwords from SubjectCreatingInterceptor

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java	2010-09-09 16:27:59 UTC (rev 12945)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java	2010-09-09 16:51:24 UTC (rev 12946)
@@ -28,14 +28,10 @@
 import java.util.Map;
 
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.cxf.common.security.SimplePrincipal;
 import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.handler.RequestData;
 import org.jboss.logging.Logger;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
@@ -71,8 +67,6 @@
 
    private boolean decodeNonce = true;
 
-   private boolean supportDigestPasswords;
-
    public SubjectCreatingInterceptor()
    {
       this(Collections.<String, Object> emptyMap());
@@ -96,39 +90,7 @@
 
    }
 
-   // TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
-   // has a bug to do with handling digests; RequestData assumes PasswordDigest by default
    @Override
-   public void setSupportDigestPasswords(boolean support)
-   {
-      this.supportDigestPasswords = support;
-      super.setSupportDigestPasswords(support);
-   }
-
-   // TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
-   // has a bug to do with handling digests; RequestData assumes PasswordDigest by default 
-   @Override
-   protected CallbackHandler getCallback(RequestData reqData, int doAction) throws WSSecurityException
-   {
-
-      if (supportDigestPasswords)
-      {
-         return new CallbackHandler()
-         {
-            @Override
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-            {
-               // dummy handler
-            }
-         };
-      }
-      else
-      {
-         return super.getCallback(reqData, doAction);
-      }
-   }
-
-   @Override
    public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
    {
       if (isDigest)