soajs.controller 4.2.35 → 4.2.37

package/lib/header.js

@@ -0,0 +1,51 @@
+"use strict";
+
+/**
+ * @license
+ * Copyright SOAJS All Rights Reserved.
+ *
+ * Use of this source code is governed by an Apache license that can be
+ * found in the LICENSE file at the root of this repository
+ */
+
+
+/**
+ * Encodes a string to be safely used as an HTTP header value.
+ * This preserves all data and is the standard, recommended method.
+ *
+ * @param {string | number | boolean} value The value to encode.
+ * @returns {string} The URL-encoded string.
+ */
+function encodeHeaderValue(value) {
+    if (value === null || typeof value === 'undefined') {
+        return '';
+    }
+    return encodeURIComponent(String(value));
+}
+
+/**
+ * Decodes a URL-encoded string from an HTTP header.
+ * It safely handles potential errors if the input is malformed.
+ *
+ * @param {string} encodedValue The percent-encoded header value to decode.
+ * @returns {string} The decoded (original) string, or the original
+ * string if decoding fails.
+ */
+function decodeHeaderValue(encodedValue) {
+    // Return empty string or null as is, to avoid errors.
+    if (!encodedValue) {
+        return encodedValue;
+    }
+
+    try {
+        // The standard way to decode a value encoded by encodeURIComponent.
+        return decodeURIComponent(encodedValue);
+    } catch (e) {
+        // This catches errors from malformed URI sequences (e.g., a lone '%').
+        console.error(`Failed to decode header value: "${encodedValue}"`, e);
+        // Return the original, undecoded value so the app doesn't crash.
+        return encodedValue;
+    }
+}
+
+module.exports = { encodeHeaderValue, decodeHeaderValue };

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

@@ -12,6 +12,9 @@ const async = require("async");
 
 const utils = require("./utils");
 
+
+const { encodeHeaderValue } = require("../../lib/header.js");
+
 /**
  *
  * @param configuration
@@ -40,7 +43,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);
@@ -244,8 +250,8 @@ module.exports = (configuration) => {
 												injectObj.urac = {
 													"_id": uracObj._id,
 													"username": uracObj.username,
-													"firstName": uracObj.firstName,
-													"lastName": uracObj.lastName,
+													"firstName": encodeHeaderValue(uracObj.firstName),
+													"lastName": encodeHeaderValue(uracObj.lastName),
 													"email": uracObj.email,
 													"groups": uracObj.groups,
 													"socialLogin": uracObj.socialLogin,
@@ -333,12 +339,14 @@ module.exports = (configuration) => {
 													req.soajs.log.error(err.message);
 												}
 												let _h = JSON.stringify(injectObj);
-												req.headers.soajsinjectobj = Buffer.from(_h, 'ascii').toString('utf-8');
+												// req.headers.soajsinjectobj = Buffer.from(_h, 'ascii').toString('utf-8');
+												req.headers.soajsinjectobj = _h; //encodeHeaderValue(_h);
 												return next();
 											});
 									} else {
 										let _h = JSON.stringify(injectObj);
-										req.headers.soajsinjectobj = Buffer.from(_h, 'ascii').toString('utf-8');
+										// req.headers.soajsinjectobj = Buffer.from(_h, 'ascii').toString('utf-8');
+										req.headers.soajsinjectobj = _h; //encodeHeaderValue(_h);
 										return next();
 									}
 								}

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.37",
   "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/data/provision/marketplace/httpmethods.js

@@ -27,7 +27,7 @@ let service = {
 		},
 		oauth: true,
 		extKeyRequired: true,
-		urac: false,
+		urac: true,
 		urac_Profile: false,
 		urac_ACL: false,
 		provision_ACL: false,

package/test/data/provision/oauth/token/access_token.js

@@ -9,7 +9,7 @@ let token = {
         _id: "5c8d0c505653de3985aa0ffd",
         locked: true,
         username: "owner",
-        firstName: "owner3",
+        firstName: "owner3'sèį",
         lastName: "owner",
         email: "me@localhost.com",
         "ts": new Date().getTime(),

package/test/data/provision/oauth/token/refresh_token.js

@@ -9,7 +9,7 @@ let token = {
         _id: "5c8d0c505653de3985aa0ffd",
         locked: true,
         username: "owner",
-        firstName: "owner3",
+        firstName: "owner3'sèį",
         lastName: "owner",
         email: "me@localhost.com",
         "ts": new Date().getTime(),

package/test/data/provision/urac/users/owner.js

@@ -4,7 +4,7 @@ let user = {
     locked: true,
     username: "owner",
     password: "$2a$12$geJJfv33wkYIXEAlDkeeuOgiQ6y6MjP/YxbqLdHdDSK7LDG.7n7Pq",
-    firstName: "owner3",
+    firstName: "owner3'sèį",
     lastName: "owner",
     email: "me@localhost.com",
     ts: 1552747600152,

package/test/integration/UC1-gateway-routes/oauth-service-mock.js

@@ -20,15 +20,17 @@ function startServer(serverConfig, callback) {
 			'lastname': "hage"
 		}
 	};
-	
-	
-	sApp.get('/passport/login', (req, res) => res.json(sReply));
-	
+
+
+	sApp.get('/passport/login', (req, res) => {
+		res.json(sReply);
+	});
+
 	mApp.get('/heartbeat', (req, res) => res.json(mReply));
-	
+
 	let sAppServer = sApp.listen(serverConfig.s.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.s.port}!`));
 	let mAppServer = mApp.listen(serverConfig.m.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.m.port}!`));
-	
+
 	return callback(
 		{
 			"sAppServer": sAppServer,
@@ -40,11 +42,11 @@ function startServer(serverConfig, callback) {
 
 function killServer(config) {
 	console.log("killing server ....");
-	
+
 	config.mAppServer.close((err) => {
 		console.log("...sAppServer: " + config.name);
 	});
-	
+
 	config.sAppServer.close((err) => {
 		console.log("...mAppServer: " + config.name);
 	});

package/test/integration/UC2-http-methods/service-mock/soa.json

@@ -44,7 +44,7 @@
   "requestTimeoutRenewal": 5,
   "extKeyRequired": true,
   "oauth": true,
-  "urac": false,
+  "urac": true,
   "urac_Profile": false,
   "urac_ACL": false,
   "tenant_Profile": false,