node-vault-client 0.5.0 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-vault-client",
-  "version": "0.5.0",
+  "version": "0.5.6",
   "description": "A Vault Client implemented in pure javascript for HashiCorp Vault. It supports variety of Auth Backends and performs lease renewal for issued auth token.",
   "repository": "github:namecheap/node-vault-client",
   "engines": {

package/src/VaultClient.js

@@ -147,7 +147,7 @@ class VaultClient {
                     api,
                     this.__log,
                     authConfig.config,
-                    authConfig.mount,
+                    authConfig.mount
                 );
         }
 

package/src/auth/VaultKubernetesAuth.js

@@ -1,41 +1,47 @@
+const fs = require('fs');
 const VaultBaseAuth = require('./VaultBaseAuth');
-const readFile = require('../utils/readFile');
 
 class VaultKubernetesAuth extends VaultBaseAuth {
     /**
      * @param {VaultApiClient} apiClient - see {@link VaultBaseAuth#constructor}
      * @param {Object} config
-     * @param {String} config.role - Role of the Kubernetes.
-     * @param {String} [config.jwt] - Your service jwt token.
+     * @param {String} config.role - Role configured in Vault Kubernetes Auth backend under which we want to issue Vault token.
+     * @param {String} [config.tokenPath] - Path to the Kube JWT token. If omitted - default will be used.
      * @param {String} mount - Vault's  mount point ("kubernetes" by default)
      */
     constructor(apiClient, logger, config, mount) {
         super(apiClient, logger, mount || 'kubernetes');
 
         this.__role = config.role;
-        this.__filePath = '/var/run/secrets/kubernetes.io/serviceaccount/token';
+        this.__tokenPath = '/var/run/secrets/kubernetes.io/serviceaccount/token';
+        if (config.tokenPath !== undefined) {
+            this.__tokenPath = config.tokenPath;
+        }
     }
 
     _authenticate() {
         this._log.info(
-            'making authentication request: role_id=%s',
-            this.__roleId,
+            'making authentication request: Vault role: "%s"; K8s token path: "%s"',
+            this.__role, this.__tokenPath
         );
 
-        return readFile(this.__filePath)
-            .then((jwt) => {
-                this.__apiClient.makeRequest('POST', `/auth/${this._mount}/login`, {
-                    role: this.__role,
-                    jwt,
-                });
-            })
-            .then((res) => {
-                this._log.debug(
-                    'receive token: %s',
-                    res.auth.client_token,
-                );
-                return this._getTokenEntity(res.auth.client_token);
-            });
+        const k8sJwtToken = fs.readFileSync(this.__tokenPath).toString();
+        this._log.debug(
+            'receive K8s token: %s',
+            k8sJwtToken
+        );
+
+        return this.__apiClient.makeRequest('POST', `/auth/${this._mount}/login`, {
+            role: this.__role,
+            jwt: k8sJwtToken,
+        }).then((res) => {
+            this._log.debug(
+                'receive token: %s',
+                res.auth.client_token
+            );
+
+            return this._getTokenEntity(res.auth.client_token);
+        });
     }
 }
 

package/src/utils/readFile.js

@@ -1,7 +0,0 @@
-const { readFile } = require('fs');
-
-module.exports = function (filePath) {
-    return new Promise((resolve, reject) => {
-        readFile(filePath, (err, data) => (err ? reject(err) : resolve(data)));
-    });
-};