ac-sanitizer 3.10.2 → 3.10.5

package/CHANGELOG.md

@@ -1,3 +1,56 @@
+<a name="3.10.5"></a>
+
+## [3.10.5](https://github.com/mmpro/ac-sanitizer/compare/v3.10.4..v3.10.5) (2022-06-25 09:02:28)
+
+
+### Bug Fix
+
+* **App:** Add strict mode to objects | MP | [e9cbaff3f1c8214e20a38472da0a02494d81a2d5](https://github.com/mmpro/ac-sanitizer/commit/e9cbaff3f1c8214e20a38472da0a02494d81a2d5)    
+In strict mode payload with non-defined properties will cause an error.  
+Related issues: [/issues#undefined](https://github.com//issues/undefined)
+### Chores
+
+* **App:** Updated packages | MP | [e727e41a06453120d675d10959ae5792262278ae](https://github.com/mmpro/ac-sanitizer/commit/e727e41a06453120d675d10959ae5792262278ae)    
+Updated packages  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+<a name="3.10.4"></a>
+
+## [3.10.4](https://github.com/mmpro/ac-sanitizer/compare/v3.10.3..v3.10.4) (2022-06-08 18:30:35)
+
+
+### Bug Fix
+
+* **App:** Move from jest to chai/expect | MP | [14369812c3e5a43f32f5490b9d9503bca5e9d4c9](https://github.com/mmpro/ac-sanitizer/commit/14369812c3e5a43f32f5490b9d9503bca5e9d4c9)    
+Move from jest to chai/expect  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+* **App:** Package updates | MP | [57337f5328b0ae478e477fc72bc26b89ddc28662](https://github.com/mmpro/ac-sanitizer/commit/57337f5328b0ae478e477fc72bc26b89ddc28662)    
+Package updates  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+### Chores
+
+* **App:** Updated packages | MP | [4cf217a833b79b87bb0b3380a49e48de11309192](https://github.com/mmpro/ac-sanitizer/commit/4cf217a833b79b87bb0b3380a49e48de11309192)    
+Updated packages  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+### Chores
+
+* **App:** Updated gitignore | MP | [a760b76abe278962e29d982a3515bccd23d88310](https://github.com/mmpro/ac-sanitizer/commit/a760b76abe278962e29d982a3515bccd23d88310)    
+Updated gitignore  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+<a name="3.10.3"></a>
+
+## [3.10.3](https://github.com/mmpro/ac-sanitizer/compare/v3.10.2..v3.10.3) (2022-05-15 15:04:15)
+
+
+### Bug Fix
+
+* **App:** Allow array of objects for enum/allowed values | MP | [b8ed58e8ece9e6b11efa25b3f65ebaa77d690dc2](https://github.com/mmpro/ac-sanitizer/commit/b8ed58e8ece9e6b11efa25b3f65ebaa77d690dc2)    
+Allow array of objects for enum/allowed values  
+Related issues: [/issues#undefined](https://github.com//issues/undefined)
+### Chores
+
+* **App:** Updated packages | MP | [1912835f9d881df59806c19275621d83feeb55ac](https://github.com/mmpro/ac-sanitizer/commit/1912835f9d881df59806c19275621d83feeb55ac)    
+Updated packages  
+Related issues: [/issues#undefined](https://github.com//issues/undefined)
 <a name="3.10.2"></a>
 
 ## [3.10.2](https://github.com/mmpro/ac-sanitizer/compare/v3.10.1..v3.10.2) (2022-04-28 11:21:08)

package/README.md

@@ -52,6 +52,7 @@ adminLevel | [integer] | Optional adminLevel required for this field
 omitFields | [boolean] | If adminLevel is set and you do not have the proper adminLevel the sanitizer will just omit the field (and not return an error) if omitFields is true
 convert | [boolean|string] | Some types can be automatically converted (e.g. base64 to string)
 valueType | [string] | Use it to sanitize values of an array by defining the allowed type here
+strict | [boolean] | For objects only - if true and payload contains a property not defined, an error will be returned.
 
 [^1]: The path must be set with the parent propery as root, e.g. the actual field is settings.video.width, in property video the condition is then just "width" not the full path.
 
@@ -130,10 +131,32 @@ let test = sanitizer.checkAndSanitizeValues(fieldsToCheck)
 
 ```
 
+## Objects
+By default properties which are not defined will be ignored and removed from payload.
+
+### Objects with strict mode activate
+In strict mode, only defined properties are allowed.
+```
+let fieldsToCheck = {
+  params: {
+    settings: {
+      allowed: true,
+      notAllowed: true
+    }
+  },
+  fields: [
+    { field: 'settings', type: 'object', strict: true, properties: [
+      { field: 'allowed', type: 'boolean' }
+    ] }
+  ]
+}
+let test = sanitizer.checkAndSanitizeValues(fieldsToCheck)
+// error: object_settings_containsInvalidProperties
+
+```
+
 ## Links
 - [Website](https://www.admiralcloud.com/)
-- [Twitter (@admiralcloud)](https://twitter.com/admiralcloud)
-- [Facebook](https://www.facebook.com/MediaAssetManagement/)
 
 ## License
-[MIT License](https://opensource.org/licenses/MIT) Copyright © 2009-present, AdmiralCloud, Mark Poepping
+[MIT License](https://opensource.org/licenses/MIT) Copyright © 2009-present, AdmiralCloud AG, Mark Poepping

package/index.js

@@ -283,6 +283,16 @@ const sanitizer = function() {
           error = schema.verify(value)
         }
 
+        // strict mode -> if true, then check payload against definition and return error if a non-defined property is in payload
+        if (_.get(field, 'strict')) {
+          let propsInPayload = _.keys(value)
+          let definedProps = _.map(_.get(field, 'properties'), 'field')
+          let diff = _.difference(propsInPayload, definedProps)
+          if (_.size(diff)) {
+            error = { message: fieldName + '_containsInvalidProperties', additionalInfo: { properties: diff } }
+          }
+        }
+
         // modern approach without verify function: 
         // object can have properties with the same structure as the original field
         if (!error && _.get(field, 'properties')) {
@@ -456,11 +466,11 @@ const sanitizer = function() {
 
       if (!error && allowedValues && value) {
         if (_.isArray(value)) {
-          if (_.size(value) && !_.size(_.intersection(value, allowedValues))) {
+          if (_.size(value) && !_.size(_.intersectionWith(value, allowedValues, _.isEqual))) {
             error = { message: fieldName + '_notAnAllowedValue', additionalInfo: { value } }
           }
           // remove non-matching entries, but do not fail/return error
-          value = _.intersection(value, allowedValues)
+          value = _.intersectionWith(value, allowedValues, _.isEqual)
           _.set(paramsToCheck, fieldName, value)
         }
         else if (_.indexOf(allowedValues, value) < 0) {

package/package.json

@@ -4,22 +4,22 @@
   "author": "Mark Poepping (https://www.admiralcloud.com)",
   "license": "MIT",
   "repository": "admiralcloud/ac-sanitizer",
-  "version": "3.10.2",
+  "version": "3.10.5",
   "homepage": "https://www.admiralcloud.com",
   "dependencies": {
-    "ac-countrylist": "^1.0.6",
+    "ac-countrylist": "^1.0.7",
     "ac-file-extensions": "^2.0.5",
-    "ac-ip": "^1.3.7",
-    "date-and-time": "^2.3.1",
+    "ac-ip": "^2.0.0",
+    "chai": "^4.3.6",
+    "date-and-time": "^2.4.0",
     "hashids": "^2.2.10",
     "lodash": "^4.17.21",
     "validator": "^13.7.0"
   },
   "devDependencies": {
     "ac-semantic-release": "^0.3.0",
-    "eslint": "^8.14.0",
-    "expect": "^27.5.1",
-    "mocha": "^9.2.2",
+    "eslint": "^8.18.0",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0"
   },
   "scripts": {

package/test/test.js

@@ -1,5 +1,8 @@
 const _ = require('lodash')
 
+const { expect } = require('chai')
+global.expect = expect
+
 const testMode = _.get(process, 'env.TESTMODE', false)
 
 const suite = {

package/test/tests/any.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -30,13 +29,13 @@ module.exports = {
         }
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.eql(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.any')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.any')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/array.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -29,6 +28,8 @@ module.exports = {
       { name: 'Array with maxSize - fail', type: 'array', value: ['a', 'b'], maxSize: 1, error: 'array_maxSizeBoundary' },
       { name: 'Array of fileExtensions', type: 'array', valueType: 'fileExtension', value: ['jpg'], expected: ['jpg'] },
       { name: 'Array of fileExtensions - contains invalid', type: 'array', valueType: 'fileExtension', value: ['jpg', 'textimage'], error: 'array_atLeastOneValueFailed' },
+      { name: 'Array of objects - valid', type: 'array', value: [{ 'createdAt': 'asc' }], enum: [{ 'createdAt': 'asc' }], expected: [{ 'createdAt': 'asc' }] },
+      { name: 'Array of objects - invalid', type: 'array', value: [{ 'createdAt': 'desc' }], enum: [{ 'createdAt': 'asc' }], error: 'array_notAnAllowedValue' },
     ]
 
 
@@ -51,13 +52,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.array')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.array')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/base64.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -29,13 +28,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.base64')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.base64')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/bool.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -29,13 +28,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.bool')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.bool')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/boolOrInteger.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -25,13 +24,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.boolOrInteger')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.boolOrInteger')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/cidr.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -30,13 +29,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.cidr')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.cidr')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/country.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -26,13 +25,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.countryCode')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.countryCode')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/date.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -32,13 +31,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.date')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.date')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/email.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -27,13 +26,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.email')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.email')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/error.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -28,13 +27,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.email')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.email')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/fileExtension.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -26,13 +25,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.fileExtension')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.fileExtension')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/fqdn.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -24,13 +23,13 @@ module.exports = {
         }
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.fqdn')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.fqdn')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/gps.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -29,13 +28,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.gps')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.gps')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/hashIds.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
  
 const Hashids = require('hashids/cjs')
@@ -29,13 +28,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.hashids')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.hashids')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/hexColor.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -26,13 +25,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.hexColor')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.hexColor')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/ip.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -27,13 +26,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.ip')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.ip')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/iso639.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -32,13 +31,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(test, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.language')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.language')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/number.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -81,13 +80,13 @@ module.exports = {
 
               let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
               if (_.get(test, 'error')) {
-                expect(_.get(r, 'error.message')).toEqual(test.error)
+                expect(_.get(r, 'error.message')).to.equal(test.error)
                 if (_.get(test, 'additionalInfo')) {
-                  expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+                  expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
                 }
               }
               else {
-                expect(_.get(r, 'params.integer')).toEqual(_.get(test, 'expected'))
+                expect(_.get(r, 'params.integer')).to.equal(_.get(test, 'expected'))
               }
               return done()
             })
@@ -117,13 +116,13 @@ module.exports = {
   
           let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
           if (_.get(r, 'error')) {
-            expect(_.get(r, 'error.message')).toEqual(test.error)
+            expect(_.get(r, 'error.message')).to.eql(test.error)
             if (_.get(test, 'additionalInfo')) {
-              expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+              expect(_.get(r, 'error.additionalInfo')).to.eql(_.get(test, 'additionalInfo'))
             }
           }
           else {
-            expect(_.get(r, 'params.number')).toEqual(_.get(test, 'expected'))
+            expect(_.get(r, 'params.number')).to.eql(_.get(test, 'expected'))
           }
           return done()
         })

package/test/tests/object.js

@@ -1,5 +1,4 @@
 const _ = require("lodash");
-const expect = require("expect");
 const sanitizer = require("../../index");
 
 module.exports = {
@@ -34,6 +33,23 @@ module.exports = {
           enum: "blue",
         },
       },
+      {
+        name: "Object with non-allowed properties - do not ignore in strict mode",
+        type: "object",
+        properties: [
+          { field: "settings", type: "object", strict: true, properties:[
+            { field: 'allowed', type: 'boolean' }
+          ] },
+        ],
+        value: {
+          settings: {
+            allowed: true,
+            notAllowed: true
+          }
+        },
+        error: "object_settings_containsInvalidProperties",
+        additionalInfo: { properties: ['notAllowed'] }
+      },
       {
         name: "Object with nested properties - missing nested property",
         type: "object",
@@ -182,13 +198,13 @@ module.exports = {
         };
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck);
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.eql(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, "params.object")).toEqual(_.get(test, "expected"));
+          expect(_.get(r, "params.object")).to.eql(_.get(test, "expected"));
         }
         return done();
       });

package/test/tests/ratio.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -27,13 +26,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.ratio')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.ratio')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/rgb.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -29,13 +28,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.rgb')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.rgb')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/string.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -33,13 +32,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.eql(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.string')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.string')).to.eql(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/stringOrInteger.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -27,13 +26,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.stringOrInteger')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.stringOrInteger')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/url.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
 
 module.exports = {
@@ -25,13 +24,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.url')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.url')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })

package/test/tests/uuid.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const expect = require('expect')
 const sanitizer = require('../../index')
  
 
@@ -26,13 +25,13 @@ module.exports = {
 
         let r = sanitizer.checkAndSanitizeValues(fieldsToCheck)
         if (_.get(r, 'error')) {
-          expect(_.get(r, 'error.message')).toEqual(test.error)
+          expect(_.get(r, 'error.message')).to.equal(test.error)
           if (_.get(test, 'additionalInfo')) {
-            expect(_.get(r, 'error.additionalInfo')).toEqual(_.get(test, 'additionalInfo'))
+            expect(_.get(r, 'error.additionalInfo')).to.equal(_.get(test, 'additionalInfo'))
           }
         }
         else {
-          expect(_.get(r, 'params.uuid')).toEqual(_.get(test, 'expected'))
+          expect(_.get(r, 'params.uuid')).to.equal(_.get(test, 'expected'))
         }
         return done()
       })