soajs.controller 4.2.5 → 4.2.7

package/mw/gotoService/redirectToService.js

@@ -13,11 +13,11 @@ const get = (p, o) => p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o);
 const request = require('request');
 
 module.exports = (configuration) => {
-	
+
 	let core = configuration.core;
 	let isRequestAuthorized = require("./lib/isRequestAuthorized.js");
 	let preRedirect = require("./lib/preRedirect.js");
-	
+
 	/**
 	 *
 	 * @param req
@@ -36,7 +36,7 @@ module.exports = (configuration) => {
 			if (obj.config.authorization) {
 				isRequestAuthorized(req, core, requestOptions);
 			}
-			
+
 			let restServiceParams = req.soajs.controller.serviceParams;
 			try {
 				let log_monitor = (doc) => {
@@ -46,7 +46,7 @@ module.exports = (configuration) => {
 						port = "4050";
 					}
 					let api = "/monitor/item";
-					
+
 					req.soajs.awareness.getHost(soamonitor, function (host) {
 						if (!host) {
 							req.soajs.log.error('Unable to find any healthy host for service ' + soamonitor);
@@ -64,7 +64,7 @@ module.exports = (configuration) => {
 								"json": true
 							};
 							if (req.headers && req.headers.soajsinjectobj) {
-								requestOptions.headers = {"soajsinjectobj": req.headers.soajsinjectobj};
+								requestOptions.headers = { "soajsinjectobj": req.headers.soajsinjectobj };
 							}
 							request.post(requestOptions, (error, response, body) => {
 								if (error) {
@@ -115,10 +115,10 @@ module.exports = (configuration) => {
 				if (monitor && !monitor_service_blacklist && monitor.req_query) {
 					monitoObj.query = req.query;
 				}
-				
+
 				// Trigger request
 				req.soajs.controller.redirectedRequest = request(requestOptions);
-				
+
 				// Handle error event for both with monitor and without monitor
 				req.soajs.controller.redirectedRequest.on('error', (err) => {
 					req.soajs.log.error(err.message + ' with [' + restServiceParams.name + (restServiceParams.version ? ('@' + restServiceParams.version) : '') + ']');
@@ -137,16 +137,20 @@ module.exports = (configuration) => {
 				//Handle body
 				if (req.method === 'POST' || req.method === 'PUT' || req.method === 'PATCH' || req.method === 'DELETE') {
 					if (monitor && !monitor_service_blacklist && monitor.req_body) {
+						let allowedContentType = false;
 						let isStream = false;
 						req.on("data", (chunk) => {
 							req.soajs.controller.redirectedRequest.write(chunk);
-							if (!isStream) {
-								let resContentType = res.getHeader('content-type');
-								if (resContentType) {
+							let resContentType = req.headers['content-type'];
+							if (resContentType) {
+								if (!allowedContentType) {
+									allowedContentType = resContentType.match(/application\/json|text\/plain/i);
+								}
+								if (!isStream) {
 									isStream = resContentType.match(/stream/i);
 								}
 							}
-							if (!isStream) {
+							if (!isStream && allowedContentType) {
 								if (!monitoObj.body) {
 									monitoObj.time.req_body_start = new Date().getTime();
 									monitoObj.body = chunk;
@@ -154,18 +158,23 @@ module.exports = (configuration) => {
 									monitoObj.body += chunk;
 								}
 							} else {
-								monitoObj.body = "stream";
+								monitoObj.body = "{\"contentType\": \"is stream or not allowed\", \"value': \"" + resContentType + "\"}";
 							}
 						});
 						req.on("end", () => {
-							if (!isStream) {
-								let resContentType = res.getHeader('content-type');
-								if (resContentType) {
+							let resContentType = req.headers['content-length'];
+							if (resContentType) {
+								if (!allowedContentType) {
+									allowedContentType = resContentType.match(/application\/json|text\/plain/i);
+								}
+								if (!isStream) {
 									isStream = resContentType.match(/stream/i);
 								}
 							}
 							if (!isStream) {
 								req.soajs.controller.redirectedRequest.end();
+							}
+							if (!isStream && allowedContentType) {
 								monitoObj.time.req_body_end = new Date().getTime();
 							}
 						});
@@ -175,6 +184,7 @@ module.exports = (configuration) => {
 				}
 				// Handle response
 				if (monitor && !monitor_service_blacklist && monitor.req_response) {
+					let allowedContentType = false;
 					let isStream = false;
 					req.soajs.controller.redirectedRequest.on("response", (response) => {
 						if (!res.headersSent) {
@@ -184,34 +194,37 @@ module.exports = (configuration) => {
 					});
 					req.soajs.controller.redirectedRequest.on("data", (chunk) => {
 						res.write(chunk);
-						if (!isStream) {
-							let resContentType = res.getHeader('content-type');
-							if (resContentType) {
+						let resContentType = res.getHeader('content-type');
+						if (resContentType) {
+							if (!allowedContentType) {
+								allowedContentType = resContentType.match(/application\/json|text\/plain/i);
+							}
+							if (!isStream) {
 								isStream = resContentType.match(/stream/i);
 							}
 						}
-						if (!isStream) {
+						if (!isStream && allowedContentType) {
 							if (!monitoObj.response) {
 								monitoObj.response = chunk;
 							} else {
 								monitoObj.response += chunk;
 							}
 						} else {
-							monitoObj.response = "stream";
+							monitoObj.response = "{\"contentType\": \"is stream or not allowed\", \"value': \"" + resContentType + "\"}";
 						}
 					});
 					req.soajs.controller.redirectedRequest.on("end", () => {
-						if (!isStream) {
-							let resContentType = res.getHeader('content-type');
-							if (resContentType) {
+						let resContentType = res.getHeader('content-type');
+						if (resContentType) {
+							if (!isStream) {
 								isStream = resContentType.match(/stream/i);
 							}
 						}
 						if (!isStream) {
 							res.end();
-							monitoObj.time.res_end = new Date().getTime();
-							log_monitor(monitoObj);
 						}
+						monitoObj.time.res_end = new Date().getTime();
+						log_monitor(monitoObj);
 					});
 					req.soajs.controller.redirectedRequest.on("abort", () => {
 						if (!req.soajs.controller.monitorEndingReq) {
@@ -223,7 +236,7 @@ module.exports = (configuration) => {
 				} else {
 					req.soajs.controller.redirectedRequest.pipe(res);
 				}
-				
+
 			} catch (e) {
 				req.soajs.log.error(e.message + ' @catch with [' + restServiceParams.name + (restServiceParams.version ? ('@' + restServiceParams.version) : '') + ']');
 				if (req.soajs.controller.redirectedRequest) {

package/mw/maintenanceMode/index.js

@@ -16,9 +16,16 @@ module.exports = () => {
 
 		let maintenanceMode = get(["registry", "custom", "gateway", "value", "maintenanceMode"], req.soajs);
 		if (maintenanceMode && maintenanceMode.on) {
+			let headObj = null;
+			if (maintenanceMode.retryAfter) {
+				headObj = {
+					'Retry-After': maintenanceMode.retryAfter
+				};
+			}
 			req.soajs.controllerResponse({
 				'status': maintenanceMode.status || 503,
-				'msg': maintenanceMode.message || "Maintenance mode is on, come back soon"
+				'msg': maintenanceMode.message || "Maintenance mode is on, come back soon",
+				'headObj': headObj
 			});
 		} else {
 			return next();

package/mw/mt/urac.js

@@ -39,6 +39,9 @@ function Urac(param) {
 				if (!_self.soajs.tenant.roaming && (param.oauth.bearerToken.clientId === _self.soajs.tenant.id)) {
 					_self.userRecord = param.oauth.bearerToken.user;
 				}
+				if (_self.soajs.tenant.roaming) {
+					_self.userRecord = param.oauth.bearerToken.user;
+				}
 			} else {
 				if (_self.soajs.tenant.roaming) {
 					_self.userRecord = param.oauth.bearerToken.user;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -18,20 +18,20 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "async": "3.2.4",
+    "async": "3.2.5",
     "connect": "3.7.0",
     "http-proxy": "1.18.1",
-    "jsonwebtoken": "8.5.1",
+    "jsonwebtoken": "9.0.2",
     "kubernetes-client": "9.0.0",
     "lodash": "4.17.21",
     "merge": "2.1.1",
     "netmask": "2.0.2",
     "oauth2-server": "2.4.1",
-    "path-to-regexp": "6.2.0",
+    "path-to-regexp": "6.2.1",
     "request": "2.88.2",
     "soajs.core.libs": "1.2.0",
-    "soajs.core.modules": "5.2.5",
-    "soajs.urac.driver": "3.2.3",
+    "soajs.core.modules": "5.2.7",
+    "soajs.urac.driver": "3.2.4",
     "useragent": "2.3.0"
   },
   "devDependencies": {