fixing parser to accept malformed userinfo (non-encoded email address…

…) - closes #108
medialize · Aug 14, 2013 · aa66fa7 · aa66fa7
1 parent f0dd0c5
commit aa66fa7
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -226,6 +226,7 @@ URI.js is published under the [MIT license](http://www.opensource.org/licenses/m
 ### `[dev-version]` (master branch) ###
 
 * fixing regression for Node.js introduced by `fixing unsafe eval by using UMD's root` - ([Issue #107](https://github.com/medialize/URI.js/issues/107))
+* fixing parser to accept malformed userinfo (non-encoded email address) - ([Issue #108](https://github.com/medialize/URI.js/issues/108))
 
 ### 1.11.1 (August 13th 2013) ###
 

diff --git a/src/URI.js b/src/URI.js
@@ -451,8 +451,10 @@ URI.parseAuthority = function(string, parts) {
 };
 URI.parseUserinfo = function(string, parts) {
     // extract username:password
-    var pos = string.indexOf('@');
     var firstSlash = string.indexOf('/');
+    var pos = firstSlash > -1 
+        ? string.lastIndexOf('@', firstSlash) 
+        : string.indexOf('@');
     var t;
 
     // authority@ must come before /path

diff --git a/test/urls.js b/test/urls.js
@@ -283,6 +283,54 @@ var urls = [{
             idn: false,
             punycode: false
         }
+    }, {
+        name: 'malformed email in userinfo',
+        url: 'scheme://john@doe.com:pass:word@www.example.org/',
+        _url: 'scheme://john%40doe.com:pass%3Aword@www.example.org/',
+        parts: {
+            protocol: 'scheme',
+            username: 'john@doe.com',
+            password: 'pass:word',
+            hostname: 'www.example.org',
+            port: null,
+            path: '/',
+            query: null,
+            fragment: null
+        },
+        accessors: {
+            protocol: 'scheme',
+            username: 'john@doe.com',
+            password: 'pass:word',
+            port: '',
+            path: '/',
+            query: '',
+            fragment: '',
+            resource: '/',
+            authority: 'john%40doe.com:pass%3Aword@www.example.org',
+            userinfo: 'john%40doe.com:pass%3Aword',
+            subdomain: 'www',
+            domain: 'example.org',
+            tld: 'org',
+            directory: '/',
+            filename: '',
+            suffix: '',
+            hash: '',
+            search: '',
+            host: 'www.example.org',
+            hostname: 'www.example.org'
+        },
+        is: {
+            urn: false,
+            url: true,
+            relative: false,
+            name: true,
+            sld: false,
+            ip: false,
+            ip4: false,
+            ip6: false,
+            idn: false,
+            punycode: false
+        }
     }, {
         name: 'host-relative: URL',
         url: '/some/directory/file.html?query=string#fragment',