soajs.controller 4.2.33 → 4.2.35

package/mw/gotoService/index.js

@@ -82,7 +82,6 @@ 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);
 					return req.soajs.controllerResponse(core.error.getError(130));
 				}
 

package/mw/ip2ban/index.js

@@ -0,0 +1,52 @@
+'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
+ */
+
+
+const get = (p, o) => p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o);
+
+/**
+ *
+ * @param configuration
+ * @returns {Function}
+ */
+
+	// let customRegistry.gateway = {
+	// 	"traffic": {
+	// 		"ip2ban": [
+	// 			"::1"
+	// 		],
+	// 		"model": "mongo",
+	// 		"throttling": {
+	// 			"oauth": {
+	// 				"publicAPIStrategy": "test",
+	// 				"apis": [
+	// 					"/token"
+	// 				]
+	// 			}
+	// 		}
+	// 	},
+	// };
+module.exports = function () {
+
+	return (req, res, next) => {
+
+		let ip2ban = get(["soajs", "registry", "custom", "gateway", "value", "traffic", "ip2ban"], req);
+		let clientIP = req.getClientIP();
+
+		if (ip2ban && Array.isArray(ip2ban) && ip2ban.includes(clientIP)) {
+			req.soajs.controllerResponse({
+				'status': 403,
+				'msg': 'banned'
+			});
+			return;
+		}
+		return next();
+	};
+};

package/mw/mt/urac.js

@@ -21,12 +21,15 @@ function Urac(param) {
 	_self.userRecord = null;
 	_self.user_ACL = null;
 	_self.id = null;
+	_self.bearerTokenUser = null;
+
 	if (param.oauth && 0 === param.oauth.type) {
 		_self.userRecord = param.oauth.bearerToken;
 	} else {
 		// if type === 2
 		if (param.oauth && param.oauth.bearerToken && param.oauth.bearerToken.user) {
 			_self.id = param.oauth.bearerToken.user.id;
+			_self.bearerTokenUser = param.oauth.bearerToken.user;
 			if (param.oauth.bearerToken.user.username) {
 				_self.username = param.oauth.bearerToken.user.username;
 			}

package/mw/mt/utils.js

@@ -588,11 +588,25 @@ let utils = {
 		}
 		let callURACDriver = function (roaming) {
 			obj.req.soajs.uracDriver = new UracDriver({ "soajs": obj.req.soajs, "oauth": obj.req.oauth });
-			obj.req.soajs.uracDriver.init((error) => {
+			obj.req.soajs.uracDriver.init((error, record) => {
 				if (error && !roaming) {
 					obj.req.soajs.log.error(error.message, error.code);
 					return cb(146);
 				}
+				if (obj.keyObj.config && obj.keyObj.config.gateway && obj.keyObj.config.gateway.validateTokenAccount) {
+					if (obj.req.soajs.uracDriver.bearerTokenUser && record) {
+						if (obj.keyObj.config.gateway.validateTokenAccount.email && record.email) {
+							if (record.email !== obj.req.soajs.uracDriver.bearerTokenUser.email) {
+								return cb(146);
+							}
+						}
+						if (obj.keyObj.config.gateway.validateTokenAccount.phone && record.phone) {
+							if (record.phone !== obj.req.soajs.uracDriver.bearerTokenUser.phone) {
+								return cb(146);
+							}
+						}
+					}
+				}
 				let userServiceConf = obj.req.soajs.uracDriver.getConfig();
 				userServiceConf = userServiceConf || {};
 

package/mw/traffic/index.js

@@ -126,17 +126,20 @@ module.exports = function (configuration) {
 
 	return (req, res, next) => {
 
-		let ip2ban = get(["soajs", "registry", "custom", "gateway", "value", "traffic", "ip2ban"], req);
+		// NOTE: moved to ip2ban MW
+		//
+		// let ip2ban = get(["soajs", "registry", "custom", "gateway", "value", "traffic", "ip2ban"], req);
+		// let clientIP = req.getClientIP();
+
+		// if (ip2ban && Array.isArray(ip2ban) && ip2ban.includes(clientIP)) {
+		// 	req.soajs.controllerResponse({
+		// 		'status': 403,
+		// 		'msg': 'banned'
+		// 	});
+		// 	return;
+		// }
 		let clientIP = req.getClientIP();
-
-		if (ip2ban && Array.isArray(ip2ban) && ip2ban.includes(clientIP)) {
-			req.soajs.controllerResponse({
-				'status': 403,
-				'msg': 'banned'
-			});
-			return;
-		}
-
+		
 		if (req && req.soajs && req.soajs.registry && req.soajs.registry.serviceConfig && req.soajs.registry.serviceConfig.throttling && req.soajs.tenant && req.soajs.controller) {
 
 			let serviceName = req.soajs.controller.serviceParams.name;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.33",
+  "version": "4.2.35",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -28,9 +28,9 @@
     "netmask": "2.0.2",
     "oauth2-server": "2.4.1",
     "path-to-regexp": "6.2.2",
-    "soajs.core.libs": "1.2.0",
-    "soajs.core.modules": "5.2.12",
-    "soajs.urac.driver": "3.2.9",
+    "soajs.core.libs": "1.2.1",
+    "soajs.core.modules": "5.2.15",
+    "soajs.urac.driver": "3.2.12",
     "useragent": "2.3.0"
   },
   "devDependencies": {
@@ -49,9 +49,9 @@
     "grunt-istanbul": "0.8.0",
     "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
-    "mocha": "10.7.3",
-    "nock": "13.5.6",
+    "mocha": "11.5.0",
+    "nock": "14.0.4",
     "request": "2.88.2",
-    "sinon": "19.0.2"
+    "sinon": "20.0.0"
   }
 }

package/server/controller.js

@@ -38,6 +38,7 @@ const gotoService_mw = require("../mw/gotoService/index");
 const mt_mw = require("../mw/mt/index");
 const traffic_mw = require("../mw/traffic/index");
 const lastSeen_mw = require("../mw/lastSeen/index");
+const ip2ban_mw = require("../mw/ip2ban/index");
 
 const utils = require("../utilities/utils");
 
@@ -87,6 +88,10 @@ Controller.prototype.init = function (callback) {
 			app.use(cors_mw());
 			app.use(favicon_mw());
 			app.use(response_mw({ "controllerResponse": true }));
+
+			app.use(enhancer_mw());
+			
+			app.use(ip2ban_mw());
 			app.use(maintenanceMode_mw()); //NOTE: this is for global maintenance mode
 
 			log.info("Loading Provision ...");
@@ -128,7 +133,7 @@ Controller.prototype.init = function (callback) {
 					}));
 					log.info("AwarenessEnv middleware initialization done.");
 
-					app.use(enhancer_mw());
+					// app.use(enhancer_mw());
 
 					app.use(url_mw({ "core": core }));
 

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;
@@ -62,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);
     }
@@ -76,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);