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;
+import java.util.Properties;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpSession;
import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.email.EmailProvider;
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.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 {
private String[] baseTemplate;
private HashMap<String, Page> pages = new HashMap<String, Page>();
+ 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"));
+ 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;
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("/");
- return;
- }
+ HttpSession hs = req.getSession();
if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) {
if (hs != null) {
hs.setAttribute(LOGGEDIN, null);
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());
+ 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;
+ }
+
+ String b0 = baseTemplate[0];
b0 = makeDynTempl(b0, p);
- resp.setContentType("text/html");
+ resp.setContentType("text/html; charset=utf-8");
resp.getWriter().print(b0);
- if (hs != null && hs.getAttribute(LOGGEDIN) != null) {
- resp.getWriter().println(
- "Hi " + ((User) hs.getAttribute(USER)).getFname());
+ if (req.getMethod().equals("POST")) {
+ p.doPost(req, resp);
+ } else {
+ p.doGet(req, resp);
}
- p.doGet(req, resp);
String b1 = baseTemplate[1];
b1 = makeDynTempl(b1, p);
resp.getWriter().print(b1);
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 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();
- }
- }
+
}
projects / gigi.git / blobdiff