From d0d55439c0a56ca592bd6b2ca35813cf31708604 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 15 Oct 2015 00:47:33 +0200 Subject: [PATCH] fix: show nicer error messages when certificate request timed out. --- .../cacert/gigi/pages/account/certs/CertificateAdd.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java index 2d9680f1..2d55d565 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java @@ -8,6 +8,7 @@ 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.output.template.Form; import org.cacert.gigi.pages.Page; @@ -29,13 +30,19 @@ public class CertificateAdd extends Page { CertificateIssueForm f = Form.getForm(req, CertificateIssueForm.class); if (f.submit(resp.getWriter(), req)) { Certificate c = f.getResult(); + if (c.getStatus() != CertificateStatus.ISSUED) { + resp.getWriter().println("Timeout while waiting for certificate."); + return; + } String ser = c.getSerial(); if (ser.isEmpty()) { - resp.getWriter().println("C"); + resp.getWriter().println("Timeout while waiting for certificate."); + return; } resp.sendRedirect(Certificates.PATH + "/" + ser); } f.output(resp.getWriter(), getLanguage(req), Collections.emptyMap()); } + } -- 2.39.2