add: Highlight certificates outside validity period in Cert Overview

Highlight if a issued date is in the future and/or the expiration date
is less than 14 days or expired

Change-Id: If3dd70374f1cf191b83a5d113ea0bc526e7e9505

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index bb2c493ce3024b16d0e78c4ac05efe8bc4eef4ff..afc883ff4a13544a04df6bcb6fd91d70c4965a23 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -3,17 +3,21 @@ package org.cacert.gigi.output;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
+import java.util.Date;
 import java.util.Map;
 
 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;
+import org.cacert.gigi.util.CalendarUtil;
 
 public class CertificateIterable implements IterableDataset {
 
     private Certificate[] certificates;
 
+    public static final int EXPIRING_IN_DAYS = 14;
+
     public CertificateIterable(Certificate[] certificates) {
         this.certificates = certificates;
     }
@@ -34,14 +38,30 @@ public class CertificateIterable implements IterableDataset {
         try {
             CertificateStatus st = c.getStatus();
             vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
+            String issuedWarning = "";
+            String expiredWarning = "";
             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
                 vars.put("issued", cert.getNotBefore());
                 vars.put("expire", cert.getNotAfter());
+
+                if (cert.getNotBefore().after(new Date())) {
+                    issuedWarning = "bg-warning";
+                }
+                vars.put("classIssued", issuedWarning);
+
+                if (cert.getNotAfter().before(CalendarUtil.timeDifferenceDays(EXPIRING_IN_DAYS))) {
+                    expiredWarning = "bg-warning";
+                }
+                if (cert.getNotAfter().before(new Date())) {
+                    expiredWarning = "bg-danger";
+                }
+                vars.put("classExpired", expiredWarning);
             } 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 {

diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index 278b4f7f7bb04c989b9dc9b22808801fa5774ee8..539ac1e15e981a180be7d981fa6b226360fd1058 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -22,9 +22,9 @@
        <td><a href='/account/certs/<?=$serial?>'><?=$serial?></a></td>
        <td><?=$digest?></td>
        <td><?=$profile?></td>
-       <td><?=$issued?></td>
+       <td class="<?=$classIssued?>"><?=$issued?></td>
        <td><?=$revoked?></td>
-       <td><?=$expire?></td>
+       <td class="<?=$classExpired?>"><?=$expire?></td>
        <td><?=$login?></td>
 </tr>
 <? } ?>

diff --git a/src/org/cacert/gigi/util/CalendarUtil.java b/src/org/cacert/gigi/util/CalendarUtil.java
index 03fdf2fceae76b7b2b03a9017b8e729338981148..7d65407779d48f3211f9819d0f2a18e09def1668 100644 (file)
--- a/src/org/cacert/gigi/util/CalendarUtil.java
+++ b/src/org/cacert/gigi/util/CalendarUtil.java
@@ -35,4 +35,11 @@ public class CalendarUtil {
         Date dob = cal.getTime();
         return new DayDate(dob.getTime());
     }
+
+    public static Date timeDifferenceDays(int days) {
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(System.currentTimeMillis());
+        c.add(Calendar.DAY_OF_MONTH, days);
+        return c.getTime();
+    }
 }