soajs.controller 4.2.12 → 4.2.13

package/mw/gotoService/redirectToService.js

@@ -172,7 +172,9 @@ module.exports = (configuration) => {
 								}
 							}
 							if (!isStream) {
-								req.soajs.controller.redirectedRequest.end();
+								if (req.soajs.controller.redirectedRequest) {
+									req.soajs.controller.redirectedRequest.end();
+								}
 							}
 							if (!isStream && allowedContentType) {
 								monitoObj.time.req_body_end = new Date().getTime();

package/mw/mt/index.js

@@ -24,9 +24,9 @@ module.exports = (configuration) => {
 	let core = configuration.core;
 	let provision = configuration.provision;
 	let gatewayServiceName = configuration.serviceName;
-	
+
 	return (req, res, next) => {
-		
+
 		//if there is a proxy no need to do any of the below, return next
 		let urlInfo = req.soajs.controller.serviceParams.serviceInfo;
 		//let proxy = (urlInfo[1] === 'proxy' && urlInfo[2] === 'redirect');
@@ -37,7 +37,7 @@ module.exports = (configuration) => {
 			proxy = true;
 		}
 		let url_keyACL = (urlInfo[1] === 'soajs' && urlInfo[2] === 'acl');
-		
+
 		let serviceParam = {};
 		if (!proxy) {
 			let serviceInfo = req.soajs.controller.serviceParams.registry.versions[req.soajs.controller.serviceParams.version];
@@ -75,7 +75,7 @@ module.exports = (configuration) => {
 				"oauth": true
 			};
 		}
-		
+
 		let oauthExec = () => {
 			if (serviceParam.oauth) {
 				soajs.oauth(req, res, next);
@@ -84,7 +84,7 @@ module.exports = (configuration) => {
 				return next();
 			}
 		};
-		
+
 		req.soajs.awareness.getHost(gatewayServiceName, (controllerHostInThisEnvironment) => {
 			if (serviceParam.extKeyRequired) {
 				req.soajs.controller.serviceParams.isAPIPublic = false;
@@ -96,7 +96,7 @@ module.exports = (configuration) => {
 						"iKey": keyObj.key,
 						"eKey": keyObj.extKey
 					};
-					
+
 					provision.getTenantOauth(req.soajs.tenant.id, (err, tenantOauth) => {
 						if (tenantOauth) {
 							req.soajs.tenantOauth = tenantOauth;
@@ -104,18 +104,18 @@ module.exports = (configuration) => {
 							req.soajs.tenantOauth = null;
 						}
 						req.soajs.tenant.application = keyObj.application;
-						
+
 						let packObj = req.soajs.controller.serviceParams.packObj;
 						if (packObj) {
 							req.soajs.tenant.application.package_acl = packObj.acl;
 							req.soajs.tenant.application.package_acl_all_env = packObj.acl_all_env;
 							req.soajs.servicesConfig = keyObj.config;
-							
+
 							if (proxy) {
 								req.soajs.log.debug("Detected proxy request, bypassing MT ACL checks...");
 								return oauthExec();
 							}
-							
+
 							let serviceCheckArray = [(cb) => {
 								cb(null, {
 									"gatewayServiceName": gatewayServiceName,
@@ -130,27 +130,27 @@ module.exports = (configuration) => {
 									"packObj": packObj
 								});
 							}];
-							
+
 							serviceCheckArray.push(utils.ipWhitelist);
-							
+
 							serviceCheckArray.push(utils.securityGeoCheck);
 							serviceCheckArray.push(utils.securityDeviceCheck);
-							
+
 							serviceCheckArray.push(utils.aclCheck);
-							
+
 							if (serviceParam.oauth) {
 								serviceCheckArray.push(utils.oauthCheck);
 							}
-							
+
 							serviceCheckArray.push(utils.uracCheck);
 							if (!url_keyACL) {
 								serviceCheckArray.push(utils.aclUrackCheck);
-								
+
 								serviceCheckArray.push(utils.serviceCheck);
 								serviceCheckArray.push(utils.apiCheck);
 							}
 							async.waterfall(serviceCheckArray, (err, data) => {
-								
+
 								//if this is controller route: /key/permission/get, ignore async waterfall response
 								if (url_keyACL) {
 									if (!req.soajs.uracDriver) {
@@ -172,7 +172,7 @@ module.exports = (configuration) => {
 										return next();
 									}
 								}
-								
+
 								if (err) {
 									req.soajs.log.error("Problem accessing service [" + req.soajs.controller.serviceParams.name + "], API [" + req.soajs.controller.serviceParams.path + "] & version [" + req.soajs.controller.serviceParams.version + "]");
 									return next(err);
@@ -180,7 +180,7 @@ module.exports = (configuration) => {
 									let serviceName = data.req.soajs.controller.serviceParams.name;
 									let dataServiceConfig = data.servicesConfig || keyObj.config;
 									let serviceConfig = {};
-									
+
 									if (dataServiceConfig.commonFields) {
 										for (let i in dataServiceConfig.commonFields) {
 											if (Object.hasOwnProperty.call(dataServiceConfig.commonFields, i)) {
@@ -230,7 +230,7 @@ module.exports = (configuration) => {
 										"device": data.device,
 										"geo": data.geo
 									};
-									
+
 									if (keyObj.tenant.main) {
 										injectObj.tenant.main = keyObj.tenant.main;
 									}
@@ -254,11 +254,11 @@ module.exports = (configuration) => {
 														"code": uracObj.tenant.code
 													}
 												};
-												
+
 												injectObj.param = injectObj.param || {};
 												injectObj.param.urac_Profile = serviceParam.urac_Profile;
 												injectObj.param.urac_ACL = serviceParam.urac_ACL;
-												
+
 												if (serviceParam.urac_Profile) {
 													injectObj.urac.profile = uracObj.profile;
 												}
@@ -289,7 +289,7 @@ module.exports = (configuration) => {
 											"port": req.soajs.registry.serviceConfig.ports.controller
 										};
 									}
-									
+
 									if (serviceParam.interConnect && Array.isArray(serviceParam.interConnect) && serviceParam.interConnect.length > 0) {
 										if (!injectObj.awareness.interConnect) {
 											injectObj.awareness.interConnect = [];
@@ -332,7 +332,8 @@ module.exports = (configuration) => {
 												if (err) {
 													req.soajs.log.error(err.message);
 												}
-												req.headers.soajsinjectobj = JSON.stringify(injectObj);
+												let _h = JSON.stringify(injectObj);
+												req.headers.soajsinjectobj = Buffer.from(_h, 'ascii').toString('utf-8');
 												return next();
 											});
 									} else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.12",
+  "version": "4.2.13",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"