Merge pull request #261 from postmanlabs/fix/url-string-validation

Fix incorrect string validation for URL
salesforce · Apr 26, 2024 · 50e69bf · 50e69bf
2 parents 1253d58 + cf6debd
commit 50e69bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/cookie.js b/lib/cookie.js
@@ -1116,7 +1116,8 @@ class CookieJar {
   }
 
   setCookie(cookie, url, options, cb) {
-    validators.validate(validators.isNonEmptyString(url), cb, options);
+    validators.validate(validators.isUrlStringOrObject(url), cb, options);
+
     let err;
 
     if (validators.isFunction(url)) {
@@ -1314,7 +1315,8 @@ class CookieJar {
 
   // RFC6365 S5.4
   getCookies(url, options, cb) {
-    validators.validate(validators.isNonEmptyString(url), cb, url);
+    validators.validate(validators.isUrlStringOrObject(url), cb, url);
+
     const context = getCookieContext(url);
     if (validators.isFunction(options)) {
       cb = options;

diff --git a/lib/validators.js b/lib/validators.js
@@ -62,6 +62,14 @@ function isInstanceStrict(data, prototype) {
   }
 }
 
+function isUrlStringOrObject(data) {
+  return (
+    isNonEmptyString(data) ||
+    isObject(data) || // TODO: Check for URL properties that are used.
+    isInstanceStrict(data, URL)
+  );
+}
+
 function isInteger(data) {
   return typeof data === "number" && data % 1 === 0;
 }
@@ -95,4 +103,5 @@ exports.isDate = isDate;
 exports.isEmptyString = isEmptyString;
 exports.isString = isString;
 exports.isObject = isObject;
+exports.isUrlStringOrObject = isUrlStringOrObject;
 exports.validate = validate;