X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateIterable.java;h=8bfff7ef7a7c4819f92413f6619c6d6948d1cbfb;hb=8efbd22b42900f0184bd7265af9feb38fc0a4e08;hp=41d046e72020f0bf35a435283b76d11f82b7b954;hpb=fb38a9c8b9d86289213a36bd3d2afddc58ec7d3f;p=gigi.git

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 41d046e7..8bfff7ef 100644
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -1,9 +1,12 @@
 package org.cacert.gigi.output;
 
-import java.sql.SQLException;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.cert.X509Certificate;
 import java.util.Map;
 
-import org.cacert.gigi.Certificate;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 
@@ -23,20 +26,32 @@ public class CertificateIterable implements IterableDataset {
             return false;
         }
         Certificate c = certificates[i++];
-        try {
-            vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
-        } catch (SQLException e) {
-            vars.put("state", "Failed");
-            e.printStackTrace();
-        }
+        vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
         vars.put("CN", c.getDistinguishedName());
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());
         vars.put("profile", c.getProfile().getVisibleName());
-
-        vars.put("issued", "TODO"); // TODO output dates
-        vars.put("revoked", "TODO");
-        vars.put("expire", "TODO");
+        try {
+            CertificateStatus st = c.getStatus();
+            vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
+            if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
+                X509Certificate cert = c.cert();
+                vars.put("issued", cert.getNotBefore());
+                vars.put("expire", cert.getNotAfter());
+            } else {
+                vars.put("issued", l.getTranslation("N/A"));
+                vars.put("expire", l.getTranslation("N/A"));
+            }
+            if (st == CertificateStatus.REVOKED) {
+                vars.put("revoked", c.getRevocationDate());
+            } else {
+                vars.put("revoked", "n/a");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
         return true;
     }
 }