[Yanel-commits] rev 22648 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

josias at wyona.com josias at wyona.com
Wed Feb 14 17:53:35 CET 2007


Author: josias
Date: 2007-02-14 17:53:33 +0100 (Wed, 14 Feb 2007)
New Revision: 22648

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
[minor] fixed indentation

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-14 16:50:52 UTC (rev 22647)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-14 16:53:33 UTC (rev 22648)
@@ -877,26 +877,26 @@
                 String password = up[1];
                 log.debug("username: " + username + ", password: " + password);
                 try {
-                if (realm.getIdentityManager().authenticate(username, password)) {
-                    authorized = realm.getPolicyManager().authorize(path, new Identity(username, null), new Role("view"));
-                    if(authorized) {
-                        return null;
+                    if (realm.getIdentityManager().authenticate(username, password)) {
+                        authorized = realm.getPolicyManager().authorize(path, new Identity(username, null), new Role("view"));
+                        if(authorized) {
+                            return null;
+                        } else {
+                            log.warn("HTTP BASIC Authorization failed for " + username + "!");
+                            response.setHeader("WWW-Authenticate", "BASIC realm=\"" + realm.getName() + "\"");
+                            response.sendError(response.SC_UNAUTHORIZED);
+                            PrintWriter writer = response.getWriter();
+                            writer.print("BASIC Authorization Failed!");
+                            return response;
+                        }
                     } else {
-                        log.warn("HTTP BASIC Authorization failed for " + username + "!");
+                        log.warn("HTTP BASIC Authentication failed for " + username + "!");
                         response.setHeader("WWW-Authenticate", "BASIC realm=\"" + realm.getName() + "\"");
                         response.sendError(response.SC_UNAUTHORIZED);
                         PrintWriter writer = response.getWriter();
-                        writer.print("BASIC Authorization Failed!");
+                        writer.print("BASIC Authentication Failed!");
                         return response;
                     }
-                } else {
-                    log.warn("HTTP BASIC Authentication failed for " + username + "!");
-                    response.setHeader("WWW-Authenticate", "BASIC realm=\"" + realm.getName() + "\"");
-                    response.sendError(response.SC_UNAUTHORIZED);
-                    PrintWriter writer = response.getWriter();
-                    writer.print("BASIC Authentication Failed!");
-                    return response;
-                }
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
                     throw new ServletException(e.getMessage(), e);




More information about the Yanel-commits mailing list