X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=e454819d7185348f8a37b9413c7cf5ed77d19394;hp=10f0c1c210dfd9cc2d977e0b4e21adaf65c057f4;hb=d0d2f3e785adb16514e532da67e0534ab484cc43;hpb=51490e8e21fc62bc51b646d8adb2ffc06cc9d861 diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 10f0c1c2..e454819d 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -29,6 +29,7 @@ import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; +import org.cacert.gigi.pages.Manager; import org.cacert.gigi.pages.Page; import org.cacert.gigi.pages.PolicyIndex; import org.cacert.gigi.pages.RootCertPage; @@ -78,10 +79,13 @@ public class Gigi extends HttpServlet { private KeyStore truststore; + private boolean testing; + public Gigi(Properties conf, KeyStore truststore) { if (instance != null) { throw new IllegalStateException("Multiple Gigi instances!"); } + testing = conf.getProperty("testing") != null; instance = this; DatabaseConnection.init(conf); this.truststore = truststore; @@ -112,6 +116,10 @@ public class Gigi extends HttpServlet { putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin"); putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Admin"); putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Admin"); + if (testing) { + putPage(Manager.PATH + "/*", Manager.getInstance(), "Admin"); + } + putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust"); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); rootMenu = new Menu("Main");