X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=b6aa90ebd5386b26f3742d41e7090a10829a297b;hp=c52b98f0a7e5fc83df19e554d34f5f84aff95fc7;hb=c340139d6370117bbf7fb5172ca9dd8ac6e40828;hpb=35565f877af05e8783c1ac28171b8e2cab0d02b5 diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index c52b98f0..b6aa90eb 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -1,16 +1,12 @@ package org.cacert.gigi; -import java.io.BufferedReader; -import java.io.File; -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.io.PrintWriter; import java.util.Calendar; import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -19,62 +15,61 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.email.EmailProvider; +import org.cacert.gigi.output.Outputable; +import org.cacert.gigi.output.Template; 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; +import org.cacert.gigi.pages.TestSecure; +import org.cacert.gigi.pages.Verify; +import org.cacert.gigi.pages.account.MailAdd; +import org.cacert.gigi.pages.account.MailCertificates; +import org.cacert.gigi.pages.account.MailOverview; +import org.cacert.gigi.pages.account.MyDetails; +import org.cacert.gigi.pages.main.RegisterPage; +import org.cacert.gigi.pages.wot.AssurePage; +import org.cacert.gigi.util.ServerConstants; 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 Template baseTemplate; private HashMap pages = new HashMap(); + public Gigi(Properties conf) { + EmailProvider.init(conf); + DatabaseConnection.init(conf); + } @Override public void init() throws ServletException { pages.put("/login", new LoginPage("CACert - Login")); pages.put("/", new MainPage("CACert - Home")); - String templ = ""; - try { - BufferedReader reader = new BufferedReader(new InputStreamReader( - new FileInputStream(new File("templates/base.html")))); - String tmp; - while ((tmp = reader.readLine()) != null) { - templ += tmp; - } - baseTemplate = templ.split("\\$content\\$"); - } catch (Exception e) { - Log.getLogger(Gigi.class).warn("Error loading template!", e); - } + pages.put("/secure", new TestSecure()); + pages.put(Verify.PATH, new Verify()); + pages.put(AssurePage.PATH + "/*", new AssurePage()); + pages.put(MailCertificates.PATH, new MailCertificates()); + pages.put(MyDetails.PATH, new MyDetails()); + pages.put(RegisterPage.PATH, new RegisterPage()); + pages.put(MailOverview.DEFAULT_PATH, new MailOverview( + "My email addresses")); + pages.put(MailAdd.DEFAULT_PATH, new MailAdd("Add new email")); + baseTemplate = new Template(new InputStreamReader( + Gigi.class.getResourceAsStream("Gigi.templ"))); 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 || hs.getAttribute(LOGGEDIN) == null) { - 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("/"); + protected void service(final HttpServletRequest req, + final HttpServletResponse resp) throws ServletException, + IOException { + addXSSHeaders(resp); + if (req.getHeader("Origin") != null) { + resp.getWriter().println("No cross domain access allowed."); return; } + HttpSession hs = req.getSession(); if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) { if (hs != null) { hs.setAttribute(LOGGEDIN, null); @@ -84,77 +79,80 @@ public class Gigi extends HttpServlet { 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]; - Page p = pages.get(req.getPathInfo()); - b0 = makeDynTempl(b0, p); - resp.setContentType("text/html"); - resp.getWriter().print(b0); - if (hs != null && hs.getAttribute(LOGGEDIN) != null) { - resp.getWriter().println( - "Hi " + ((User) hs.getAttribute(USER)).getFname()); + final Page p = getPage(req.getPathInfo()); + if (p != null) { + + if (p.needsLogin() && hs.getAttribute("loggedin") == null) { + String request = req.getPathInfo(); + request = request.split("\\?")[0]; + hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request); + resp.sendRedirect("/login"); + return; + } + if (p.beforeTemplate(req, resp)) { + return; } - p.doGet(req, resp); - String b1 = baseTemplate[1]; - b1 = makeDynTempl(b1, p); - resp.getWriter().print(b1); + HashMap vars = new HashMap(); + + resp.setContentType("text/html; charset=utf-8"); + Outputable content = new Outputable() { + + @Override + public void output(PrintWriter out, Language l, + Map vars) { + try { + if (req.getMethod().equals("POST")) { + p.doPost(req, resp); + } else { + p.doGet(req, resp); + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + }; + vars.put("title", p.getTitle()); + vars.put("static", ServerConstants.getStaticHostNamePort()); + vars.put("year", Calendar.getInstance().get(Calendar.YEAR)); + vars.put("content", content); + baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars); } else { resp.sendError(404, "Page not found."); } } - 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"); - 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 Page getPage(String pathInfo) { + if (pathInfo.endsWith("/") && !pathInfo.equals("/")) { + pathInfo = pathInfo.substring(0, pathInfo.length() - 1); } - } - private void tryAuthWithCertificate(HttpServletRequest req, - X509Certificate x509Certificate) { - String serial = x509Certificate.getSerialNumber().toString(16) - .toUpperCase(); - try { - PreparedStatement ps = DatabaseConnection - .getInstance() - .prepare( - "SELECT `memid` FROM `emailcerts` WHERE `serial`=? AND `disablelogin`='0' AND `revoked` = " - + "'0000-00-00 00:00:00'"); - ps.setString(1, serial); - ResultSet rs = ps.executeQuery(); - if (rs.next()) { - HttpSession hs = req.getSession(); - hs.setAttribute(LOGGEDIN, true); - hs.setAttribute(USER, new User(rs.getInt(1))); - } - rs.close(); - } catch (SQLException e) { - e.printStackTrace(); + Page page = pages.get(pathInfo); + if (page != null) { + return page; } + page = pages.get(pathInfo + "/*"); + if (page != null) { + return page; + } + int idx = pathInfo.lastIndexOf('/'); + pathInfo = pathInfo.substring(0, idx); + + page = pages.get(pathInfo + "/*"); + if (page != null) { + return page; + } + return null; + + } + + public static void addXSSHeaders(HttpServletResponse hsr) { + hsr.addHeader("Access-Control-Allow-Origin", + "http://cacert.org https://localhost"); + hsr.addHeader("Access-Control-Max-Age", "60"); + hsr.addHeader("Content-Security-Policy", "default-src 'self' https://" + + ServerConstants.getStaticHostNamePort() + + ";frame-ancestors 'none'"); + // ;report-uri https://felix.dogcraft.de/report.php + } }