X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificates.java;h=8acd48422c03044aa9f06f36e6952e787d97e5c4;hp=e41a1b297914316ec12a591d8a8f4de52958fc56;hb=17a15662212d973d12ed4cea3f5eaa9c0d1169ed;hpb=ceb9e3a2bb91ecff8ce49604d43fac956df7f80c diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java index e41a1b29..8acd4842 100644 --- a/src/org/cacert/gigi/pages/account/certs/Certificates.java +++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java @@ -6,31 +6,52 @@ import java.net.URLEncoder; import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.cacert.gigi.dbObjects.Certificate; +import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; +import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; +import org.cacert.gigi.dbObjects.CertificateOwner; +import org.cacert.gigi.dbObjects.Organisation; +import org.cacert.gigi.dbObjects.SupportedUser; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.output.CertificateIterable; +import org.cacert.gigi.localisation.Language; +import org.cacert.gigi.output.TrustchainIterable; +import org.cacert.gigi.output.template.Form; +import org.cacert.gigi.output.template.IterableDataset; import org.cacert.gigi.output.template.Template; +import org.cacert.gigi.pages.HandlesMixedRequest; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.util.AuthorizationContext; +import org.cacert.gigi.util.CertExporter; import org.cacert.gigi.util.PEM; -public class Certificates extends Page { +public class Certificates extends Page implements HandlesMixedRequest { - private Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ")); + private static final Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ")); public static final String PATH = "/account/certs"; - public Certificates() { - super("Certificates"); + public static final String SUPPORT_PATH = "/support/certs"; + + private final boolean support; + + public Certificates(boolean support) { + super(support ? "Support Certificates" : "Certificates"); + this.support = support; } @Override public boolean beforeTemplate(HttpServletRequest req, HttpServletResponse resp) throws IOException { + if ("POST".equals(req.getMethod())) { + return beforePost(req, resp); + } String pi = req.getPathInfo().substring(PATH.length()); if (pi.length() == 0) { @@ -40,15 +61,12 @@ public class Certificates extends Page { boolean crt = false; boolean cer = false; resp.setContentType("application/pkix-cert"); + if (req.getParameter("install") != null) { + resp.setContentType("application/x-x509-user-cert"); + } if (pi.endsWith(".crt")) { crt = true; pi = pi.substring(0, pi.length() - 4); - } else if (pi.endsWith(".cer")) { - if (req.getParameter("install") != null) { - resp.setContentType("application/x-x509-user-cert"); - } - cer = true; - pi = pi.substring(0, pi.length() - 4); } else if (pi.endsWith(".cer")) { cer = true; pi = pi.substring(0, pi.length() - 4); @@ -56,19 +74,21 @@ public class Certificates extends Page { String serial = pi; try { Certificate c = Certificate.getBySerial(serial); - if (c == null || getUser(req).getId() != c.getOwner().getId()) { + if (c == null || LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId()) { resp.sendError(404); return true; } - X509Certificate cert = c.cert(); if ( !crt && !cer) { return false; } ServletOutputStream out = resp.getOutputStream(); + boolean doChain = req.getParameter("chain") != null; + boolean includeAnchor = req.getParameter("noAnchor") == null; + boolean includeLeaf = req.getParameter("noLeaf") == null; if (crt) { - out.println(PEM.encode("CERTIFICATE", cert.getEncoded())); + CertExporter.writeCertCrt(c, out, doChain, includeAnchor, includeLeaf); } else if (cer) { - out.write(cert.getEncoded()); + CertExporter.writeCertCer(c, out, doChain, includeAnchor); } } catch (IllegalArgumentException e) { resp.sendError(404); @@ -81,7 +101,44 @@ public class Certificates extends Page { return true; } - private Template certTable = new Template(CertificateIterable.class.getResource("CertificateTable.templ")); + @Override + public boolean beforePost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + if (support && "revoke".equals(req.getParameter("action"))) { + if (Form.getForm(req, RevokeSingleCertForm.class).submitExceptionProtected(req)) { + resp.sendRedirect(req.getPathInfo()); + return true; + } + return false; + } + if ( !req.getPathInfo().equals(PATH)) { + resp.sendError(500); + return true; + } + if (Form.getForm(req, CertificateModificationForm.class).submitExceptionProtected(req)) { + resp.sendRedirect(PATH); + return true; + } + return false; + } + + @Override + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + if (req.getQueryString() != null && !req.getQueryString().equals("") && !req.getQueryString().equals("withRevoked")) { + return;// Block actions by get parameters. + } + + if (support && "revoke".equals(req.getParameter("action"))) { + if (Form.printFormErrors(req, resp.getWriter())) { + Form.getForm(req, RevokeSingleCertForm.class).output(resp.getWriter(), getLanguage(req), new HashMap()); + } + return; + } + if ( !req.getPathInfo().equals(PATH)) { + resp.sendError(500); + return; + } + Form.getForm(req, CertificateModificationForm.class).output(resp.getWriter(), getLanguage(req), new HashMap()); + } @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { @@ -92,14 +149,89 @@ public class Certificates extends Page { String serial = pi; Certificate c = Certificate.getBySerial(serial); - if (c == null || LoginPage.getUser(req).getId() != c.getOwner().getId()) { + Language l = LoginPage.getLanguage(req); + + if ( !support && (c == null || LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId())) { resp.sendError(404); return; } HashMap vars = new HashMap<>(); vars.put("serial", URLEncoder.encode(serial, "UTF-8")); + + CertificateStatus st = c.getStatus(); + + if (support) { + vars.put("support", "support"); + CertificateOwner user = c.getOwner(); + if (st == CertificateStatus.ISSUED) { + if (user instanceof User) { + vars.put("revokeForm", new RevokeSingleCertForm(req, c, new SupportedUser((User) user, getUser(req), LoginPage.getAuthorizationContext(req).getSupporterTicketId()))); + } + } + } + + CertificateOwner co = c.getOwner(); + int ownerId = co.getId(); + vars.put("certid", c.getStatus()); + if (co instanceof Organisation) { + vars.put("type", l.getTranslation("Organisation Acount")); + vars.put("name", Organisation.getById(ownerId).getName()); + vars.put("link", ""); // TODO + } else { + vars.put("type", l.getTranslation("Personal Account")); + vars.put("name", User.getById(ownerId).getPreferredName()); + vars.put("link", "/support/user/" + ownerId + "/"); + } + vars.put("status", c.getStatus()); + vars.put("DN", c.getDistinguishedName()); + vars.put("digest", c.getMessageDigest()); + vars.put("profile", c.getProfile().getVisibleName()); + vars.put("fingerprint", "TBD"); // TODO function needs to be + // implemented in Certificate.java try { - vars.put("cert", c.cert()); + + if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) { + X509Certificate certx = c.cert(); + vars.put("issued", certx.getNotBefore()); + vars.put("expire", certx.getNotAfter()); + vars.put("cert", PEM.encode("CERTIFICATE", c.cert().getEncoded())); + } else { + vars.put("issued", l.getTranslation("N/A")); + vars.put("expire", l.getTranslation("N/A")); + vars.put("cert", l.getTranslation("N/A")); + } + if (st == CertificateStatus.REVOKED) { + vars.put("revoked", c.getRevocationDate()); + } else { + vars.put("revoked", l.getTranslation("N/A")); + } + if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) { + vars.put("trustchain", new TrustchainIterable(c.getParent())); + try { + vars.put("cert", PEM.encode("CERTIFICATE", c.cert().getEncoded())); + } catch (GeneralSecurityException e) { + e.printStackTrace(); + } + } else { + vars.put("trustchain", l.getTranslation("N/A")); + vars.put("cert", l.getTranslation("N/A")); + } + final List san = c.getSANs(); + vars.put("san", new IterableDataset() { + + int j = 0; + + @Override + public boolean next(Language l, Map vars) { + if (j == san.size()) { + return false; + } + vars.put("entry", san.get(j).getName() + (j < san.size() - 1 ? ", " : "")); + j++; + return true; + } + }); + vars.put("login", c.isLoginEnabled()); } catch (GeneralSecurityException e) { e.printStackTrace(); } @@ -109,9 +241,18 @@ public class Certificates extends Page { } HashMap vars = new HashMap(); - User us = LoginPage.getUser(req); - vars.put("certs", new CertificateIterable(us.getCertificates(false))); - certTable.output(out, getLanguage(req), vars); + new CertificateModificationForm(req, req.getParameter("withRevoked") != null).output(out, getLanguage(req), vars); } + @Override + public boolean isPermitted(AuthorizationContext ac) { + if (ac == null) { + return false; + } + if (support) { + return ac.canSupport(); + } else { + return true; + } + } }