X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=29ed65c4a829b3ed275327303eb6dfec9ab4600f;hb=d0b9305527ebb160decee391df1d189988b09655;hp=7144ea270870821dcf5c566ea496898ecbfe035c;hpb=6184c4270663900df7989ed83a46717389c1a9ac;p=gigi.git

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 7144ea27..29ed65c4 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -6,6 +6,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.security.cert.X509Certificate;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.HashMap;
 
@@ -15,12 +18,16 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.PasswordHash;
 import org.eclipse.jetty.util.log.Log;
 
 public class Gigi extends HttpServlet {
+	public static final String LOGGEDIN = "loggedin";
+	public static final String USER = "user";
 	private static final long serialVersionUID = -6386785421902852904L;
 	private String[] baseTemplate;
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
@@ -51,7 +58,7 @@ public class Gigi extends HttpServlet {
 		X509Certificate[] cert = (X509Certificate[]) req
 				.getAttribute("javax.servlet.request.X509Certificate");
 		HttpSession hs = req.getSession(false);
-		if (hs == null || !((Boolean) hs.getAttribute("loggedin"))) {
+		if (hs == null || !((Boolean) hs.getAttribute(LOGGEDIN))) {
 			if (cert != null) {
 				tryAuthWithCertificate(req, cert[0]);
 				hs = req.getSession(false);
@@ -70,7 +77,7 @@ public class Gigi extends HttpServlet {
 		}
 		if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) {
 			if (hs != null) {
-				hs.setAttribute("loggedin", false);
+				hs.setAttribute(LOGGEDIN, false);
 				hs.invalidate();
 			}
 			resp.sendRedirect("/");
@@ -85,15 +92,13 @@ public class Gigi extends HttpServlet {
 		}
 		if (pages.containsKey(req.getPathInfo())) {
 			String b0 = baseTemplate[0];
-			int year = Calendar.getInstance().get(Calendar.YEAR);
 			Page p = pages.get(req.getPathInfo());
-			b0 = b0.replaceAll("\\$title\\$", p.getTitle());
-			b0 = b0.replaceAll("\\$year\\$", year + "");
+			b0 = makeDynTempl(b0, p);
+			resp.setContentType("text/html");
 			resp.getWriter().print(b0);
 			p.doGet(req, resp);
 			String b1 = baseTemplate[1];
-			b1 = b1.replaceAll("\\$title\\$", p.getTitle());
-			b1 = b1.replaceAll("\\$year\\$", year + "");
+			b1 = makeDynTempl(b1, p);
 			resp.getWriter().print(b1);
 		} else {
 			resp.sendError(404, "Page not found.");
@@ -101,18 +106,36 @@ public class Gigi extends HttpServlet {
 
 	}
 
+	private String makeDynTempl(String in, Page p) {
+		int year = Calendar.getInstance().get(Calendar.YEAR);
+		in = in.replaceAll("\\$title\\$", p.getTitle());
+		in = in.replaceAll("\\$year\\$", year + "");
+		return in;
+	}
 	private void authWithUnpw(HttpServletRequest req) {
 		String un = req.getParameter("username");
 		String pw = req.getParameter("password");
-		// TODO dummy password check if (un.equals(pw)) {
-		HttpSession hs = req.getSession();
-		hs.setAttribute("loggedin", true);
+		try {
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+					"SELECT `password`, `id` FROM `users` WHERE `email`=?");
+			ps.setString(1, un);
+			ResultSet rs = ps.executeQuery();
+			if (rs.next()) {
+				if (PasswordHash.verifyHash(pw, rs.getString(1))) {
+					HttpSession hs = req.getSession();
+					hs.setAttribute(LOGGEDIN, true);
+					hs.setAttribute(USER, new User(rs.getInt(2)));
+				}
+			}
+			rs.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 	}
-
 	private void tryAuthWithCertificate(HttpServletRequest req,
 			X509Certificate x509Certificate) {
 		// TODO ckeck if certificate is valid
 		HttpSession hs = req.getSession();
-		hs.setAttribute("loggedin", true);
+		hs.setAttribute(LOGGEDIN, true);
 	}
 }