Fix redirection after successfull login.

[gigi.git] / src / org / cacert / gigi / pages / LoginPage.java

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 134a0898c1748f7dbfab96a82512d1f67ffa283c..7febf2e5d5da3ff0b68ec0d05f3b0beb70e0d0c0 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -18,6 +18,8 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.util.PasswordHash;
 
 public class LoginPage extends Page {
+       public static final String LOGIN_RETURNPATH = "login-returnpath";
+
        public LoginPage(String title) {
                super(title);
        }
@@ -25,8 +27,18 @@ public class LoginPage extends Page {
        @Override
        public void doGet(HttpServletRequest req, HttpServletResponse resp)
                        throws IOException {
-               HttpSession hs = req.getSession();
-               if (hs.getAttribute("loggedin") == null) {
+               resp.getWriter()
+                               .println(
+                                               "<form method='POST' action='/login'>"
+                                                               + "<input type='text' name='username'>"
+                                                               + "<input type='password' name='password'> <input type='submit' value='login'></form>");
+       }
+
+       @Override
+       public boolean beforeTemplate(HttpServletRequest req,
+                       HttpServletResponse resp) throws IOException {
+               String redir = (String) req.getSession().getAttribute(LOGIN_RETURNPATH);
+               if (req.getSession().getAttribute("loggedin") == null) {
                        X509Certificate[] cert = (X509Certificate[]) req
                                        .getAttribute("javax.servlet.request.X509Certificate");
                        if (cert != null && cert[0] != null) {
@@ -37,16 +49,19 @@ public class LoginPage extends Page {
                        }
                }
 
-               if (hs.getAttribute("loggedin") != null) { // Redir from login
-                       resp.sendRedirect("/");
-                       return;
+               if (req.getSession().getAttribute("loggedin") != null) {
+                       String s = redir;
+                       if (s != null) {
+                               if (!s.startsWith("/")) {
+                                       s = "/" + s;
+                               }
+                               resp.sendRedirect(s);
+                       } else {
+                               resp.sendRedirect("/");
+                       }
+                       return true;
                }
-
-               resp.getWriter()
-                               .println(
-                                               "<form method='POST' action='/login'>"
-                                                               + "<input type='text' name='username'>"
-                                                               + "<input type='password' name='password'> <input type='submit' value='login'></form>");
+               return false;
        }
        @Override
        public boolean needsLogin() {
@@ -56,12 +71,15 @@ public class LoginPage extends Page {
                String un = req.getParameter("username");
                String pw = req.getParameter("password");
                try {
-                       PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-                                       "SELECT `password`, `id` FROM `users` WHERE `email`=?");
+                       PreparedStatement ps = DatabaseConnection
+                                       .getInstance()
+                                       .prepare(
+                                                       "SELECT `password`, `id` FROM `users` WHERE `email`=? AND locked='0' AND verified='1'");
                        ps.setString(1, un);
                        ResultSet rs = ps.executeQuery();
                        if (rs.next()) {
                                if (PasswordHash.verifyHash(pw, rs.getString(1))) {
+                                       req.getSession().invalidate();
                                        HttpSession hs = req.getSession();
                                        hs.setAttribute(LOGGEDIN, true);
                                        hs.setAttribute(USER, new User(rs.getInt(2)));
@@ -72,6 +90,9 @@ public class LoginPage extends Page {
                        e.printStackTrace();
                }
        }
+       public static User getUser(HttpServletRequest req) {
+               return (User) req.getSession().getAttribute(USER);
+       }
        private void tryAuthWithCertificate(HttpServletRequest req,
                        X509Certificate x509Certificate) {
                String serial = x509Certificate.getSerialNumber().toString(16)
@@ -85,6 +106,7 @@ public class LoginPage extends Page {
                        ps.setString(1, serial);
                        ResultSet rs = ps.executeQuery();
                        if (rs.next()) {
+                               req.getSession().invalidate();
                                HttpSession hs = req.getSession();
                                hs.setAttribute(LOGGEDIN, true);
                                hs.setAttribute(USER, new User(rs.getInt(1)));