Expose certificate expiry from API

Author: pimterry

src/api/api-model.ts

@@ -7,9 +7,12 @@ import { getSystemProxy } from 'os-proxy-config';
 import { SERVER_VERSION } from "../constants";
 import { delay } from '../util/promise';
 import { logError, addBreadcrumb } from '../error-tracking';
+
 import { HtkConfig } from "../config";
 import { ActivationError, Interceptor } from "../interceptors";
 import { getDnsServer } from '../dns-server';
+import { getCertExpiry, parseCert } from '../certificates';
+
 import * as Client from '../client/client-types';
 import { HttpClient } from '../client/http-client';
 
@@ -64,6 +67,9 @@ export class ApiModel {
         return {
             certificatePath: this.config.https.certPath,
             certificateContent: this.config.https.certContent,
+            certificateExpiry: getCertExpiry(
+                parseCert(this.config.https.certContent)
+            ),
 
             // We could calculate this client side, but it  requires node-forge or some
             // other heavyweight crypto lib, and we already have that here, so it's

src/certificates.ts

@@ -3,9 +3,12 @@ import * as forge from 'node-forge';
 
 export const parseCert = forge.pki.certificateFromPem;
 
+export function getCertExpiry(cert: forge.pki.Certificate): number {
+    return cert.validity.notAfter.valueOf();
+}
+
 export function getTimeToCertExpiry(cert: forge.pki.Certificate): number {
-    const expiry = cert.validity.notAfter.valueOf();
-    return expiry - Date.now();
+    return getCertExpiry(cert) - Date.now();
 }
 
 // A series of magic incantations that matches the behaviour of openssl's