package org.cacert.gigi;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.Calendar;
import java.util.HashMap;
import org.cacert.gigi.output.Menu;
import org.cacert.gigi.output.MenuItem;
import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.Template;
-import org.cacert.gigi.output.Form.CSRFError;
+import org.cacert.gigi.output.Form.CSRFException;
+import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.MainPage;
import org.cacert.gigi.pages.Page;
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.error.PageNotFound;
import org.cacert.gigi.pages.main.RegisterPage;
import org.cacert.gigi.pages.wot.AssurePage;
import org.cacert.gigi.util.ServerConstants;
@Override
public void init() throws ServletException {
+ pages.put("/error", new PageNotFound());
pages.put("/login", new LoginPage("CACert - Login"));
pages.put("/", new MainPage("CACert - Home"));
pages.put("/secure", new TestSecure());
pages.put(RegisterPage.PATH, new RegisterPage());
pages.put(MailCertificateAdd.PATH, new MailCertificateAdd());
pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"));
- baseTemplate = new Template(new InputStreamReader(Gigi.class.getResourceAsStream("Gigi.templ")));
+ baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
m = new Menu("Certificates", "cert", new MenuItem(MailOverview.DEFAULT_PATH, "Emails"), new MenuItem("",
"Client Certificates"), new MenuItem("", "Domains"), new MenuItem("", "Server Certificates"));
super.init();
public void output(PrintWriter out, Language l, Map<String, Object> vars) {
try {
if (req.getMethod().equals("POST")) {
+ if (req.getQueryString() != null) {
+ return;
+ }
p.doPost(req, resp);
} else {
p.doGet(req, resp);
}
- } catch (IOException e) {
- e.printStackTrace();
- } catch (CSRFError err) {
+ } catch (CSRFException err) {
try {
resp.sendError(500, "CSRF invalid");
} catch (IOException e) {
e.printStackTrace();
}
+ } catch (IOException e) {
+ e.printStackTrace();
}
}