soajs.controller 4.2.35 → 4.2.36

package/mw/gotoService/index.js

@@ -82,6 +82,7 @@ module.exports = (configuration) => {
 						req.soajs.registry.services[service_n]) {
 						req.soajs.log.debug(req.soajs.registry.services[service_n]);
 					}
+					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.35",
+  "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 }));