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

[michi at wyona.com]

Author: michi
Date: 2007-11-09 10:00:57 +0100 (Fri, 09 Nov 2007)
New Revision: 28667

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
get web authenticator from realm

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2007-11-09 09:00:32 UTC (rev 28666)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2007-11-09 09:00:57 UTC (rev 28667)
@@ -1416,20 +1416,17 @@
      * @return null when authentication successful, otherwise return response
      */
     public HttpServletResponse doAuthenticate(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-	org.wyona.yanel.servlet.security.WebAuthenticator wa = null; //map.getRealm(request.getServletPath()).getWebAuthenticator()
-        if (wa == null) {
-	    wa = new org.wyona.yanel.servlet.security.impl.DefaultWebAuthenticatorImpl();
+        try {
+	    org.wyona.yanel.core.api.security.WebAuthenticator wa = map.getRealm(request.getServletPath()).getWebAuthenticator();
+            if (wa == null) {
+	        wa = new org.wyona.yanel.servlet.security.impl.DefaultWebAuthenticatorImpl();
+            }
+            return wa.doAuthenticate(request, response, map, reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            response.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            return response;
         }
-        return wa.doAuthenticate(request, response, map, reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort);
-
-/*
-        TODO:
-	  - Refactor Realm init()
-	  - Create WebAuthenticator interface within servlet package
-          - <realm>
-	     <web-authenticator class=""><!-- custom config --></web-authenticator>
-            </realm>
-*/
     }
 
     /**