Merge pull request #444 from Tari-dev/main

feat: add support for password extractor

Author: languitar

passgithelper.py

@@ -314,6 +314,12 @@ def get_value(
     ),
     "entry_name": EntryNameExtractor(option_suffix="_username"),
 }
+_password_extractors = {
+    _line_extractor_name: SpecificLineExtractor(0, 0, option_suffix="_password"),
+    "regex_search": RegexSearchExtractor(
+        r"^password: +(.*)$", option_suffix="_password"
+    ),
+}
 
 
 def find_mapping_section(
@@ -386,7 +392,17 @@ def get_password(
 
     pass_target = define_pass_target(section, request)
 
-    password_extractor = SpecificLineExtractor(0, 0, option_suffix="_password")
+    password_extractor_name: str = section.get("password_extractor")  # type: ignore
+
+    if password_extractor_name:
+        password_extractor = _password_extractors.get(password_extractor_name)
+    else:
+        password_extractor = SpecificLineExtractor(0, 0, option_suffix="_password")
+
+    if password_extractor is None:
+        raise ValueError(
+            f"A password_extractor of type '{password_extractor_name}' does not exist"
+        )
     password_extractor.configure(section)
 
     username_extractor_name: str = section.get(  # type: ignore

test_data/regex-password-extraction/git-pass-mapping.ini

@@ -0,0 +1,6 @@
+[mytest.com]
+username_extractor=regex_search
+regex_username=^myuser: (.*)$
+password_extractor=regex_search
+regex_password=^myauth: (.*)$
+target=dev/mytest

…ta/regex-extraction/git-pass-mapping.ini …username-extraction/git-pass-mapping.initest_data/regex-extraction/git-pass-mapping.ini renamed to test_data/regex-username-extraction/git-pass-mapping.ini test_data/regex-extraction/git-pass-mapping.ini renamed to test_data/regex-username-extraction/git-pass-mapping.ini

@@ -0,0 +1,5 @@
+[DEFAULT]
+password_extractor=doesntexist
+
+[mytest.com]
+target=dev/mytest

test_data/unknown-password-extractor/git-pass-mapping.ini

@@ -373,7 +373,7 @@ def test_prefix_skipping(self, capsys: Any) -> None:
         indirect=True,
     )
     @pytest.mark.usefixtures("helper_config")
-    def test_select_unknown_extractor(self, capsys: Any) -> None:
+    def test_select_unknown_username_extractor(self, capsys: Any) -> None:
         with pytest.raises(SystemExit):
             passgithelper.main(["get"])
         _, err = capsys.readouterr()
@@ -383,7 +383,7 @@ def test_select_unknown_extractor(self, capsys: Any) -> None:
         "helper_config",
         [
             HelperConfig(
-                "test_data/regex-extraction",
+                "test_data/regex-username-extraction",
                 """
 protocol=https
 host=mytest.com""",
@@ -421,6 +421,47 @@ def test_entry_name_is_user(self, capsys: Any) -> None:
         out, _ = capsys.readouterr()
         assert out == "password=xyz\nusername=myuser\n"
 
+    @pytest.mark.parametrize(
+        "helper_config",
+        [
+            HelperConfig(
+                "test_data/unknown-password-extractor",
+                """
+protocol=https
+host=mytest.com""",
+                b"ignored",
+            ),
+        ],
+        indirect=True,
+    )
+    @pytest.mark.usefixtures("helper_config")
+    def test_select_unknown_password_extractor(self, capsys: Any) -> None:
+        with pytest.raises(SystemExit):
+            passgithelper.main(["get"])
+        _, err = capsys.readouterr()
+        assert "password_extractor of type 'doesntexist' does not exist" in err
+
+    @pytest.mark.parametrize(
+        "helper_config",
+        [
+            HelperConfig(
+                "test_data/regex-password-extraction",
+                """
+protocol=https
+host=mytest.com""",
+                b"xyz\nsomeline\nmyauth: mygreattoken\nmorestuff\nmyuser: tester\n",
+                "dev/mytest",
+            ),
+        ],
+        indirect=True,
+    )
+    @pytest.mark.usefixtures("helper_config")
+    def test_regex_password_selection(self, capsys: Any) -> None:
+        passgithelper.main(["get"])
+
+        out, _ = capsys.readouterr()
+        assert out == "password=mygreattoken\nusername=tester\n"
+
     @pytest.mark.parametrize(
         "helper_config",
         [