xzwebx-httpfilter 1.2.5 → 1.3.1

package/HttpFilter.js

@@ -125,44 +125,54 @@ function CheckReq(req, res, next) {
 }
 function cycleCheckParams(msgFieldMap, data) {
     let retMsgData = null
-    if (!msgFieldMap ||
-        !msgFieldMap['__FieldCfg'] ||
-        !msgFieldMap['__FieldCfg'].ifMust) {
+
+    if (!msgFieldMap) {
         return null
     }
 
+    let fCfgItem = null
+    let isRoot = true
+    if (msgFieldMap['__FieldCfg']) {
+        isRoot = false
+        fCfgItem = msgFieldMap['__FieldCfg']
+    }
+
     for (let fieldName in msgFieldMap) {
-        let fCfgItem = msgFieldMap[fieldName]
-        if (fieldName == '__FieldCfg') {
-            if (fCfgItem.ifMust == 'NO' && (data == undefined || data == null || data == '' || (typeof data === 'object' && !data.length && !Object.keys(data).length))) {
-                return null
-            }
+        if (isRoot) {
+            fCfgItem = msgFieldMap[fieldName]['__FieldCfg']
+        }
 
-            let retMsgData = ''
-            if (fCfgItem.fieldType == 'STR') {
-                retMsgData = IsStringOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'INT') {
-                retMsgData = IsIntOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'OBJ') {
-                retMsgData = IsObjOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'LIST') {
-                retMsgData = IsListOk(fCfgItem, data)
-            }
-            if (retMsgData) {
-                return retMsgData
-            }
+        if (fCfgItem.fieldType == 'STR') {
+            retMsgData = IsStringOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'INT') {
+            retMsgData = IsIntOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'OBJ') {
+            retMsgData = IsObjOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'LIST') {
+            retMsgData = IsListOk(fCfgItem, data)
+        }
+
+        if (retMsgData) {
+            return retMsgData
+        }
+
+        if (fieldName == '__FieldCfg') {
             continue
         }
-        let fatherFieldType = msgFieldMap['__FieldCfg'].fieldType
-        if (fatherFieldType == 'LIST' || (fatherFieldType == 'OBJ' && msgFieldMap['__FieldCfg'].keyType == 'VOBJ')) {
+        let fatherFieldType = fCfgItem.fieldType
+        if (fatherFieldType == 'LIST' || (fatherFieldType == 'OBJ' && fCfgItem.keyType == 'VOBJ')) {
             for (let idx in data) {
-                retMsgData = cycleCheckParams(fCfgItem, data[idx])
+                retMsgData = cycleCheckParams(msgFieldMap[fieldName], data[idx])
                 if (retMsgData) {
                     return retMsgData
                 }
             }
         } else {
-            retMsgData = cycleCheckParams(fCfgItem, data[fieldName])
+            if (isRoot) {
+                retMsgData = cycleCheckParams(msgFieldMap[fieldName], data)
+            } else {
+                retMsgData = cycleCheckParams(msgFieldMap[fieldName], data[fieldName])
+            }
         }
 
         if (retMsgData) {
@@ -172,6 +182,19 @@ function cycleCheckParams(msgFieldMap, data) {
     return null
 }
 function IsStringOk(fCfgItem, paramValue) {
+    if (!fCfgItem || !fCfgItem.ifMust) {
+        return null
+    }
+
+    if (fCfgItem.ifMust == 'NO' && (
+        paramValue == undefined ||
+        paramValue == null ||
+        paramValue == '' ||
+        (typeof paramValue === 'object' && !paramValue.length && !Object.keys(paramValue).length))
+    ) {
+        return null
+    }
+
     if (!paramValue) {
         return ['NULL_STR_FIELD', fCfgItem.fieldUrl]
     }
@@ -192,7 +215,7 @@ function IsStringOk(fCfgItem, paramValue) {
                     }
                 }
             } else {
-                if (parseInt(rule.exprVal[0]) <= paramValue.length && parseInt(rule.exprVal[1]) >= paramValue.length) {
+                if (paramValue.length >= parseInt(rule.exprVal[0]) && paramValue.length <= parseInt(rule.exprVal[1])) {
                     isPass = true
                 }
             }
@@ -279,6 +302,19 @@ function IsStringOk(fCfgItem, paramValue) {
     return null
 }
 function IsIntOk(fCfgItem, paramValue) {
+    if (!fCfgItem || !fCfgItem.ifMust) {
+        return null
+    }
+
+    if (fCfgItem.ifMust == 'NO' && (
+        paramValue == undefined ||
+        paramValue == null ||
+        paramValue == '' ||
+        (typeof paramValue === 'object' && !paramValue.length && !Object.keys(paramValue).length))
+    ) {
+        return null
+    }
+
     if (paramValue == undefined) {
         return ['NULL_INT_FIELD', fCfgItem.fieldUrl]
     }
@@ -358,6 +394,19 @@ function IsIntOk(fCfgItem, paramValue) {
     return null
 }
 function IsObjOk(fCfgItem, paramValue) {
+    if (!fCfgItem || !fCfgItem.ifMust) {
+        return null
+    }
+
+    if (fCfgItem.ifMust == 'NO' && (
+        paramValue == undefined ||
+        paramValue == null ||
+        paramValue == '' ||
+        (typeof paramValue === 'object' && !paramValue.length && !Object.keys(paramValue).length))
+    ) {
+        return null
+    }
+
     if (!paramValue) {
         return ['NULL_FIELD', fCfgItem.fieldUrl]
     }
@@ -373,6 +422,19 @@ function IsObjOk(fCfgItem, paramValue) {
     return null
 }
 function IsListOk(fCfgItem, paramValue) {
+    if (!fCfgItem || !fCfgItem.ifMust) {
+        return null
+    }
+
+    if (fCfgItem.ifMust == 'NO' && (
+        paramValue == undefined ||
+        paramValue == null ||
+        paramValue == '' ||
+        (typeof paramValue === 'object' && !paramValue.length && !Object.keys(paramValue).length))
+    ) {
+        return null
+    }
+
     if (!paramValue) {
         return ['NULL_FIELD', fCfgItem.fieldUrl]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xzwebx-httpfilter",
-  "version": "1.2.5",
+  "version": "1.3.1",
   "main": "HttpFilter.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"