soajs.controller 4.2.34 → 4.2.36

package/mw/gotoService/index.js

@@ -82,7 +82,7 @@ module.exports = (configuration) => {
 						req.soajs.registry.services[service_n]) {
 						req.soajs.log.debug(req.soajs.registry.services[service_n]);
 					}
-					req.soajs.log.debug(req.headers);
+					req.soajs.log.warn(JSON.stringify({ "url": req.url, "headers": req.headers }));
 					return req.soajs.controllerResponse(core.error.getError(130));
 				}
 

package/mw/mt/index.js

@@ -40,7 +40,10 @@ module.exports = (configuration) => {
 
 		let serviceParam = {};
 		if (!proxy) {
-			let serviceInfo = req.soajs.controller.serviceParams.registry.versions[req.soajs.controller.serviceParams.version];
+			let serviceInfo = null;
+			if (req.soajs.controller.serviceParams.registry.versions) {
+				serviceInfo = req.soajs.controller.serviceParams.registry.versions[req.soajs.controller.serviceParams.version];
+			}
 			if (!serviceInfo) {
 				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(133);

package/mw/url/index.js

@@ -20,21 +20,21 @@ let libParseURL = require('../../lib/parseURL');
  */
 module.exports = (configuration) => {
 	let core = configuration.core;
-	
+
 	return (req, res, next) => {
 		if (!req.soajs) {
 			throw new TypeError('soajs mw is not started');
 		}
-		
+
 		if (!req.soajs.controller) {
 			req.soajs.controller = {};
 		}
-		
+
 		let parsedUrl = url.parse(req.url, true);
 		if (!req.query && parsedUrl.query) {
 			req.query = parsedUrl.query;
 		}
-		
+
 		if (!req.query) {
 			req.query = {};
 		}
@@ -42,6 +42,18 @@ module.exports = (configuration) => {
 		if (!req.soajs.controller.serviceParams.service_n || req.soajs.controller.serviceParams.service_n === '') {
 			return req.soajs.controllerResponse(core.error.getError(136));
 		}
+		if (
+			req.soajs.controller.serviceParams.service_n !== "soajs" &&
+			(
+				!req.soajs.registry ||
+				!req.soajs.registry.services ||
+				!req.soajs.registry.services[req.soajs.controller.serviceParams.service_n]
+			)) {
+			req.soajs.log.fatal("Service [" + req.soajs.controller.serviceParams.service_n + "] URL [" + req.url + "] couldn't be matched to a service or the service entry in registry is missing [port || hosts]");
+			req.soajs.log.warn(JSON.stringify({ "url": req.url, "headers": req.headers }));
+			return req.soajs.controllerResponse(core.error.getError(130));
+		}
+
 		let key = req.headers.key || req.query.key;
 		if (!req.headers.key) {
 			req.headers.key = key;

package/package.json

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

package/server/controller.js

@@ -94,6 +94,8 @@ Controller.prototype.init = function (callback) {
 			app.use(ip2ban_mw());
 			app.use(maintenanceMode_mw()); //NOTE: this is for global maintenance mode
 
+			app.use(url_mw({ "core": core }));
+			
 			log.info("Loading Provision ...");
 			let dbConfig = registry.coreDB.provision;
 			if (registry.coreDB.oauth) {
@@ -135,7 +137,7 @@ Controller.prototype.init = function (callback) {
 
 					// app.use(enhancer_mw());
 
-					app.use(url_mw({ "core": core }));
+					// app.use(url_mw({ "core": core }));
 
 					app.use(key_mw({ "provision": provision, "regEnvironment": regEnvironment }));
 

package/test/unit/utilities/utils.js

@@ -4,7 +4,7 @@ const helper = require("../../helper.js");
 let utils = helper.requireModule('./utilities/utils.js');
 
 describe("Testing utilities", () => {
-	
+
 	let res = {
 		status: () => {
 			return {
@@ -17,12 +17,15 @@ describe("Testing utilities", () => {
 			return 2;
 		}
 	};
-	
+
 	let req = {
 		soajs: {
 			log: {
 				error: (input) => {
 					// console.error(input);
+				},
+				warn: (input) => {
+					// console.error(input);
 				}
 			},
 			buildResponse: (input) => {
@@ -33,25 +36,25 @@ describe("Testing utilities", () => {
 			}
 		}
 	};
-	
+
 	it("logErrors - number error", (done) => {
 		utils.logErrors(123, req, res, (error) => {
 			done();
 		});
 	});
-	
+
 	it("logErrors - object, no code no message", (done) => {
 		utils.logErrors({}, req, res, (error) => {
 			done();
 		});
 	});
-	
+
 	it("logErrors - string error", (done) => {
 		utils.logErrors("error", req, res, (error) => {
 			done();
 		});
 	});
-	
+
 	it("controllerClientErrorHandler - request without xhr", (done) => {
 		utils.controllerClientErrorHandler(null, req, res, () => {
 			done();
@@ -63,14 +66,14 @@ describe("Testing utilities", () => {
 			done();
 		});
 	});
-	
+
 	it("controllerErrorHandler - number error", (done) => {
 		req.xhr = {};
 		utils.controllerErrorHandler(150, req, res, null);
 		done();
 	});
 	it("controllerErrorHandler - with error", (done) => {
-		utils.controllerErrorHandler({"code": 200, "msg": "dummy200"}, req, res, null);
+		utils.controllerErrorHandler({ "code": 200, "msg": "dummy200" }, req, res, null);
 		done();
 	});
 });

package/utilities/utils.js

@@ -28,9 +28,9 @@ function logErrors(err, req, res, next) {
         if (err.code && err.message) {
             req.soajs.log.error(err.message);
             if (err.name === "OAuth2Error") {
-	            return next({"code": err.code, "status": err.code, "msg": err.message});
+                return next({ "code": err.code, "status": err.code, "msg": err.message });
             } else {
-	            return next({"code": err.code, "msg": err.message});
+                return next({ "code": err.code, "msg": err.message });
             }
         } else if (err.code && err.msg) {
             err.message = err.msg;
@@ -38,7 +38,6 @@ function logErrors(err, req, res, next) {
             return next(err);
         } else {
             req.soajs.log.error(err.message || err);
-            req.soajs.log.error(req.url);
             req.soajs.log.error(core.error.generate(164).message);
         }
     } else {
@@ -63,7 +62,7 @@ function controllerClientErrorHandler(err, req, res, next) {
         req.soajs.log.error(core.error.generate(150));
         let errObj = core.error.getError(150);
         errObj.status = 500;
-        return next (errObj);
+        return next(errObj);
     } else {
         return next(err);
     }
@@ -77,6 +76,9 @@ function controllerClientErrorHandler(err, req, res, next) {
  * @param next
  */
 function controllerErrorHandler(err, req, res, next) {
+
+    req.soajs.log.warn(JSON.stringify({ "url": req.url, "headers": req.headers }));
+
     if (err.code && err.msg) {
         err.status = err.status || 500;
         req.soajs.controllerResponse(err, next);