Fixed a bug preventing hostnames from being validated w/o periods

Fixed for URLs like: - http://instance-data/latest/dynamic/instance-identity/document
danielbankhead · Mar 4, 2017 · da33790 · da33790
1 parent 6696ff5
commit da33790
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/index.js b/index.js
diff --git a/lib/progress-logger.js b/lib/progress-logger.js
diff --git a/lib/request.js b/lib/request.js
diff --git a/lib/url-parser.js b/lib/url-parser.js
@@ -45,8 +45,6 @@ function parseURL (candidate, options) {
     if (results.options.localhostAllowed === false) {
       return results
     }
-  } else if (results.parsedURL.hostname.includes('.') === false) {
-    return results
   } else if (/(^[.-])|([.-]$)/.test(results.parsedURL.hostname)) {
     // hostname should not start with -. nor end with it
     return results

diff --git a/tests/TODO.md b/tests/TODO.md
@@ -24,10 +24,12 @@ if (platform === 'win32') {
   socket = `/${testIdentifier}.sock`
 }
 
+} else if (results.parsedURL.hostname.includes('.') === false) {
+  return results
 
 
 // url
-// https://mathiasbynens.be/demo/url-regex
+// List extracted from: https://mathiasbynens.be/demo/url-regex
 const valid = [
   'http://foo.com/blah_blah',
   'http://foo.com/blah_blah/',
@@ -64,7 +66,8 @@ const valid = [
   'http://-.~_!$&\'()*+,;=:%40:80%2f::::::@example.com',
   'http://1337.net',
   'http://a.b-c.de',
-  'http://223.255.255.254'
+  'http://223.255.255.254',
+  'http://instance-data/latest/dynamic/instance-identity/document'
 ]
 
 const invalid = [
@@ -109,15 +112,15 @@ const invalid = [
   'http://10.1.1.254'
 ]
 
-valid.forEach(item => {if(up(item).isValid === false) {console.log(item)} })
+valid.forEach(item => {
+  if (jetta.urlParser(item).isValid === false) {
+    console.log(item)
+  }
+})
 
 invalid.forEach(item => {
-  const r = up(item, {addMissingProtocol: true})
-  if (r.isValid === true) {
-    console.log(`\`${item}\` hostname: \`${r.parsedURL.hostname}\``)
+  if (jetta.urlParser(item, {addMissingProtocol: true}).isValid === true) {
+    console.log(item)
   }
 })
-
-
-
 ```