thorin-plugin-cluster-kube 2.0.3 → 2.0.6

package/lib/clusterClient.js

@@ -70,6 +70,9 @@ module.exports = function init(thorin, opt) {
       if (this.#token) {
         fetchOpt.headers['x-cluster-token'] = this.sign(reqPayload, opt.service.id);
       }
+      if (_opt && _opt.headers) {
+        Object.keys(_opt.headers || {}).forEach(k => fetchOpt.headers[k] = _opt.headers[k]);
+      }
       let url;
       if (opt.alias && opt.alias[service]) {
         url = opt.alias[service];
@@ -105,6 +108,7 @@ module.exports = function init(thorin, opt) {
         }
         if (opt.required === false) return null;
         if (e.ns === 'FETCH') e.ns = 'CLUSTER';
+        if (e.data && e.data.url) delete e.data.url;
         e.action = action;
         e.service = service;
         throw e;
@@ -185,6 +189,56 @@ module.exports = function init(thorin, opt) {
       return DEFAULT_PREFIX + hashValue + '$' + publicStr;
     }
 
+    /**
+     * Proxy authorization middleware function, that checks that the given intent call
+     * comes from a cluster service.
+     * */
+    authorizeIntent(intentObj, opt = {}) {
+      let clientData = intentObj.client(),
+        tokenType = intentObj.authorizationSource,
+        accessToken = intentObj.authorization;
+      if (clientData.headers) {
+        let headerToken = clientData.headers['x-cluster-token'];
+        if (headerToken) {
+          tokenType = 'TOKEN';
+          accessToken = headerToken;
+        }
+      }
+      // turned off
+      if (!pluginObj.hasToken()) {
+        intentObj.data('proxy_auth', true);
+        intentObj._setAuthorization('CLUSTER', accessToken);
+        return true;
+      }
+      if (tokenType !== 'TOKEN') {
+        if (opt.required === false) {
+          intentObj.data('proxy_auth', false);
+          return true;
+        }
+        throw ERROR_PROXY;
+      }
+      let serviceData = this.verifyToken(accessToken, intentObj.action);
+      if (!serviceData) {
+        logger.warn(`Received invalid proxy request for ${intentObj.action} from: ${clientData.ip}`);
+        logger.warn(clientData, intentObj.rawInput);
+        if (opt.required === false) {
+          intentObj.data('proxy_auth', false);
+          return true;
+        }
+        throw ERROR_PROXY;
+      }
+      if (opt.required === false) {
+        intentObj.data('proxy_auth', true);
+        intentObj._setAuthorization('CLUSTER', accessToken);
+      }
+      intentObj.data('proxy_name', serviceData.n);
+      if (serviceData.t) {
+        intentObj.data('proxy_service', serviceData.t);
+      }
+      intentObj.resultHeaders('connection', 'keep-alive');
+      return true;
+    }
+
 
   }
 

package/lib/proxy.js

@@ -20,48 +20,11 @@ module.exports = function (thorin, opt, pluginObj) {
   dispatcher
     .addAuthorization('cluster#proxy')
     .use((intentObj, next, opt) => {
-      let clientData = intentObj.client(),
-        tokenType = intentObj.authorizationSource,
-        accessToken = intentObj.authorization;
-      if (clientData.headers) {
-        let headerToken = clientData.headers['x-cluster-token'];
-        if (headerToken) {
-          tokenType = 'TOKEN';
-          accessToken = headerToken;
-        }
+      try {
+        pluginObj.authorizeIntent(intentObj, opt);
+        next();
+      } catch (e) {
+        next(e);
       }
-      // turned off
-      if (!pluginObj.hasToken()) {
-        intentObj.data('proxy_auth', true);
-        intentObj._setAuthorization('CLUSTER', accessToken);
-        return next();
-      }
-      if (tokenType !== 'TOKEN') {
-        if (opt.required === false) {
-          intentObj.data('proxy_auth', false);
-          return next();
-        }
-        return next(ERROR_PROXY);
-      }
-      let serviceData = pluginObj.verifyToken(accessToken, intentObj.action);
-      if (!serviceData) {
-        logger.warn(`Received invalid proxy request for ${intentObj.action} from: ${clientData.ip}`);
-        logger.warn(clientData, intentObj.rawInput);
-        if (opt.required === false) {
-          intentObj.data('proxy_auth', false);
-          return next();
-        }
-        return next(ERROR_PROXY);
-      }
-      if (opt.required === false) {
-        intentObj.data('proxy_auth', true);
-        intentObj._setAuthorization('CLUSTER', accessToken);
-      }
-      intentObj.data('proxy_name', serviceData.n);
-      if (serviceData.t) {
-        intentObj.data('proxy_service', serviceData.t);
-      }
-      intentObj.resultHeaders('connection', 'keep-alive');
-      next();
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thorin-plugin-cluster-kube",
   "author": "UNLOQ Systems",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "dependencies": {},
   "description": "Thorin.js cluster plugin for microservice communication within a kubernetes environment",
   "main": "index.js",