ac-sanitizer 3.9.5 → 3.9.9

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="3.9.9"></a>
+
+## [3.9.9](https://github.com/mmpro/ac-sanitizer/compare/v3.9.8..v3.9.9) (2022-01-20 14:57:41)
+
+
+### Bug Fix
+
+* **App:** Update ac-file-extensions package | VD | [13eeb3dccd0154943a08913f719db9df9739582b](https://github.com/mmpro/ac-sanitizer/commit/13eeb3dccd0154943a08913f719db9df9739582b)    
+Update ac-file-extensions package
+<a name="3.9.8"></a>
+
+## [3.9.8](https://github.com/mmpro/ac-sanitizer/compare/v3.9.7..v3.9.8) (2021-11-27 13:26:51)
+
+
+### Bug Fix
+
+* **App:** Package updates | MP | [fa9229b239f26f4e95097b0924c2811f64473639](https://github.com/mmpro/ac-sanitizer/commit/fa9229b239f26f4e95097b0924c2811f64473639)    
+Package updates, incl ac-fileExetnsion 2 (minor code change)
+### Documentation
+
+* **App:** Minor documentation updates | MP | [d3c407c5502b5b8f7bc6479c65afa87567c26ddf](https://github.com/mmpro/ac-sanitizer/commit/d3c407c5502b5b8f7bc6479c65afa87567c26ddf)    
+Minor documentation updates for requirements with conditions. Added FQDN to README
+<a name="3.9.7"></a>
+
+## [3.9.7](https://github.com/mmpro/ac-sanitizer/compare/v3.9.6..v3.9.7) (2021-10-09 17:33:05)
+
+
+### Bug Fix
+
+* **App:** Fix for base64 | MP | [3e83ac766bf2157bdbc5fe8e05da839f85f49c07](https://github.com/mmpro/ac-sanitizer/commit/3e83ac766bf2157bdbc5fe8e05da839f85f49c07)    
+Make sure base64 value is a string
+<a name="3.9.6"></a>
+
+## [3.9.6](https://github.com/mmpro/ac-sanitizer/compare/v3.9.5..v3.9.6) (2021-10-09 10:15:18)
+
+
+### Bug Fix
+
+* **App:** Package updates | MP | [d048ae6ba782418cdf24762c17ad456dc6299d9e](https://github.com/mmpro/ac-sanitizer/commit/d048ae6ba782418cdf24762c17ad456dc6299d9e)    
+Package updates
 <a name="3.9.5"></a>
 
 ## [3.9.5](https://github.com/mmpro/ac-sanitizer/compare/v3.9.4..v3.9.5) (2021-06-18 10:52:58)

package/README.md

@@ -46,13 +46,15 @@ Parameter | Type | Remarks
 --- | --- | --- |
 field | string | Name of the field
 type | string | Type of the field to sanitize, see below for available values
-required | [boolean|string] | Set to true if required or set a path to a param (if that param is set, this value is required)
+required | [boolean OR string] | Set to true if required or set a path[^1] to a param (if that param is set, this value is required)
 enum | [array|string] | Optional list of allowed values. You can a string placeholder for certain standard lists (see below)
 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
 
+[^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.
+
 ### ENUM lists
 The following enum lists are available using a string placeholder
 
@@ -72,6 +74,7 @@ boolean | |
 cidr | | Check CIDR, see example
 integer \| boolean |  | Value can be an integer OR a boolean
 date | dateFormat | Date or date time, support various date formats (e.g. DD.MM.YYYY, DD/MM/YYYY, YYYY-MM-DD, etc) as well as a custom format defined in dateFormat.
+fqdn | wildcardAllowed (bool) | Fully qualified domain names, optional with wildcard subdomain (e.g. *.admiralcloud.com)
 email | | a@b.c
 float | | 0 - 2^31
 fileExtension | |

package/index.js

@@ -264,14 +264,15 @@ const sanitizer = function() {
       }
       else if (field.type === 'base64') {
         if (!_.isString(value)) error = { message: fieldName + '_mustBeString' }
-
-        // value must have a length that can be divided by 4, otherwise it needs padding with =
-        // https://en.wikipedia.org/wiki/Base64#Padding
-        let l = value.length
-        let pad = l % 4
-        if (!validator.isBase64(_.padEnd(value, (l+pad), '='))) error = { message: fieldName + '_notABase64String' }
-        if (field.convert) {
-          _.set(paramsToCheck, fieldName, Buffer.from(value, 'base64').toString())
+        else {
+          // value must have a length that can be divided by 4, otherwise it needs padding with =
+          // https://en.wikipedia.org/wiki/Base64#Padding
+          let l = value.length
+          let pad = l % 4
+          if (!validator.isBase64(_.padEnd(value, (l+pad), '='))) error = { message: fieldName + '_notABase64String' }
+          else if (field.convert) {
+            _.set(paramsToCheck, fieldName, Buffer.from(value, 'base64').toString())
+          }
         }
       }
       else if (field.type === 'countryCode') {
@@ -281,7 +282,7 @@ const sanitizer = function() {
       }
       else if (field.type === 'fileExtension') {
         value = _.toLower(value)
-        if (!_.find(fileExtensions, { ext: value })) {
+        if (!fileExtensions.query({ ext: value })) {
           error = { message: fieldName + '_' + getTypeMapping(field.type, 'errorMessage') }
         }
         _.set(paramsToCheck, fieldName, value)

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "ac-sanitizer",
   "description": "Sanitites payloads based on given field definitions",
-  "author": "Mark Poepping (https://www.mmpro.de)",
+  "author": "Mark Poepping (https://www.admiralcloud.com)",
   "license": "MIT",
-  "repository": "mmpro/ac-sanitizer",
-  "version": "3.9.5",
+  "repository": "admiralcloud/ac-sanitizer",
+  "version": "3.9.9",
   "homepage": "https://www.admiralcloud.com",
   "dependencies": {
-    "ac-countrylist": "^1.0.5",
-    "ac-file-extensions": "^1.2.0",
-    "ac-ip": "^1.3.5",
-    "date-and-time": "^1.0.1",
-    "hashids": "^2.2.8",
+    "ac-countrylist": "^1.0.6",
+    "ac-file-extensions": "^2.0.1",
+    "ac-ip": "^1.3.6",
+    "date-and-time": "^2.0.1",
+    "hashids": "^2.2.10",
     "lodash": "^4.17.21",
-    "validator": "^13.6.0"
+    "validator": "^13.7.0"
   },
   "devDependencies": {
-    "ac-semantic-release": "^0.2.6",
-    "eslint": "^7.28.0",
-    "expect": "^27.0.2",
-    "mocha": "^9.0.0",
+    "ac-semantic-release": "^0.2.7",
+    "eslint": "^8.3.0",
+    "expect": "^27.3.1",
+    "mocha": "^9.1.3",
     "nyc": "^15.1.0"
   },
   "scripts": {

package/test/tests/base64.js

@@ -11,6 +11,7 @@ module.exports = {
       { name: 'Valid base64 with convert', type: 'base64', convert: true, value: 'dGhpcyBpcyBhIGJhc2U2NCBzdHJpbmc=', expected: 'this is a base64 string' },
       { name: 'Invalid base64', type: 'base64', value: 'abc1245', error: 'base64_notABase64String' },
       { name: 'Valid base64', type: 'base64', value: 'PDw/Pz8+Pg==', convert: true, expected: '<<???>>' },
+      { name: 'Invalid base64 with convert', type: 'base64', convert: true, value: 123, error: 'base64_mustBeString' },
       { name: 'Base64 app.admiralcloud.com - requires padding', type: 'base64', value: 'aHR0cHM6Ly9hcHAuYWRtaXJhbGNsb3VkLmNvbQ', convert: true, expected: 'https://app.admiralcloud.com' },
       { name: 'Base64 app.admiralcloud.com - with padding', type: 'base64', value: 'aHR0cHM6Ly9hcHAuYWRtaXJhbGNsb3VkLmNvbQ==', convert: true, expected: 'https://app.admiralcloud.com' },
     ]