From 5a9bbd07995a7266b90ecfa0163f67527a4bd87c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 4 Jun 2015 22:13:35 +0200 Subject: [PATCH] upd: wait for test-manager certs --- util-testing/org/cacert/gigi/pages/Manager.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index cccb0ac9..4028e069 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/org/cacert/gigi/pages/Manager.java @@ -25,6 +25,8 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.dbObjects.Certificate; +import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.dbObjects.Group; @@ -240,13 +242,21 @@ public class Manager extends Page { CertificateRequest cr = new CertificateRequest(u, Base64.getEncoder().encodeToString(res), "challange"); cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail(), resp.getWriter(), req); - cr.draft().issue(null, "2y"); - resp.getWriter().println("added certificate"); + Certificate draft = cr.draft(); + draft.issue(null, "2y").waitFor(10000); + if (draft.getStatus() == CertificateStatus.ISSUED) { + resp.getWriter().println("added certificate"); + } else { + resp.getWriter().println("signer failed"); + } } catch (GeneralSecurityException e1) { e1.printStackTrace(); resp.getWriter().println("error"); } catch (GigiApiException e) { e.format(resp.getWriter(), Language.getInstance(Locale.ENGLISH)); + } catch (InterruptedException e) { + e.printStackTrace(); + resp.getWriter().println("interrupted"); } } -- 2.39.2