support for ipv4 in extractor + better subcommands

Author: tamton-aquib

bacon.toml

@@ -10,7 +10,7 @@ default_job = "run"
 # way. Don't forget the `--color always` part or the errors won't be
 # properly parsed.
 [jobs.run]
-command = ["cargo", "run", "extract", "phone", "target/nice.norg", "--color", "always"]
+command = ["cargo", "run", "ip", "todo.norg", "--color", "always"]
 need_stdout = true
 
 # You may define here keybindings that would be specific to

src/extract.rs

@@ -28,13 +28,22 @@ impl Extractor {
             .map(|i| i[0].to_string())
             .collect()
     }
+
+    fn ips(&self) -> Vec<String> {
+        Regex::new(r"((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}")
+            .unwrap()
+            .captures_iter(&self.contents)
+            .map(|i| i[0].to_string())
+            .collect()
+    }
 }
 
 pub fn extractor(xtype: &str, filename: &str) -> String {
     let extract = Extractor::new(filename);
     let matches = match xtype {
-        "email" | "emails" | "e" | "mails" | "mail" => extract.emails(),
-        "phone" | "mobile" | "phones" | "numbers" => extract.phones(),
+        "email" => extract.emails(),
+        "phone" => extract.phones(),
+        "ip" => extract.ips(),
         _ => todo!(),
     };
 

src/lib.rs

@@ -82,5 +82,6 @@ mod tests {
     fn check_extractor() {
         assert!(extract::extractor("email", "Cargo.toml").contains("aquibjavedt007@gmail.com"));
         assert!(extract::extractor("phone", "todo.norg").contains("9388884586"));
+        assert!(extract::extractor("ip", "todo.norg").contains("1.1.1.1"));
     }
 }

src/main.rs

@@ -68,7 +68,9 @@ fn main() {
         "ascii" => general::ascii(query),
 
         //Extractor
-        "extract" => extract::extractor(query, &args[3]),
+        "email" | "emails" | "mails" | "mail" => extract::extractor("email", query),
+        "phone" | "phones" | "mobile" | "number" => extract::extractor("phone", query),
+        "ipv4" | "ip" | "ips" => extract::extractor("ip", query),
 
         // Analyzer
         // "strings" | "string" | "rb" => analyze::read_binary(query, &args[2]),

todo.norg

@@ -49,11 +49,11 @@ version: 0.0.13
     - [ ] base85
 
 ** Extarctors (extract from string)
-   - [x] phone, email  +test strings: aquibjavedt007@gmail.com, 9388884586+
-   - [ ] ip, mac, date formats, etc
+   - [x] phone, email, ip  +test strings: aquibjavedt007@gmail.com, 9388884586+
+   - [ ] mac, date formats, etc +192.168.1.1  1.1.1.1 255.255.255.0+
    - [ ] exif metadata.
-   - [ ] extract from binary flag format
-   - [ ] magic bytes
+   - [ ] extract flag format from a binary file.
+   - [ ] magic bytes.
 
 **  Advanced
     - [ ] Advanced stuff (maybe wont do this)