Merge pull request #32 from mittwald/fix/ca-cert-reload

Load new CA Certificate from file on certificate error
mittwald · Apr 29, 2022 · 5185cfa · 5185cfa
2 parents 1366ab7 + 11d53de
commit 5185cfa
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -35,10 +35,10 @@ const client = new Vault({
 ### Kubernetes In-Cluster Example
 
 ```js
-const cert = await fs.readFile("../vault-cacert", "utf8");
 const client = new Vault({
     vaultAddress: "https://vault:8200",
     vaultCaCertificate: cert,
+    vaultCaCertificatePath: "../vault-cacert",
 });
 
 const k8sauth = client.KubernetesAuth({

diff --git a/src/Vault.ts b/src/Vault.ts
@@ -8,6 +8,7 @@ import { resolveURL } from "./util";
 import { TotpVaultClient } from "./engines/totp";
 import { KVVaultClient } from "./engines/kv";
 import { KV2VaultClient } from "./engines";
+import { promises as fs } from "fs";
 
 export type VaultHTTPMethods = "GET" | "POST" | "DELETE" | "LIST";
 export interface HTTPGETParameters {
@@ -18,6 +19,7 @@ export interface IVaultConfig {
     vaultAddress?: string;
     vaultToken?: string;
     vaultCaCertificate?: string;
+    vaultCaCertificatePath?: string;
     vaultNamespace?: string;
     apiVersion?: string;
 }
@@ -133,6 +135,10 @@ export class Vault {
         }
         const uri = resolveURL(this.config.vaultAddress!, this.config.apiVersion!, ...path);
 
+        if (this.config.vaultCaCertificatePath && !this.config.vaultCaCertificate) {
+            await this.loadCACert();
+        }
+
         const requestOptions: request.Options = {
             method,
             uri: uri.toString(),
@@ -149,18 +155,32 @@ export class Vault {
             qs: parameters,
         };
 
-        let res = await request(requestOptions);
+        let res;
+        let retry = false;
+        try {
+            res = await request(requestOptions);
+        } catch (e) {
+            if (e.error && e.error.code === "CERT_SIGNATURE_FAILURE" && this.config.vaultCaCertificatePath) {
+                await this.loadCACert();
+                requestOptions.ca = this.config.vaultCaCertificate;
+                retry = true;
+            } else {
+                throw e;
+            }
+        }
 
         if (this.tokenClient && options.retryWithTokenRenew && res.statusCode === 403) {
             // token could be expired, try a new one
             await this.tokenClient.login();
-            res = await request({
-                ...requestOptions,
-                headers: {
-                    ...requestOptions.headers,
-                    "X-Vault-Token": this.token,
-                },
-            });
+            requestOptions.headers = {
+                ...requestOptions.headers,
+                "X-Vault-Token": this.token,
+            };
+            retry = true;
+        }
+
+        if (retry) {
+            res = await request(requestOptions);
         }
 
         if (!options.acceptedReturnCodes?.includes(res.statusCode)) {
@@ -202,4 +222,11 @@ export class Vault {
 
         return errors.some((e) => e.includes(expectedMsg));
     }
+
+    private async loadCACert(): Promise<void> {
+        if (this.config.vaultCaCertificatePath) {
+            const cert = await fs.readFile(this.config.vaultCaCertificatePath, "utf8");
+            this.config.vaultCaCertificate = cert;
+        }
+    }
 }
diff --git a/tests/engines/transit.spec.ts b/tests/engines/transit.spec.ts
@@ -117,14 +117,14 @@ describe("Transit Vault Client", () => {
             expect(dec).toEqual("hello");
         });
 
-        test("should respond with 500 if the keyID for decryption is invalid", async () => {
+        test("should respond with 400 if the keyID for decryption is invalid", async () => {
             const encrypted = await client.encryptText("500test", "plainText");
             const invalidKeyID = "invalid";
             await client.create(invalidKeyID);
             try {
                 await client.decryptText(invalidKeyID, encrypted);
             } catch (err) {
-                expect(err.response.statusCode).toEqual(500);
+                expect(err.response.statusCode).toEqual(400);
             }
         });