Invalid URLs should not crash

Fixes: #15
npm · Mar 17, 2017 · 2abf481 · 2abf481
1 parent dd8a713
commit 2abf481
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/index.js b/index.js
@@ -30,30 +30,33 @@ module.exports.fromUrl = function (giturl) {
   )
   var parsed = parseGitUrl(url)
   var matches = Object.keys(gitHosts).map(function (gitHostName) {
-    var gitHostInfo = gitHosts[gitHostName]
-    var auth = null
-    if (parsed.auth && authProtocols[parsed.protocol]) {
-      auth = decodeURIComponent(parsed.auth)
+    try {
+      var gitHostInfo = gitHosts[gitHostName]
+      var auth = null
+      if (parsed.auth && authProtocols[parsed.protocol]) {
+        auth = decodeURIComponent(parsed.auth)
+      }
+      var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
+      var user = null
+      var project = null
+      var defaultRepresentation = null
+      if (parsed.protocol === gitHostName + ':') {
+        user = decodeURIComponent(parsed.host)
+        project = parsed.path && decodeURIComponent(parsed.path.replace(/^[/](.*?)(?:[.]git)?$/, '$1'))
+        defaultRepresentation = 'shortcut'
+      } else {
+        if (parsed.host !== gitHostInfo.domain) return
+        if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
+        var pathmatch = gitHostInfo.pathmatch
+        var matched = parsed.path.match(pathmatch)
+        if (!matched) return
+        if (matched[1] != null) user = decodeURIComponent(matched[1])
+        if (matched[2] != null) project = decodeURIComponent(matched[2])
+        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+      }
+      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation)
+    } catch (_) {
     }
-    var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
-    var user = null
-    var project = null
-    var defaultRepresentation = null
-    if (parsed.protocol === gitHostName + ':') {
-      user = decodeURIComponent(parsed.host)
-      project = parsed.path && decodeURIComponent(parsed.path.replace(/^[/](.*?)(?:[.]git)?$/, '$1'))
-      defaultRepresentation = 'shortcut'
-    } else {
-      if (parsed.host !== gitHostInfo.domain) return
-      if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
-      var pathmatch = gitHostInfo.pathmatch
-      var matched = parsed.path.match(pathmatch)
-      if (!matched) return
-      if (matched[1] != null) user = decodeURIComponent(matched[1])
-      if (matched[2] != null) project = decodeURIComponent(matched[2])
-      defaultRepresentation = protocolToRepresentation(parsed.protocol)
-    }
-    return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation)
   }).filter(function (gitHostInfo) { return gitHostInfo })
   if (matches.length !== 1) return
   return matches[0]

diff --git a/test/basic.js b/test/basic.js
@@ -12,5 +12,10 @@ test('basic', function (t) {
   t.is(HostedGit.fromUrl('git@github.com:abc/def').getDefaultRepresentation(), 'sshurl', 'match ssh connect strings')
   t.is(HostedGit.fromUrl('git://github.com/abc/def').getDefaultRepresentation(), 'git', 'match git urls')
   t.is(HostedGit.fromUrl('github:abc/def').getDefaultRepresentation(), 'shortcut', 'match shortcuts')
+
+  t.is(HostedGit.fromUrl('git+ssh://git@nothosted.com/abc/def'), undefined, 'non-hosted URLs get undefined response')
+  t.is(HostedGit.fromUrl('git://nothosted.com'), undefined, 'non-hosted empty URLs get undefined response')
+  t.is(HostedGit.fromUrl('git://github.com/balderdashy/waterline-%s.git'), undefined, 'invalid URLs get undefined response')
+  t.is(HostedGit.fromUrl('git://github.com'), undefined, 'Invalid hosted URLs get undefined response')
   t.end()
 })