Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: Apache Wiki <wikidiffs@apache.org>
To: Apache Wiki <wikidiffs@apache.org>
Date: Sat, 08 Feb 2014 19:19:10 -0000
Message-ID: <20140208191910.23641.25353@eos.apache.org>
Subject: 
 =?utf-8?q?=5BTomcat_Wiki=5D_Update_of_=22SSLWithFORMFallback7=22_by_GaryB?=
 =?utf-8?q?riggs?=
Auto-Submitted: auto-generated

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for ch=
ange notification.

The "SSLWithFORMFallback7" page has been changed by GaryBriggs:
https://wiki.apache.org/tomcat/SSLWithFORMFallback7

Comment:
Adding an SSLWithFORMFallback alternative that works with Tomcat7

New page:
This is another SSLWithFORMFallback class, this time for Tomcat 7. This is =
heavily reappropriated from the Tomcat 6 version by Vegar Neshaug

Gary

{{{
import java.io.IOException;
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Container;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.authenticator.AuthenticatorBase;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.FormAuthenticator;
import org.apache.catalina.authenticator.SSLAuthenticator;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.coyote.ActionCode;

/** Mostly borrowed from: http://wiki.apache.org/tomcat/SSLWithFORMFallback6
 *
 * @author Vegar Neshaug, minor edits for Tomcat7 by Gary Briggs
 */
public class SSLWithFORMFallback7 extends AuthenticatorBase {
    FormAuthenticator formAuthenticator =3D new FormAuthenticator();
    SSLAuthenticator sslAuthenticator =3D new SSLAuthenticator();

    @Override
    public boolean authenticate(Request rqst, javax.servlet.http.HttpServle=
tResponse resp, LoginConfig lc) throws IOException {
        // Have we already authenticated someone?)
        Principal principal =3D rqst.getUserPrincipal();
        //String ssoId =3D (String) request.getNote(Constants.REQ_SSOID_NOT=
E);
        if (principal !=3D null) {
            // Associate the session with any existing SSO session in order
            // to get coordinated session invalidation at logout
            String ssoId =3D (String) rqst.getNote(Constants.REQ_SSOID_NOTE=
);
            if (ssoId !=3D null) {
                associate(ssoId, rqst.getSessionInternal(true));
            }
            return (true);
        }

        // Get certificates from the request
        boolean certAuth =3D true;
        X509Certificate certs[] =3D (X509Certificate[]) rqst.getAttribute(G=
lobals.CERTIFICATES_ATTR);
        if ((certs =3D=3D null) || (certs.length < 1)) {
            rqst.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE, =
null);
            certs =3D (X509Certificate[]) rqst.getAttribute(Globals.CERTIFI=
CATES_ATTR);
        }
        if ((certs =3D=3D null) || (certs.length < 1)) {
            // No certificates
            certAuth =3D false;
        }

        // Delegate authentication request
        boolean retval;
        if (certAuth) {
            retval =3D sslAuthenticator.authenticate(rqst, resp, lc);
        } else {
            retval =3D formAuthenticator.authenticate(rqst, resp, lc);
        }
        System.out.println("Retval: " + retval + ", certAuth: " + certAuth);
        return retval;
    }
    =

    private String infoStr =3D null;
    @Override
    public String getInfo() {
        if(null =3D=3D infoStr) {
            infoStr =3D this.getClass().getName();
        }
        return infoStr;
    }

    @Override
    protected String getAuthMethod() {
        return HttpServletRequest.CLIENT_CERT_AUTH;
//        return HttpServletRequest.FORM_AUTH;
    }
    =

    @Override
    public void setContainer(Container container) {
        try {
            super.setContainer(container);
            sslAuthenticator.setContainer(container);
            formAuthenticator.setContainer(container);
            =

            /* At time of writing, it appears .setContainer is the only
               thing necessary ahead of time to call .start() */
            formAuthenticator.start();
            sslAuthenticator.start();
        } catch (LifecycleException ex) {
            Logger.getLogger(SSLWithFORMFallback7.class.getName()).log(Leve=
l.SEVERE, null, ex);
        }
    }

}

}}}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org