diff gwt-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java @ 9497:d6d5ca6d4af0

Enabled logging of saml-group-name in log-ing logfile. Some cleanup/refaktoring.
author gernotbelger
date Thu, 27 Sep 2018 17:40:39 +0200
parents 5e38e2924c07
children ca19b7186294
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java	Mon Sep 17 19:07:57 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java	Thu Sep 27 17:40:39 2018 +0200
@@ -10,16 +10,16 @@
 
 import java.io.IOException;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-
 import org.dive4elements.river.client.server.auth.Authentication;
 import org.dive4elements.river.client.server.auth.AuthenticationException;
 import org.dive4elements.river.client.server.auth.AuthenticationFactory;
+import org.dive4elements.river.client.server.auth.User;
 import org.dive4elements.river.client.server.features.Features;
 
 public class LoginServlet extends AuthenticationServlet {
@@ -27,12 +27,10 @@
     private static Logger log = Logger.getLogger(LoginServlet.class);
 
     @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-    throws ServletException, IOException
-    {
-        String encoding = req.getCharacterEncoding();
-        String username = req.getParameter("username");
-        String password = req.getParameter("password");
+    protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+        final String encoding = req.getCharacterEncoding();
+        final String username = req.getParameter("username");
+        final String password = req.getParameter("password");
 
         log.debug("Processing post request");
 
@@ -43,33 +41,29 @@
         }
 
         try {
-            Authentication aresp = this.auth(username, password, encoding);
+            final Authentication aresp = this.auth(username, password, encoding);
             if (aresp == null || !aresp.isSuccess()) {
                 log.debug("Authentication not successful");
                 this.redirectFailure(resp, req.getContextPath());
                 return;
             }
-            log.info("Authentication successfull.");
-            this.performLogin(req, resp, aresp.getUser());
+
+            final User user = aresp.getUser();
+            final String userGroup = user.getUserGroup();
+
+            log.info(String.format("Authentication successfull: group = '%s'", userGroup));
+            this.performLogin(req, resp, user);
         }
-        catch(AuthenticationException e) {
+        catch (final AuthenticationException e) {
             log.error(e.getMessage());
             this.redirectFailure(resp, req.getContextPath(), e);
         }
     }
 
-    private Authentication auth(
-        String username,
-        String password,
-        String encoding
-    )
-        throws AuthenticationException, IOException
-    {
-        ServletContext sc = this.getServletContext();
-        Features features = (Features)sc.getAttribute(
-            Features.CONTEXT_ATTRIBUTE);
-        String auth = sc.getInitParameter("authentication");
-        return AuthenticationFactory.getInstance(auth).auth(username, password,
-                encoding, features, sc);
+    private Authentication auth(final String username, final String password, final String encoding) throws AuthenticationException, IOException {
+        final ServletContext sc = this.getServletContext();
+        final Features features = (Features) sc.getAttribute(Features.CONTEXT_ATTRIBUTE);
+        final String auth = sc.getInitParameter("authentication");
+        return AuthenticationFactory.getInstance(auth).auth(username, password, encoding, features, sc);
     }
-}
+}
\ No newline at end of file

http://dive4elements.wald.intevation.org