soajs.controller 4.2.32 → 4.2.34

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/lastSeen/index.js

@@ -56,20 +56,23 @@ module.exports = () => {
                                     if (error) {
                                         req.soajs.log.debug("lastSeen failed for [" + item.name + "@" + item.version + " " + item.api + "]");
                                         req.soajs.log.debug("lastSeen " + error.message);
-                                    } else if (!body.result) {
-                                        let errorMsg = "";
-                                        if (body.errors && body.errors && body.errors.details && body.errors.details.length > 0) {
-                                            body.errors.details.forEach((detail) => {
-                                                if (errorMsg === "") {
-                                                    errorMsg += detail.message;
-                                                }
-                                                else {
-                                                    errorMsg += " - " + detail.message;
-                                                }
-                                            });
-                                        }
-                                        req.soajs.log.debug("lastSeen", errorMsg);
+                                    } else {
+                                        req.soajs.log.debug("lastSeen ", body);
                                     }
+                                    // else if (!body.result) {
+                                    //     let errorMsg = "";
+                                    //     if (body.errors && body.errors && body.errors.details && body.errors.details.length > 0) {
+                                    //         body.errors.details.forEach((detail) => {
+                                    //             if (errorMsg === "") {
+                                    //                 errorMsg += detail.message;
+                                    //             }
+                                    //             else {
+                                    //                 errorMsg += " - " + detail.message;
+                                    //             }
+                                    //         });
+                                    //     }
+                                    //     req.soajs.log.debug("lastSeen", errorMsg);
+                                    // }
                                 });
 
                             // let options = {

package/mw/mt/urac.js

@@ -16,17 +16,20 @@ const lib = require("./lib.js");
 
 function Urac(param) {
 	let _self = this;
-	
+
 	_self.soajs = param.soajs;
 	_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;
 			}
@@ -70,7 +73,7 @@ Urac.prototype.init = function (cb) {
 		}
 	}
 	else if (_self.id) {
-		uracDriver.getRecord(_self.soajs, {id: _self.id.toString(), username: _self.username}, function (err, record) {
+		uracDriver.getRecord(_self.soajs, { id: _self.id.toString(), username: _self.username }, function (err, record) {
 			if (record) {
 				_self.userRecord = record;
 				_self.resolveACL(() => {
@@ -78,7 +81,9 @@ Urac.prototype.init = function (cb) {
 				});
 			} else {
 				if (err && err.msg) {
+					const code = err.code;
 					err = new Error(err.msg);
+					err.code = code;
 				}
 				return cb(err, null);
 			}
@@ -141,19 +146,19 @@ Urac.prototype.getProfile = function (_ALL) {
 			"profile": _self.userRecord.profile,
 			"tenant": _self.userRecord.tenant
 		};
-		
+
 		if (_self.userRecord.socialLogin) {
 			urac.socialLogin = {
 				"strategy": _self.userRecord.socialLogin.strategy,
 				"id": _self.userRecord.socialLogin.id
 			};
 		}
-		
+
 		if (_ALL) {
 			if (_self.userRecord.socialLogin) {
 				urac.socialLogin.accessToken = _self.userRecord.socialLogin.accessToken;
 			}
-			
+
 			urac.config = _self.userRecord.config;
 			urac.groupsConfig = _self.userRecord.groupsConfig;
 		}
@@ -162,7 +167,7 @@ Urac.prototype.getProfile = function (_ALL) {
 		urac = {
 			"_id": _self.userRecord._id,
 			"username": _self.userRecord.userId,
-			"tenant": {"id": _self.userRecord.tId}
+			"tenant": { "id": _self.userRecord.tId }
 		};
 	}
 	else if (_self.userRecord) {
@@ -182,7 +187,7 @@ Urac.prototype.getProfile = function (_ALL) {
  */
 Urac.prototype.getAcl = function () {
 	let _self = this;
-	
+
 	if (_self.user_ACL && _self.user_ACL.acl) {
 		return _self.user_ACL.acl;
 	} else {
@@ -195,7 +200,7 @@ Urac.prototype.getAcl = function () {
  */
 Urac.prototype.getAclAllEnv = function () {
 	let _self = this;
-	
+
 	if (_self.user_ACL && _self.user_ACL.acl_all_env) {
 		return _self.user_ACL.acl_all_env;
 	} else {
@@ -214,13 +219,13 @@ Urac.prototype.getConfig = function () {
 		return null;
 	}
 	let config = null;
-	
+
 	if (_self.userRecord.config && _self.userRecord.config.keys) {
 		if (_self.userRecord.config.keys[key] && _self.userRecord.config.keys[key].config) {
 			config = _self.userRecord.config.keys[key].config;
 		}
 	}
-	
+
 	return config;
 };
 

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);
+					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.32",
+  "version": "4.2.34",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -28,15 +28,16 @@
     "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": {
-    "@babel/core": "7.26.0",
-    "@babel/plugin-transform-runtime": "7.25.9",
-    "@babel/preset-env": "7.26.0",
+    "@babel/core": "7.27.1",
+    "@babel/plugin-transform-runtime": "7.27.1",
+    "@babel/preset-env": "7.27.2",
+    "@babel/runtime": "7.27.1",
     "express": "4.21.1",
     "grunt": "1.6.1",
     "grunt-babel": "8.0.0",
@@ -48,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/utilities/utils.js

@@ -38,6 +38,7 @@ 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 {