[Yanel-commits] rev 30578 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl

[michi at wyona.com]

Author: michi
Date: 2008-01-22 08:49:17 +0100 (Tue, 22 Jan 2008)
New Revision: 30578

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
Log:
openid signature implementation finished

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2008-01-22 07:11:59 UTC (rev 30577)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java	2008-01-22 07:49:17 UTC (rev 30578)
@@ -66,6 +66,7 @@
             // HTML Form based authentication
             String loginUsername = request.getParameter("yanel.login.username");
             String openID = request.getParameter("yanel.login.openid");
+            String openIDSignature = request.getParameter("openid.sig");
             if(loginUsername != null) {
                 HttpSession session = request.getSession(true);
                 try {
@@ -94,8 +95,6 @@
                     return response;
                 }
             } else if (openID != null) {
-                log.warn("OpenID implementation not finished yet: [" + openID + "]");
-
                 // Append http scheme if missing
                 if (!openID.startsWith("http://")) {
                      openID = "http://" + openID;
@@ -106,10 +105,12 @@
                 String redirectUrlString = OpenIdFilter.joid().getAuthUrl(openID, returnToUrlString, returnToUrlString);
                 log.debug("OpenID Provider URL: " + redirectUrlString);
                 response.sendRedirect(redirectUrlString);
-                if (true) return response;
-
-                getXHTMLAuthenticationForm(request, response, realm, "Login failed because OpenID implementation is not finished yet!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
                 return response;
+            } else if (openIDSignature != null) {
+                log.warn("OpenID signature implementation not finished yet: [" + openIDSignature + "]");
+                // TODO: src/org/verisign/joid/consumer/JoidConsumer.java
+                getXHTMLAuthenticationForm(request, response, realm, "Login failed because OpenID signature implementation is not finished yet!", reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
+                return response;
             } else {
                 if (log.isDebugEnabled()) log.debug("No form based authentication request.");
             }