Hi Vincent,

First, I must apologize for my post at 26 Feb 2004 19:53:34 +0900.
I should read the participating page before I do.

In article <[EMAIL PROTECTED]>,
Thu, 26 Feb 2004 14:41:52 +0100,
"Vincent Massol" <[EMAIL PROTECTED]> wrote: 
vmassol> I was trying to apply your patch but it's quite difficult. Do you think
vmassol> you could improve it in the following manner:
vmassol> 
vmassol> 1/ send a cvs diff against CVS HEAD (unified diff)
vmassol> 2/ apply Cactus coding conventions as defined in
vmassol> http://jakarta.apache.org/cactus/participating/coding_conventions.html
[snip]
vmassol> 3/ provide a diff for
vmassol> jakarta-cactus/documentation/docs/xdocs/changes.xml to include your
vmassol> changes.

I tried to do so, however, I cannot connect to the CVS server at this moment.
My network administrator is closing the route.

So, I applied changes against the source distributed as
jakarta-cactus-src-1.6dev20040225.
I hope the code FormAuthentication.java is same...

Appendings are:
- the patch against the FormAuthentication.java
- the full source code of the new FormAuthentication.java
- action elements to be inserted in documentation/docs/xdocs/changes.xml.

vmassol> If 2/ is not right then the build fails as it's part of the automated
vmassol> checks. The best way is for you to run "ant dist" in
vmassol> jakarta-cactus/framework to see if your changes do not fail the build.
vmassol> Then what is really nice is to run the full release (ant release) to
vmassol> verify that tests still pass, etc.

I confirmed "ant dist" in framework successfully finishes
with checkstyle-3.3.


Best Regards,
----
Kazuhito SUGURI
mailto:[EMAIL PROTECTED]
--- 
framework/src/java/share/org/apache/cactus/client/authentication/FormAuthentication.java.orig
       2004-02-14 13:06:14.000000000 +0900
+++ 
framework/src/java/share/org/apache/cactus/client/authentication/FormAuthentication.java
    2004-02-27 12:18:03.000000000 +0900
@@ -23,6 +23,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.apache.cactus.Cookie;
 import org.apache.cactus.WebRequest;
 import org.apache.cactus.client.connector.http.ConnectionHelper;
 import org.apache.cactus.client.connector.http.ConnectionHelperFactory;
@@ -42,6 +43,7 @@
  * cookie for the next request. The second time it is called, it simply
  * addes the session cookie for the next request.
  * 
+ * @author <a href="mailto:[EMAIL PROTECTED]">Kazuhito SUGURI</a>
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason Robertson</a>
  * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
  *
@@ -58,21 +60,32 @@
         LogFactory.getLog(FormAuthentication.class);
 
     /**
+     * The expected HTTP response code for the request to a restricted
+     * resource without authenticated principal.
+     */
+    private int expectedPreAuthResponse = HttpURLConnection.HTTP_MOVED_TEMP;
+
+    /**
+     * The expected HTTP response code when the authentication is succeeded.
+     */
+    private int expectedAuthResponse = HttpURLConnection.HTTP_MOVED_TEMP;
+
+    /**
      * The URL to use when attempting to log in, if for whatever reason 
      * the default URL is incorrect.
      */
     private URL securityCheckURL = null;
 
     /**
-     * We store the session cookie name because of case issues. We need
-     * to be able to send exactly the same one as was sent back by the
-     * server.     */
-    private String sessionIdCookieName = null;
+     * The cookie name of the session.
+     */
+    private String sessionCookieName = "JSESSIONID";
 
     /**
-     * We store the session id cookie so that this instance can
-     * be reused for another test.     */
-    private String sessionId = null;
+     * We store the session cookie.
+     */
+    private Cookie jsessionCookie = null;
+
 
     /**
      * [EMAIL PROTECTED] WebRequest} object that will be used to connect to the
@@ -112,15 +125,15 @@
         Configuration theConfiguration)
     {
         // Only authenticate the first time this instance is used.
-        if (this.sessionId == null)
+        if (this.jsessionCookie == null)
         {
            authenticate(theRequest, theConfiguration);
         }
 
         // Sets the session id cookie for the next request.
-        if (this.sessionId != null)
+        if (this.jsessionCookie != null)
         {
-            theRequest.addCookie(this.sessionIdCookieName, this.sessionId);
+            theRequest.addCookie(this.jsessionCookie);
         }
     }
 
@@ -180,104 +193,223 @@
         return securityCheckURL;
     }
 
+
     /**
-     * Authenticate the principal by calling the security URL.
-     * 
-     * @param theRequest the web request used to connect to the Redirector     * 
@param theConfiguration the Cactus configuration
-     */    
-    public void authenticate(WebRequest theRequest, 
-        Configuration theConfiguration)
+     * Get the cookie name of the session.
+     * @return the cookie name of the session
+     */
+    public String getSessionCookieName()
     {
-        //Note: This method needs refactoring. It is too complex.
-        
-        try
+        return this.sessionCookieName;
+    }
+
+    /**
+     * Set the cookie name of the session to theName.
+     * If theName is null, the change request will be ignored.
+     * The default is &quot;<code>JSESSIONID</code>&quot;.
+     * @param theName the cookie name of the session
+     */
+    public void setSessionCookieName(String theName)
+    {
+        if (theName == null)
         {
-            // Create a helper that will connect to a restricted resource.
+            return;
+        }
+        this.sessionCookieName = theName;
+    }
 
-            String resource = ((WebConfiguration) theConfiguration).
-                getRedirectorURL(theRequest);
-    
-            ConnectionHelper helper = 
-                ConnectionHelperFactory.getConnectionHelper(resource, 
-                theConfiguration);
+    /**
+     * Get the expected HTTP response code for a request to a restricted
+     * resource without authenticated principal.
+     * @return the expected HTTP response code value
+     */
+    public int getExpectedPreAuthResponse()
+    {
+        return this.expectedPreAuthResponse;
+    }
 
-            // Make the connection using a default web request.
-            HttpURLConnection connection = helper.connect(
-                new WebRequestImpl((WebConfiguration) theConfiguration), 
-                theConfiguration);
-
-            // Clean any existing session ID.
-            sessionId = null;
-            
-            // Check (possible multiple) cookies for a JSESSIONID.
-            int i = 1;
-            String key = connection.getHeaderFieldKey(i);
-            while (key != null)
+    /**
+     * Set the expected HTTP response code for a request to a restricted
+     * resource without authenticated principal.
+     * The default is HttpURLConnection.HTTP_MOVED_TEMP.
+     * @param theExpectedCode  the expected HTTP response code value
+     */
+    public void setExpectedPreAuthResponse(int theExpectedCode)
+    {
+        this.expectedPreAuthResponse = theExpectedCode;
+    }
+
+    /**
+     * Get the expected HTTP response code for an authentication request
+     * which should be succeeded.
+     * @return the expected HTTP response code
+     */
+    public int getExpectedAuthResponse()
+    {
+        return this.expectedAuthResponse;
+    }
+
+    /**
+     * Set the expected HTTP response code for an authentication request
+     * which should be succeeded.
+     * The default is HttpURLConnection.HTTP_MOVED_TEMP.
+     * @param theExpectedCode  the expected HTTP response code value
+     */
+    public void setExpectedAuthResponse(int theExpectedCode)
+    {
+        this.expectedAuthResponse = theExpectedCode;
+    }
+
+
+    /**
+     * Check if the actual response code is that of the expected.
+     * @param theExpected the expected response code
+     * @param theActual the actural response code
+     * @exception Exception the actual response code is not that of the expected
+     */
+    private void checkResponseCodeEquals(int theExpected, int theActual)
+        throws Exception
+    {
+        if (theActual != theExpected)
+        {
+            throw new Exception("Received a ["
+                                + theActual
+                                + "] response code"
+                                + " and was expecting a ["
+                                + theExpected + "]");
+        }
+    }
+
+
+    /**
+     * Get a cookie required to be set by set-cookie header field.
+     * @param theConnection a <code>HttpURLConnection</code>
+     * @param theTarget the target cookie name
+     * @return the <code>Cookie</code>
+     */
+    private Cookie getCookie(HttpURLConnection theConnection, String theTarget)
+    {
+        // Check (possible multiple) cookies for a target.
+        int i = 1;
+        String key = theConnection.getHeaderFieldKey(i);
+        while (key != null)
+        {
+            if (key.equalsIgnoreCase("set-cookie"))
             {
-                if (key.equalsIgnoreCase("set-cookie"))
+                // Cookie is in the form:
+                // "NAME=VALUE; expires=DATE; path=PATH;
+                //  domain=DOMAIN_NAME; secure"
+                // The only thing we care about is finding a cookie with
+                // the name "JSESSIONID" and caching the value.
+                String cookiestr = theConnection.getHeaderField(i);
+                String nameValue = cookiestr.substring(0,
+                                                       cookiestr.indexOf(";"));
+                int equalsChar = nameValue.indexOf("=");
+                String name = nameValue.substring(0, equalsChar);
+                String value = nameValue.substring(equalsChar + 1);
+                if (name.equalsIgnoreCase(theTarget))
                 {
-                    // Cookie is in the form:
-                    // "NAME=VALUE; expires=DATE; path=PATH;
-                    //  domain=DOMAIN_NAME; secure"
-                    // The only thing we care about is finding a cookie with 
-                    // the name "JSESSIONID" and caching the value.
-                    
-                    String cookiestr = connection.getHeaderField(i);
-                    String nameValue = cookiestr.substring(0, 
-                        cookiestr.indexOf(";"));
-                    int equalsChar = nameValue.indexOf("=");
-                    String name = nameValue.substring(0, equalsChar);
-
-                    if (name.equalsIgnoreCase("JSESSIONID"))
-                    {
-                        // We must set a cookie with the exact same name as the
-                        // one given to us, so to preserve any capitalization
-                        // issues, cache the exact cookie name.
-                        sessionIdCookieName = name;
-                        sessionId = nameValue.substring(equalsChar + 1);
-                        break;
-                    }
+                    return new Cookie(theConnection.getURL().getHost(),
+                                      name, value);
                 }
-                key = connection.getHeaderFieldKey(++i);
             }
+            key = theConnection.getHeaderFieldKey(++i);
+        }
+        return null;
+    }
+
+
+    /**
+     * Get login session cookie.
+     * This is the first step to start login session:
+     * <dl>
+     *   <dt> C-&gt;S: </dt>
+     *   <dd> try to connect to a restricted resource </dd>
+     *   <dt> S-&gt;C: </dt>
+     *   <dd> redirect or forward to the login page with set-cookie header </dd>
+     * </ol>
+     * @param theRequest a request to connect to a restricted resource
+     * @param theConfiguration a <code>Configuration</code> value
+     * @return the <code>Cookie</code>
+     */
+    private Cookie getSecureSessionIdCookie(WebRequest theRequest,
+                                            Configuration theConfiguration)
+    {
+        HttpURLConnection connection;
+        String resource = null;
+
+        try
+        {
+            // Create a helper that will connect to a restricted resource.
+            WebConfiguration webConfig = (WebConfiguration) theConfiguration;
+            resource = webConfig.getRedirectorURL(theRequest);
+            ConnectionHelper helper =
+                ConnectionHelperFactory.getConnectionHelper(resource,
+                                                            theConfiguration);
+            WebRequest request =
+                new WebRequestImpl((WebConfiguration) theConfiguration);
+
+            // Make the connection using a default web request.
+            connection = helper.connect(request, theConfiguration);
+            checkResponseCodeEquals(getExpectedPreAuthResponse(),
+                                    connection.getResponseCode());
+        }
+        catch (Throwable e)
+        {
+            throw new ChainedRuntimeException(
+                          "Failed to connect to the secured redirector: "
+                          + resource,
+                          e
+                      );
+        }
+
+        return getCookie(connection, getSessionCookieName());
+    }
+
 
+    /**
+     * Authenticate the principal by calling the security URL.
+     * 
+     * @param theRequest the web request used to connect to the Redirector
+     * @param theConfiguration the Cactus configuration
+     */
+    public void authenticate(WebRequest theRequest,
+                             Configuration theConfiguration)
+    {
+        this.jsessionCookie = getSecureSessionIdCookie(theRequest,
+                                                       theConfiguration);
+    
+        try
+        {
             // Create a helper that will connect to the security check URL.
-            helper = ConnectionHelperFactory.getConnectionHelper(
-                getSecurityCheckURL(theConfiguration).toString(), 
-                (WebConfiguration) theConfiguration);
-                
-            // Configure a web request with the JSESSIONID cookie, 
-            // the username and the password.          
-            WebRequest request = getSecurityRequest();
+            ConnectionHelper helper =
+                ConnectionHelperFactory.getConnectionHelper(
+                    getSecurityCheckURL(theConfiguration).toString(),
+                                        (WebConfiguration) theConfiguration);
 
-            // TODO: Change design so that we cannot get a ClassCastException
+            // Configure a web request with the JSESSIONID cookie,
+            // the username and the password.
+            WebRequest request = getSecurityRequest();
             ((WebRequestImpl) request).setConfiguration(theConfiguration);
+            request.addCookie(this.jsessionCookie);
+            request.addParameter("j_username",
+                                 getName(), WebRequest.POST_METHOD);
+            request.addParameter("j_password",
+                                 getPassword(), WebRequest.POST_METHOD);
 
-            request.addCookie(sessionIdCookieName, sessionId);
-            request.addParameter("j_username", getName(), 
-                WebRequest.POST_METHOD);
-            request.addParameter("j_password", getPassword(), 
-                WebRequest.POST_METHOD);
-            
             // Make the connection using the configured web request.
-            connection = helper.connect(request, theConfiguration);
-        
-            // If we get back a response code of 302, it means we were 
-            // redirected to the context root after successfully logging in.
-            // If we receive anything else, we didn't log in correctly.
-            if (connection.getResponseCode() != 302)
-            {
-                throw new ChainedRuntimeException("Unable to login, "
-                    + "probably due to bad username/password. Received a ["
-                    + connection.getResponseCode() + "] response code and "
-                    + "was expecting a [302]");
-            }
+            HttpURLConnection connection = helper.connect(request,
+                                                          theConfiguration);
+        checkResponseCodeEquals(getExpectedAuthResponse(),
+                                connection.getResponseCode());
         }
         catch (Throwable e)
         {
-            throw new ChainedRuntimeException("Failed to authenticate "
-                + "the principal", e);
+            this.jsessionCookie = null;
+            throw new ChainedRuntimeException(
+                          "Failed to authenticate the principal",
+                          e
+                      );
         }
     }
-    
 }
/* 
 * ========================================================================
 * 
 * Copyright 2001-2003 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *   http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * 
 * ========================================================================
 */
package org.apache.cactus.client.authentication;

import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;

import org.apache.cactus.Cookie;
import org.apache.cactus.WebRequest;
import org.apache.cactus.client.connector.http.ConnectionHelper;
import org.apache.cactus.client.connector.http.ConnectionHelperFactory;
import org.apache.cactus.configuration.Configuration;
import org.apache.cactus.configuration.WebConfiguration;
import org.apache.cactus.internal.WebRequestImpl;
import org.apache.cactus.util.ChainedRuntimeException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * Form-based authentication implementation. An instance of this class
 * can be reused across several tests as it caches the session cookie.
 * Thus the first time it is used to authenticate the user, it calls
 * the security URL (which is by default the context URL prepended by
 * "j_security_check"), caches the returned session cookie and adds the
 * cookie for the next request. The second time it is called, it simply
 * addes the session cookie for the next request.
 * 
 * @author <a href="mailto:[EMAIL PROTECTED]">Kazuhito SUGURI</a>
 * @author <a href="mailto:[EMAIL PROTECTED]">Jason Robertson</a>
 * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
 *
 * @since 1.5
 *
 * @version $Id: $
 */
public class FormAuthentication extends AbstractAuthentication
{
    /**
     * The logger.
     */
    private static final Log LOGGER = 
        LogFactory.getLog(FormAuthentication.class);

    /**
     * The expected HTTP response code for the request to a restricted
     * resource without authenticated principal.
     */
    private int expectedPreAuthResponse = HttpURLConnection.HTTP_MOVED_TEMP;

    /**
     * The expected HTTP response code when the authentication is succeeded.
     */
    private int expectedAuthResponse = HttpURLConnection.HTTP_MOVED_TEMP;

    /**
     * The URL to use when attempting to log in, if for whatever reason 
     * the default URL is incorrect.
     */
    private URL securityCheckURL = null;

    /**
     * The cookie name of the session.
     */
    private String sessionCookieName = "JSESSIONID";

    /**
     * We store the session cookie.
     */
    private Cookie jsessionCookie = null;


    /**
     * [EMAIL PROTECTED] WebRequest} object that will be used to connect to the
     * security URL. 
     */
    private WebRequest securityRequest = new WebRequestImpl();
      
    /**
     * @param theName user name of the Credential
     * @param thePassword user password of the Credential
     */
    public FormAuthentication(String theName, String thePassword)
    {
        super(theName, thePassword);
    }
    
    /**
     * @see AbstractAuthentication#validateName(String)
     */
    protected void validateName(String theName)
    {
        // Nothing to do here...
    }
    
    /**
     * @see AbstractAuthentication#validatePassword(String)
     */
    protected void validatePassword(String thePassword)
    {
        // Nothing to do here...
    }

    /**
     * @see AbstractAuthentication#configure(WebRequest, Configuration)
     */
    public void configure(WebRequest theRequest,
        Configuration theConfiguration)
    {
        // Only authenticate the first time this instance is used.
        if (this.jsessionCookie == null)
        {
           authenticate(theRequest, theConfiguration);
        }

        // Sets the session id cookie for the next request.
        if (this.jsessionCookie != null)
        {
            theRequest.addCookie(this.jsessionCookie);
        }
    }

    /**
     * @return the [EMAIL PROTECTED] WebRequest} that will be used to connect to the
     * security URL. It can be used to add additional HTTP parameters such
     * as proprietary ones required by some containers.
     */
    public WebRequest getSecurityRequest()
    {
        return this.securityRequest;
    }
    
    /**
     * This sets the URL to use when attempting to log in. This method is used
     * if for whatever reason the default URL is incorrect.
     *
     * @param theUrl A URL to use to attempt to login.
     */
    public void setSecurityCheckURL(URL theUrl)
    {
       this.securityCheckURL = theUrl;
    }
    
    /**
     * This returns the URL to use when attempting to log in. By default, it's
     * the context URL defined in the Cactus configuration with  
     * "/j_security_check" appended. 
     *
     * @param theConfiguration the Cactus configuration
     * @return the URL that is being used to attempt to login.
     */
    public URL getSecurityCheckURL(Configuration theConfiguration)
    {
        if (this.securityCheckURL == null)
        {
            // Configure default
            String stringUrl = 
                ((WebConfiguration) theConfiguration).getContextURL()
                + "/j_security_check";

            try
            {
                this.securityCheckURL = new URL(stringUrl);
            }
            catch (MalformedURLException e)
            {
                throw new ChainedRuntimeException(
                    "Unable to create default Security Check URL [" 
                    + stringUrl + "]");
            }
        }

        LOGGER.debug("Using security check URL [" + this.securityCheckURL
            + "]");

        return securityCheckURL;
    }


    /**
     * Get the cookie name of the session.
     * @return the cookie name of the session
     */
    public String getSessionCookieName()
    {
        return this.sessionCookieName;
    }

    /**
     * Set the cookie name of the session to theName.
     * If theName is null, the change request will be ignored.
     * The default is &quot;<code>JSESSIONID</code>&quot;.
     * @param theName the cookie name of the session
     */
    public void setSessionCookieName(String theName)
    {
        if (theName == null)
        {
            return;
        }
        this.sessionCookieName = theName;
    }

    /**
     * Get the expected HTTP response code for a request to a restricted
     * resource without authenticated principal.
     * @return the expected HTTP response code value
     */
    public int getExpectedPreAuthResponse()
    {
        return this.expectedPreAuthResponse;
    }

    /**
     * Set the expected HTTP response code for a request to a restricted
     * resource without authenticated principal.
     * The default is HttpURLConnection.HTTP_MOVED_TEMP.
     * @param theExpectedCode  the expected HTTP response code value
     */
    public void setExpectedPreAuthResponse(int theExpectedCode)
    {
        this.expectedPreAuthResponse = theExpectedCode;
    }

    /**
     * Get the expected HTTP response code for an authentication request
     * which should be succeeded.
     * @return the expected HTTP response code
     */
    public int getExpectedAuthResponse()
    {
        return this.expectedAuthResponse;
    }

    /**
     * Set the expected HTTP response code for an authentication request
     * which should be succeeded.
     * The default is HttpURLConnection.HTTP_MOVED_TEMP.
     * @param theExpectedCode  the expected HTTP response code value
     */
    public void setExpectedAuthResponse(int theExpectedCode)
    {
        this.expectedAuthResponse = theExpectedCode;
    }


    /**
     * Check if the actual response code is that of the expected.
     * @param theExpected the expected response code
     * @param theActual the actural response code
     * @exception Exception the actual response code is not that of the expected
     */
    private void checkResponseCodeEquals(int theExpected, int theActual)
        throws Exception
    {
        if (theActual != theExpected)
        {
            throw new Exception("Received a ["
                                + theActual
                                + "] response code"
                                + " and was expecting a ["
                                + theExpected + "]");
        }
    }


    /**
     * Get a cookie required to be set by set-cookie header field.
     * @param theConnection a <code>HttpURLConnection</code>
     * @param theTarget the target cookie name
     * @return the <code>Cookie</code>
     */
    private Cookie getCookie(HttpURLConnection theConnection, String theTarget)
    {
        // Check (possible multiple) cookies for a target.
        int i = 1;
        String key = theConnection.getHeaderFieldKey(i);
        while (key != null)
        {
            if (key.equalsIgnoreCase("set-cookie"))
            {
                // Cookie is in the form:
                // "NAME=VALUE; expires=DATE; path=PATH;
                //  domain=DOMAIN_NAME; secure"
                // The only thing we care about is finding a cookie with
                // the name "JSESSIONID" and caching the value.
                String cookiestr = theConnection.getHeaderField(i);
                String nameValue = cookiestr.substring(0,
                                                       cookiestr.indexOf(";"));
                int equalsChar = nameValue.indexOf("=");
                String name = nameValue.substring(0, equalsChar);
                String value = nameValue.substring(equalsChar + 1);
                if (name.equalsIgnoreCase(theTarget))
                {
                    return new Cookie(theConnection.getURL().getHost(),
                                      name, value);
                }
            }
            key = theConnection.getHeaderFieldKey(++i);
        }
        return null;
    }


    /**
     * Get login session cookie.
     * This is the first step to start login session:
     * <dl>
     *   <dt> C-&gt;S: </dt>
     *   <dd> try to connect to a restricted resource </dd>
     *   <dt> S-&gt;C: </dt>
     *   <dd> redirect or forward to the login page with set-cookie header </dd>
     * </ol>
     * @param theRequest a request to connect to a restricted resource
     * @param theConfiguration a <code>Configuration</code> value
     * @return the <code>Cookie</code>
     */
    private Cookie getSecureSessionIdCookie(WebRequest theRequest,
                                            Configuration theConfiguration)
    {
        HttpURLConnection connection;
        String resource = null;

        try
        {
            // Create a helper that will connect to a restricted resource.
            WebConfiguration webConfig = (WebConfiguration) theConfiguration;
            resource = webConfig.getRedirectorURL(theRequest);
            ConnectionHelper helper =
                ConnectionHelperFactory.getConnectionHelper(resource,
                                                            theConfiguration);
            WebRequest request =
                new WebRequestImpl((WebConfiguration) theConfiguration);

            // Make the connection using a default web request.
            connection = helper.connect(request, theConfiguration);
            checkResponseCodeEquals(getExpectedPreAuthResponse(),
                                    connection.getResponseCode());
        }
        catch (Throwable e)
        {
            throw new ChainedRuntimeException(
                          "Failed to connect to the secured redirector: "
                          + resource,
                          e
                      );
        }

        return getCookie(connection, getSessionCookieName());
    }


    /**
     * Authenticate the principal by calling the security URL.
     * 
     * @param theRequest the web request used to connect to the Redirector
     * @param theConfiguration the Cactus configuration
     */
    public void authenticate(WebRequest theRequest,
                             Configuration theConfiguration)
    {
        this.jsessionCookie = getSecureSessionIdCookie(theRequest,
                                                       theConfiguration);
    
        try
        {
            // Create a helper that will connect to the security check URL.
            ConnectionHelper helper =
                ConnectionHelperFactory.getConnectionHelper(
                    getSecurityCheckURL(theConfiguration).toString(),
                                        (WebConfiguration) theConfiguration);

            // Configure a web request with the JSESSIONID cookie,
            // the username and the password.
            WebRequest request = getSecurityRequest();
            ((WebRequestImpl) request).setConfiguration(theConfiguration);
            request.addCookie(this.jsessionCookie);
            request.addParameter("j_username",
                                 getName(), WebRequest.POST_METHOD);
            request.addParameter("j_password",
                                 getPassword(), WebRequest.POST_METHOD);

            // Make the connection using the configured web request.
            HttpURLConnection connection = helper.connect(request,
                                                          theConfiguration);
        checkResponseCodeEquals(getExpectedAuthResponse(),
                                connection.getResponseCode());
        }
        catch (Throwable e)
        {
            this.jsessionCookie = null;
            throw new ChainedRuntimeException(
                          "Failed to authenticate the principal",
                          e
                      );
        }
    }
}
        <action dev="VMA" type="add" due-to="Kazuhito SUGURI" due-to-email="[EMAIL 
PROTECTED]">
          Added new properies and associated accessors for
          the FormAuthentication. Properties are sessionCookieName,
          expectedPreAuthResponse and expectedAuthResponse.
        </action>
        <action dev="VMA" type="fix" fixes-bug="17933" due-to="Kazuhito SUGURI" 
due-to-email="[EMAIL PROTECTED]">
          Change to use WebRequest#addCookie(Cookie) instead of
          WebRequest#addCookie(String, String).
          To do so, get hostname from a HttpURLConnection instance of the first
          connection, which should contains set-cookie header field
          in its response, then pass the hostname to the first argument
          of Cookie(String, String, String) constructor.
        </action>

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to