Skip to content

Commit

Permalink
fix(utils): make isFormData detection logic stricter to avoid unneces…
Browse files Browse the repository at this point in the history
…sary calling of the `toString` method on the target; (#5661)
  • Loading branch information
DigitalBrainJS committed Apr 19, 2023
1 parent 0abc705 commit aa372f7
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 5 deletions.
14 changes: 9 additions & 5 deletions lib/utils.js
Expand Up @@ -188,12 +188,16 @@ const isStream = (val) => isObject(val) && isFunction(val.pipe);
* @returns {boolean} True if value is an FormData, otherwise false
*/
const isFormData = (thing) => {
const pattern = '[object FormData]';
let kind;
return thing && (
(typeof FormData === 'function' && thing instanceof FormData) ||
toString.call(thing) === pattern ||
(isFunction(thing.toString) && thing.toString() === pattern)
);
(typeof FormData === 'function' && thing instanceof FormData) || (
isFunction(thing.append) && (
(kind = kindOf(thing)) === 'formdata' ||
// detect form-data instance
(kind === 'object' && isFunction(thing.toString) && thing.toString() === '[object FormData]')
)
)
)
}

/**
Expand Down
31 changes: 31 additions & 0 deletions test/unit/utils/utils.js
Expand Up @@ -22,6 +22,37 @@ describe('utils', function (){
});
assert.equal(utils.isFormData(new FormData()), true);
});

it('should not call toString method on built-in objects instances', () => {
const buf = Buffer.from('123');

buf.toString = () => assert.fail('should not be called');

assert.equal(utils.isFormData(buf), false);
});

it('should not call toString method on built-in objects instances, even if append method exists', () => {
const buf = Buffer.from('123');

buf.append = () => {};

buf.toString = () => assert.fail('should not be called');

assert.equal(utils.isFormData(buf), false);
});

it('should detect custom FormData instances by toStringTag signature and append method presence', () => {
class FormData {
append(){

}

get [Symbol.toStringTag]() {
return 'FormData';
}
}
assert.equal(utils.isFormData(new FormData()), true);
});
});

describe('toJSON', function (){
Expand Down

0 comments on commit aa372f7

Please sign in to comment.