import javax.servlet.http.HttpSession;
import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.DatabaseConnection.Link;
import org.cacert.gigi.dbObjects.CACertificate;
+import org.cacert.gigi.dbObjects.CATS;
import org.cacert.gigi.dbObjects.CertificateProfile;
import org.cacert.gigi.dbObjects.DomainPingConfiguration;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.Form.CSRFException;
import org.cacert.gigi.output.template.Outputable;
import org.cacert.gigi.output.template.Template;
+import org.cacert.gigi.pages.AboutPage;
import org.cacert.gigi.pages.HandlesMixedRequest;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.LogoutPage;
});
putPage("/", new MainPage(), null);
putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
+ putPage("/about", new AboutPage(), "SomeCA.org");
putPage("/secure", new TestSecure(), null);
putPage(Verify.PATH, new Verify(), null);
baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
rootMenu = new MenuCollector();
- Menu languages = new Menu("Translations");
+ Menu languages = new Menu("Language");
for (Locale l : Language.getSupportedLocales()) {
languages.addItem(new SimpleMenuItem("?lang=" + l.toString(), l.getDisplayName(l)));
}
return;
}
// ensure those static initializers are finished
- CACertificate.getById(1);
- CertificateProfile.getById(1);
+ try (Link l = DatabaseConnection.newLink(false)) {
+ CACertificate.getById(1);
+ CertificateProfile.getById(1);
+ CATS.getID(CATS.ASSURER_CHALLANGE_NAME);
+ } catch (InterruptedException e) {
+ throw new Error(e);
+ }
MenuBuilder mb = new MenuBuilder();
rootMenu = mb.generateMenu();
@Override
protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ if ("/error".equals(req.getPathInfo()) || "/denied".equals(req.getPathInfo())) {
+ if (DatabaseConnection.hasInstance()) {
+ serviceWithConnection(req, resp);
+ return;
+ }
+ }
+ try (DatabaseConnection.Link l = DatabaseConnection.newLink( !req.getMethod().equals("POST"))) {
+ serviceWithConnection(req, resp);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ protected void serviceWithConnection(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
boolean isSecure = req.isSecure();
addXSSHeaders(resp, isSecure);
// Firefox only sends this, if it's a cross domain access; safari sends