From 09203fd592a4716bbe6e70a527c333d8b8ee418d Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 14 Feb 2022 08:21:56 -0600
Subject: [PATCH] fix(parser): Recognize URLs with passwords

---
 crates/typos/src/tokens.rs | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/crates/typos/src/tokens.rs b/crates/typos/src/tokens.rs
index 46490f5..97e5fae 100644
--- a/crates/typos/src/tokens.rs
+++ b/crates/typos/src/tokens.rs
@@ -422,7 +422,7 @@ mod parser {
                 tuple((char(':'), char('/'), char('/'))),
             )),
             tuple((
-                opt(terminated(take_while1(is_localport_char), char('@'))),
+                opt(terminated(url_userinfo, char('@'))),
                 take_while1(is_domain_char),
                 opt(preceded(char(':'), take_while1(AsChar::is_dec_digit))),
             )),
@@ -432,6 +432,26 @@ mod parser {
         )))(input)
     }
 
+    fn url_userinfo<T>(input: T) -> IResult<T, T>
+    where
+        T: nom::InputTakeAtPosition
+            + nom::InputTake
+            + nom::InputIter
+            + nom::InputLength
+            + nom::Offset
+            + nom::Slice<std::ops::RangeTo<usize>>
+            + nom::Slice<std::ops::RangeFrom<usize>>
+            + Clone
+            + std::fmt::Debug,
+        <T as nom::InputTakeAtPosition>::Item: AsChar + Copy,
+        <T as nom::InputIter>::Item: AsChar + Copy,
+    {
+        recognize(tuple((
+            take_while1(is_localport_char),
+            opt(preceded(char(':'), take_while(is_localport_char))),
+        )))(input)
+    }
+
     fn c_escape<T>(input: T) -> IResult<T, T>
     where
         T: nom::InputTakeAtPosition
@@ -1113,10 +1133,11 @@ mod test {
     fn tokenize_ignore_max_url() {
         let parser = TokenizerBuilder::new().build();
 
-        let input = "Good http://user@example.com:3142/hello?query=value&extra=two#fragment Bye";
+        let input =
+            "Good http://user:password@example.com:3142/hello?query=value&extra=two#fragment Bye";
         let expected: Vec<Identifier> = vec![
             Identifier::new_unchecked("Good", Case::None, 0),
-            Identifier::new_unchecked("Bye", Case::None, 71),
+            Identifier::new_unchecked("Bye", Case::None, 80),
         ];
         let actual: Vec<_> = parser.parse_bytes(input.as_bytes()).collect();
         assert_eq!(expected, actual);