chore: refactor binary coercion and add some tests

Follow-up to #2960
hapijs · Aug 27, 2023 · 4274f62 · 4274f62
1 parent 4e03f19
commit 4274f62
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/lib/types/binary.js b/lib/types/binary.js
@@ -13,20 +13,16 @@ module.exports = Any.extend({
 
     type: 'binary',
 
-    coerce(value, { schema }) {
+    coerce: {
+        from: ['string', 'object'],
+        method(value, { schema }) {
 
-        if (typeof value === 'string') {
-            try {
-                return { value: Buffer.from(value, schema._flags.encoding) };
-            }
-            catch (ignoreErr) { }
-        }
-
-        if (typeof value === 'object' && value !== null && value.type === 'Buffer') {
-            try {
-                return { value: Buffer.from(value, schema._flags.encoding) };
+            if (typeof value === 'string' || (value !== null && value.type === 'Buffer')) {
+                try {
+                    return { value: Buffer.from(value, schema._flags.encoding) };
+                }
+                catch (ignoreErr) { }
             }
-            catch (ignoreErr) { }
         }
     },
 

diff --git a/test/types/binary.js b/test/types/binary.js
@@ -132,6 +132,30 @@ describe('binary', () => {
             ]);
         });
 
+        it('returns an error when malformed JSON object is used', () => {
+
+            Helper.validate(Joi.binary(), [
+                [{ foo: 'bar' }, false, {
+                    message: '"value" must be a buffer or a string',
+                    path: [],
+                    type: 'binary.base',
+                    context: { label: 'value', value: { foo: 'bar' } }
+                }],
+                [null, false, {
+                    message: '"value" must be a buffer or a string',
+                    path: [],
+                    type: 'binary.base',
+                    context: { label: 'value', value: null }
+                }],
+                [{ type: 'Buffer' }, false, {
+                    message: '"value" must be a buffer or a string',
+                    path: [],
+                    type: 'binary.base',
+                    context: { label: 'value', value: { type: 'Buffer' } }
+                }]
+            ]);
+        });
+
         it('returns an error when a JSON encoded & decoded buffer object is used in strict mode', () => {
 
             // Generate Buffer and stringify it as JSON.