refactoring keystores

jlangch · Oct 17, 2024 · 965cbd6 · 965cbd6
1 parent a8a078b
commit 965cbd6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/...java/com/github/jlangch/venice/impl/docgen/cheatsheet/modules/ModuleKeystoresSection.java b/...java/com/github/jlangch/venice/impl/docgen/cheatsheet/modules/ModuleKeystoresSection.java
@@ -52,6 +52,7 @@ public DocSection section() {
         certs.addItem(diBuilder.getDocItem("keystores/subject-dn", false));
         certs.addItem(diBuilder.getDocItem("keystores/issuer-dn", false));
         certs.addItem(diBuilder.getDocItem("keystores/expiry-date", false));
+        certs.addItem(diBuilder.getDocItem("keystores/expired", false));
 
         return section;
     }

diff --git a/src/main/java/com/github/jlangch/venice/util/ssl/Keystores.java b/src/main/java/com/github/jlangch/venice/util/ssl/Keystores.java
@@ -82,6 +82,10 @@ public static String issuerDN(final KeyStore keystore, final String alias) throw
         return certificate(keystore, alias).getIssuerDN().getName();
     }
 
+    public static boolean hasExpired(final KeyStore keystore, final String alias) throws KeyStoreException {
+        return expiryDate(keystore, alias).isBefore(LocalDateTime.now());
+    }
+
     public static LocalDateTime expiryDate(final KeyStore keystore, final String alias) throws KeyStoreException {
         return toLocalDateTime(certificate(keystore, alias).getNotAfter());
     }

diff --git a/src/main/resources/com/github/jlangch/venice/keystores.venice b/src/main/resources/com/github/jlangch/venice/keystores.venice
@@ -59,7 +59,8 @@
           "keystores/certificate",
           "keystores/subject-dn",
           "keystores/issuer-dn",
-          "keystores/expiry-date" ) }
+          "keystores/expiry-date"
+          "keystores/expired?" ) }
 
   load [in password]
 
@@ -89,7 +90,8 @@
           "keystores/certificate",
           "keystores/subject-dn",
           "keystores/issuer-dn",
-          "keystores/expiry-date" ) }
+          "keystores/expiry-date"
+          "keystores/expired?" ) }
 
   aliases [keystore]
 
@@ -116,7 +118,8 @@
           "keystores/aliases",
           "keystores/subject-dn",
           "keystores/issuer-dn",
-          "keystores/expiry-date" ) }
+          "keystores/expiry-date"
+          "keystores/expired?" ) }
 
   certificate [keystore alias]
 
@@ -143,7 +146,8 @@
           "keystores/aliases",
           "keystores/certificate",
           "keystores/issuer-dn",
-          "keystores/expiry-date" ) }
+          "keystores/expiry-date"
+          "keystores/expired?" ) }
 
   subject-dn [keystore alias]
 
@@ -170,7 +174,8 @@
           "keystores/aliases",
           "keystores/certificate",
           "keystores/subject-dn",
-          "keystores/expiry-date" ) }
+          "keystores/expiry-date"
+          "keystores/expired?" ) }
 
   issuer-dn [keystore alias]
 
@@ -197,9 +202,37 @@
           "keystores/aliases",
           "keystores/certificate",
           "keystores/subject-dn",
-          "keystores/issuer-dn" ) }
+          "keystores/issuer-dn"
+          "keystores/expired?" ) }
 
   expiry-date [keystore alias]
 
   { :pre [(instance-of? :KeyStore keystore) (string? alias)] }
   (. :Keystores :expiryDate keystore alias))
+
+
+(defn 
+  ^{ :arglists '("(expired? keystore alias)")
+     :doc """
+          Returns true if the certificate with the given alias name in the 
+          keystore has expired.
+          """
+     :examples '(
+          """
+          (do
+            (load-module :keystores)
+            (let [ks    (keystores/load (io/file "cert.p12") "12345")
+                  alias (first (keystores/aliases ks)]
+              (keystores/expired? ks alias)))
+          """)
+     :see-also '(
+          "keystores/load", 
+          "keystores/aliases",
+          "keystores/certificate",
+          "keystores/subject-dn",
+          "keystores/issuer-dn" ) }
+
+  expired? [keystore alias]
+
+  { :pre [(instance-of? :KeyStore keystore) (string? alias)] }
+  (. :Keystores :hasExpired keystore alias))