status: add cert

Author: pulsejet

.github/workflows/build.yml

@@ -18,12 +18,12 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Build status page
         working-directory: framework/ndn-testbed-status
         run: |
-          npm install
+          npm ci
           npm run build
 
       - name: Deploy

framework/ndn-testbed-status/src/App.vue

@@ -10,6 +10,7 @@
           <th>Last Refresh</th>
           <th>TLS Expiry</th>
           <th>WSS</th>
+          <th>Site Cert</th>
           <th>Revision</th>
 
           <th v-for="node in routers">{{ node.shortname }}</th>
@@ -55,6 +56,12 @@
           }">
             {{ router.status?.['ws-tls'] ? 'OK' : '' }}
           </td>
+          <td :class="{
+            forceshort: true,
+            warning: (router.status?.site_cert_expiry ?? -1) < 0,
+            okay: getFromNow(router.status?.site_cert_expiry ?? -1) > 7 * 86400,
+          }" :title="router.status?.tls?.error ?? ''"
+          >{{ getFromNowStr(router.status?.site_cert_expiry, 'days') }}</td>
           <td>
             <a v-if="router.status?.revision"
                 :href="getRevUrl(router)"

framework/ndn-testbed-status/src/testbed.ts

@@ -26,6 +26,7 @@ interface IStatus {
         error: string | null,
     },
     'ws-tls': boolean,
+    site_cert_expiry: number,
     services: Record<string, {
         image: string;
         status: string;

framework/status-json.py

@@ -126,6 +126,15 @@ def get_ws_tls_status(host: dict) -> bool:
     except urllib.request.HTTPError as response:
         return response.code == 426
 
+def get_ndn_cert_expiry(cert_path: str) -> int:
+    print(f'Getting expirty for {cert_path}', file=sys.stderr)
+    try:
+        cmd = ['python3', '/testbed/scripts/cert-check.py', cert_path]
+        output = subprocess.check_output(cmd, timeout=5)
+        return int(output.strip())
+    except subprocess.CalledProcessError as e:
+        return 0
+
 if __name__ == '__main__':
     config = conf.get()
 
@@ -147,6 +156,7 @@ def get_ws_tls_status(host: dict) -> bool:
         'host_info': run_safe(get_host_info),
         'tls': run_safe(get_tls_status, host),
         'ws-tls': run_safe(get_ws_tls_status, host),
+        'site_cert_expiry': run_safe(get_ndn_cert_expiry, "/testbed/dist/ndncert/site.ndncert"),
         'services': run_safe(get_services),
         'nfd': run_safe(get_nfd),
         'nlsr': run_safe(get_nlsr),

scripts/cert-check.py

@@ -27,7 +27,8 @@ def main():
     not_after = bytes(cert.signature_info.validity_period.not_after).decode()
     not_after = datetime.strptime(not_after, date_template)
 
-    print("Cert Status", file_path, not_before, not_after)
+    # Print expiration date in seconds since epoch
+    print(int(not_after.timestamp()))
 
     now = datetime.now()
     if not_before <= now <= not_after - timedelta(days=91):