X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=0420eb7f197cbd589eccd3abce9e30ad99e09eea;hb=ea6ee43a84f9a1f055d97ff0de8196569154e4d0;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..0420eb7f 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -5,7 +5,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.security.cert.X509Certificate;
 import java.util.Calendar;
 import java.util.HashMap;
 
@@ -18,9 +17,15 @@ import javax.servlet.http.HttpSession;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.TestSecure;
+import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.MyDetails;
+import org.cacert.gigi.pages.main.RegisterPage;
 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>();
@@ -29,10 +34,13 @@ public class Gigi extends HttpServlet {
 	public void init() throws ServletException {
 		pages.put("/login", new LoginPage("CACert - Login"));
 		pages.put("/", new MainPage("CACert - Home"));
+		pages.put("/secure", new TestSecure());
+		pages.put(MailCertificates.PATH, new MailCertificates());
+		pages.put(MyDetails.PATH, new MyDetails());
+		pages.put(RegisterPage.PATH, new RegisterPage());
 		String templ = "";
-		try {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(
-					new FileInputStream(new File("templates/base.html"))));
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+				new FileInputStream(new File("templates/base.html"))))) {
 			String tmp;
 			while ((tmp = reader.readLine()) != null) {
 				templ += tmp;
@@ -44,75 +52,48 @@ public class Gigi extends HttpServlet {
 		super.init();
 
 	}
-
 	@Override
 	protected void service(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
-		X509Certificate[] cert = (X509Certificate[]) req
-				.getAttribute("javax.servlet.request.X509Certificate");
-		HttpSession hs = req.getSession(false);
-		if (hs == null || !((Boolean) hs.getAttribute("loggedin"))) {
-			if (cert != null) {
-				tryAuthWithCertificate(req, cert[0]);
-				hs = req.getSession(false);
-			}
-		}
-		if (hs != null && ((Boolean) hs.getAttribute("loggedin"))
-				&& req.getPathInfo().equals("/login")) {
-			resp.sendRedirect("/");
-			return;
-		}
-		if (req.getMethod().equals("POST") && req.getPathInfo() != null
-				&& req.getPathInfo().equals("/login")) {
-			authWithUnpw(req);
-			resp.sendRedirect("/");
-			return;
-		}
+		HttpSession hs = req.getSession();
 		if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) {
 			if (hs != null) {
-				hs.setAttribute("loggedin", false);
+				hs.setAttribute(LOGGEDIN, null);
 				hs.invalidate();
 			}
 			resp.sendRedirect("/");
 			return;
 		}
 
-		if ((hs == null || !((Boolean) hs.getAttribute("loggedin")))
-				&& !"/login".equals(req.getPathInfo())) {
-			System.out.println(req.getPathInfo());
-			resp.sendRedirect("/login");
-			return;
-		}
 		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 + "");
+			if (p.needsLogin() && hs.getAttribute("loggedin") == null) {
+				resp.sendRedirect("/login");
+				return;
+			}
+
+			String b0 = baseTemplate[0];
+			b0 = makeDynTempl(b0, p);
+			resp.setContentType("text/html; charset=utf-8");
 			resp.getWriter().print(b0);
-			p.doGet(req, resp);
+			if (req.getMethod().equals("POST")) {
+				p.doPost(req, resp);
+			} else {
+				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.");
 		}
 
 	}
-
-	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);
+	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 tryAuthWithCertificate(HttpServletRequest req,
-			X509Certificate x509Certificate) {
-		// TODO ckeck if certificate is valid
-		HttpSession hs = req.getSession();
-		hs.setAttribute("loggedin", true);
-	}
 }