/* Copyright 2004, 2005 Acegi Technology Pty Limited
 *
 * 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 net.sf.acegisecurity.ui;

import java.io.Serializable;

import javax.servlet.http.HttpServletRequest;


/**
 * A holder of selected HTTP details related to a web authentication request.
 *
 * @author Ben Alex
 * @version $Id$
 */
public class WebAuthenticationDetails implements Serializable {
    private String remoteAddress;
    private String sessionId;

    /**
     * Constructor.
     *
     * <p>
     * NB: This constructor will cause a <code>HttpSession</code> to be created
     * (this is considered reasonable as all Acegi Security authentication
     * requests rely on <code>HttpSession</code> to store the
     * <code>Authentication</code> between requests
     * </p>
     *
     * @param request that the authentication request was received from
     */
    public WebAuthenticationDetails(HttpServletRequest request) {
        this.remoteAddress = request.getRemoteAddr();
        this.sessionId = request.getSession(true).getId();
        doPopulateAdditionalInformation(request);
    }

    public WebAuthenticationDetails(HttpServletRequest request,
        boolean forceSessionCreation) {
        this.remoteAddress = request.getRemoteAddr();
        this.sessionId = request.getSession(forceSessionCreation).getId();
        doPopulateAdditionalInformation(request);
    }

    protected WebAuthenticationDetails() {
        throw new IllegalArgumentException("Cannot use default constructor");
    }

    /**
     * Indicates the TCP/IP address the authentication request was received
     * from.
     *
     * @return the address
     */
    public String getRemoteAddress() {
        return remoteAddress;
    }

    /**
     * Indicates the <code>HttpSession</code> id the authentication request was
     * received from.
     *
     * @return the session ID
     */
    public String getSessionId() {
        return sessionId;
    }

    public String toString() {
        StringBuffer sb = new StringBuffer();
        sb.append(super.toString() + ": ");
        sb.append("RemoteIpAddress: " + this.getRemoteAddress() + "; ");
        sb.append("SessionId: " + this.getSessionId());

        return sb.toString();
    }

    /**
     * Provided so that subclasses can populate additional information.
     *
     * @param request that the authentication request was received from
     */
    protected void doPopulateAdditionalInformation(HttpServletRequest request) {
    }
}

@@ -718,16 +718,55 @@
 equest;%0A
+import javax.servlet.http.HttpSession;%0A
 %0A%0A/**%0A *
@@ -1826,38 +1826,43 @@
 ();%0A        
-this.
+HttpSession 
 session
-Id
  = request.g
@@ -1892,25 +1892,85 @@
 reation)
-.getId();
+;%0A        this.sessionId = session != null ? session.getId() : null;%0A
 %0A       

Fix NPE. Thanks to Tom Dunstan.