upd: for installation send certificate chains as p7 encoded cert set

[gigi.git] / src / org / cacert / gigi / pages / account / certs / CertificateAdd.java

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
index 317c6709ac6240363c5ed8775807801b700441e2..2d55d5651aac155d108074c6d1b049edc154a30a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java
@@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.dbObjects.Certificate;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.Page;
 
 public class CertificateAdd extends Page {
@@ -29,10 +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("Timeout while waiting for certificate.");
+                return;
+            }
             resp.sendRedirect(Certificates.PATH + "/" + ser);
         }
         f.output(resp.getWriter(), getLanguage(req), Collections.<String,Object>emptyMap());
 
     }
+
 }