From 923f09449b5bf1d4684216910988812ab7a7a163 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 1 Aug 2014 18:13:06 +0200 Subject: [PATCH] Move mail certificates -> certificates. --- src/org/cacert/gigi/Gigi.java | 8 ++++---- src/org/cacert/gigi/output/CertificateTable.java | 4 ++-- ...MailCertificateAdd.java => CertificateAdd.java} | 14 +++++++------- ...tificateForm.java => CertificateIssueForm.java} | 8 ++++---- ...ficateForm.templ => CertificateIssueForm.templ} | 0 .../{MailCertificates.java => Certificates.java} | 10 +++++----- tests/org/cacert/gigi/testUtils/ManagedTest.java | 3 ++- 7 files changed, 24 insertions(+), 23 deletions(-) rename src/org/cacert/gigi/pages/account/{MailCertificateAdd.java => CertificateAdd.java} (67%) rename src/org/cacert/gigi/pages/account/{IssueCertificateForm.java => CertificateIssueForm.java} (95%) rename src/org/cacert/gigi/pages/account/{IssueCertificateForm.templ => CertificateIssueForm.templ} (100%) rename src/org/cacert/gigi/pages/account/{MailCertificates.java => Certificates.java} (93%) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 54e1ebfe..f7a82d66 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -27,8 +27,8 @@ import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; import org.cacert.gigi.pages.account.ChangePasswordPage; import org.cacert.gigi.pages.account.DomainOverview; -import org.cacert.gigi.pages.account.MailCertificateAdd; -import org.cacert.gigi.pages.account.MailCertificates; +import org.cacert.gigi.pages.account.CertificateAdd; +import org.cacert.gigi.pages.account.Certificates; import org.cacert.gigi.pages.account.MailOverview; import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.error.PageNotFound; @@ -63,11 +63,11 @@ public class Gigi extends HttpServlet { 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(Certificates.PATH + "/*", new Certificates()); pages.put(MyDetails.PATH, new MyDetails()); pages.put(ChangePasswordPage.PATH, new ChangePasswordPage()); pages.put(RegisterPage.PATH, new RegisterPage()); - pages.put(MailCertificateAdd.PATH, new MailCertificateAdd()); + pages.put(CertificateAdd.PATH, new CertificateAdd()); pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses")); pages.put(DomainOverview.PATH, new DomainOverview("Domains")); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java index 1b478f09..d64fb257 100644 --- a/src/org/cacert/gigi/output/CertificateTable.java +++ b/src/org/cacert/gigi/output/CertificateTable.java @@ -6,7 +6,7 @@ import java.sql.SQLException; import java.util.Map; import org.cacert.gigi.Language; -import org.cacert.gigi.pages.account.MailCertificates; +import org.cacert.gigi.pages.account.Certificates; public class CertificateTable implements Outputable { @@ -42,7 +42,7 @@ public class CertificateTable implements Outputable { out.print(" State"); out.println(rs.getString("CN")); out.print(""); diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/CertificateAdd.java similarity index 67% rename from src/org/cacert/gigi/pages/account/MailCertificateAdd.java rename to src/org/cacert/gigi/pages/account/CertificateAdd.java index 5f281c9b..1e462273 100644 --- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java +++ b/src/org/cacert/gigi/pages/account/CertificateAdd.java @@ -11,26 +11,26 @@ import org.cacert.gigi.Certificate; import org.cacert.gigi.output.Form; import org.cacert.gigi.pages.Page; -public class MailCertificateAdd extends Page { +public class CertificateAdd extends Page { - public static final String PATH = "/account/certs/email/new"; + public static final String PATH = "/account/certs/new"; - public MailCertificateAdd() { - super("Create Email certificate"); + public CertificateAdd() { + super("Create certificate"); } @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { - new IssueCertificateForm(req).output(resp.getWriter(), getLanguage(req), new HashMap()); + new CertificateIssueForm(req).output(resp.getWriter(), getLanguage(req), new HashMap()); } @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - IssueCertificateForm f = Form.getForm(req, IssueCertificateForm.class); + CertificateIssueForm f = Form.getForm(req, CertificateIssueForm.class); if (f.submit(resp.getWriter(), req)) { Certificate c = f.getResult(); String ser = c.getSerial(); - resp.sendRedirect(MailCertificates.PATH + "/" + ser); + resp.sendRedirect(Certificates.PATH + "/" + ser); } f.output(resp.getWriter(), getLanguage(req), Collections.emptyMap()); diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java similarity index 95% rename from src/org/cacert/gigi/pages/account/IssueCertificateForm.java rename to src/org/cacert/gigi/pages/account/CertificateIssueForm.java index 694652f9..225f24de 100644 --- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java +++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java @@ -40,7 +40,7 @@ import sun.security.x509.AlgorithmId; * This class represents a form that is used for issuing certificates. This * class uses "sun.security" and therefore needs "-XDignore.symbol.file" */ -public class IssueCertificateForm extends Form { +public class CertificateIssueForm extends Form { User u; @@ -50,13 +50,13 @@ public class IssueCertificateForm extends Form { String csr; - private final static Template t = new Template(IssueCertificateForm.class.getResource("IssueCertificateForm.templ")); + private final static Template t = new Template(CertificateIssueForm.class.getResource("CertificateIssueForm.templ")); - private final static Template tIni = new Template(MailCertificateAdd.class.getResource("RequestCertificate.templ")); + private final static Template tIni = new Template(CertificateAdd.class.getResource("RequestCertificate.templ")); String spkacChallenge; - public IssueCertificateForm(HttpServletRequest hsr) { + public CertificateIssueForm(HttpServletRequest hsr) { super(hsr); u = Page.getUser(hsr); spkacChallenge = RandomToken.generateToken(16); diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.templ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/IssueCertificateForm.templ rename to src/org/cacert/gigi/pages/account/CertificateIssueForm.templ diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/Certificates.java similarity index 93% rename from src/org/cacert/gigi/pages/account/MailCertificates.java rename to src/org/cacert/gigi/pages/account/Certificates.java index 775f527d..33118008 100644 --- a/src/org/cacert/gigi/pages/account/MailCertificates.java +++ b/src/org/cacert/gigi/pages/account/Certificates.java @@ -23,16 +23,16 @@ import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.Page; import org.cacert.gigi.util.PEM; -public class MailCertificates extends Page { +public class Certificates extends Page { CertificateTable myTable = new CertificateTable("mailcerts"); - Template certDisplay = new Template(MailCertificates.class.getResource("CertificateDisplay.templ")); + Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ")); - public static final String PATH = "/account/certs/email"; + public static final String PATH = "/account/certs"; - public MailCertificates() { - super("Email Certificates"); + public Certificates() { + super("Certificates"); } @Override diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 2518849f..661d3644 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -45,6 +45,7 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.Language; import org.cacert.gigi.User; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; import org.cacert.gigi.util.DatabaseManager; import org.cacert.gigi.util.PEM; @@ -303,7 +304,7 @@ public class ManagedTest { return headerField.substring(0, headerField.indexOf(';')); } - public static final String SECURE_REFERENCE = "/account/certs/email"; + public static final String SECURE_REFERENCE = MyDetails.PATH; public boolean isLoggedin(String cookie) throws IOException { URL u = new URL("https://" + getServerName() + SECURE_REFERENCE); -- 2.39.2