evo-cli 0.31.0__tar.gz → 0.31.1__tar.gz

{evo_cli-0.31.0 → evo_cli-0.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.31.0
+Version: 0.31.1
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

evo_cli-0.31.1/evo_cli/VERSION

@@ -0,0 +1 @@
+0.31.1

{evo_cli-0.31.0 → evo_cli-0.31.1}/evo_cli/commands/openvpn.py

@@ -42,12 +42,22 @@ def _table(rows):
             _state_text(state["state"]),
             state.get("vpn_ip", ""),
             (profile.get("remotes") or [""])[0],
-            "yes" if profile.get("password") else "no",
+            _creds(profile),
             "yes" if profile.get("totp") else "no",
         )
     return table
 
 
+def _creds(profile):
+    """CREDS column: a certificate-only profile shows "cert", as it needs no username or password."""
+    if profile.get("password"):
+        return "yes"
+    try:
+        return "no" if vpn.uses_credentials(profile.get("config", "")) else "cert"
+    except vpn.CredentialError:
+        return "no"
+
+
 def _rows():
     profiles = _guard(vpn.profiles)
     return [(name, profiles[name], _guard(vpn.request, name)) for name in sorted(profiles)]
@@ -322,7 +332,7 @@ def connect(name, timeout, sudo_password_stdin, watch):
     _guard(vpn.validate_config, profile["config"])
     if not shutil.which("openvpn"):
         raise click.ClickException("Install OpenVPN first (macOS: brew install openvpn; Linux: your package manager).")
-    if not profile.get("username") or not profile.get("password"):
+    if _guard(vpn.uses_credentials, profile["config"]) and not (profile.get("username") and profile.get("password")):
         raise click.ClickException("Missing credentials; run evo openvpn credentials PROFILE.")
     if _guard(vpn.request, name)["state"] != "STOPPED":
         raise click.ClickException("This profile already has a worker; use status or disconnect first.")

{evo_cli-0.31.0 → evo_cli-0.31.1}/evo_cli/openvpn.py

@@ -178,6 +178,11 @@ def validate_config(text):
     return remotes
 
 
+def uses_credentials(text):
+    """Whether OpenVPN will ask for a username and password; a certificate-only profile never does."""
+    return any(words[0].removeprefix("--") == "auth-user-pass" for _, words in _directives(text))
+
+
 def takes_default_route(text):
     """Whether a profile may take the default route. Only split-tunnel profiles can run beside another VPN.
 

{evo_cli-0.31.0 → evo_cli-0.31.1}/evo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evo_cli
-Version: 0.31.0
+Version: 0.31.1
 Summary: Evolution CLI - a developer toolbox for setting up dev machines
 Author: maycuatroi
 Project-URL: Homepage, https://github.com/maycuatroi/evo-cli

{evo_cli-0.31.0 → evo_cli-0.31.1}/tests/test_openvpn.py

@@ -126,6 +126,21 @@ def test_split_tunnel_is_only_what_provably_keeps_the_default_route(extra, full)
     assert vpn.takes_default_route(CONFIG + extra) is full
 
 
+CERT_ONLY = CONFIG.replace("auth-user-pass\n", "")
+
+
+@pytest.mark.parametrize(
+    "config,expected",
+    [
+        (CONFIG, True),
+        (CERT_ONLY, False),
+        (CERT_ONLY + "<key>\nauth-user-pass\n</key>\n", False),
+    ],
+)
+def test_only_auth_user_pass_asks_for_credentials(config, expected):
+    assert vpn.uses_credentials(config) is expected
+
+
 @pytest.mark.parametrize(
     "platform,output,gateway",
     [
@@ -450,6 +465,35 @@ def test_connect_stacks_a_split_tunnel_beside_a_full_one_only(store, monkeypatch
     assert "default route" not in result.output and started, result.output
 
 
+def test_cert_only_profile_connects_and_lists_without_credentials(store, monkeypatch):
+    vpn.save_profile("cert", {"config": CERT_ONLY})
+    vpn.save_profile("login", {"config": CONFIG})
+    monkeypatch.setattr(vpn, "request", lambda name, command="status": {"state": "STOPPED"})
+    monkeypatch.setattr("evo_cli.commands.openvpn.shutil.which", lambda _: "/fake/openvpn")
+    monkeypatch.setattr("evo_cli.commands.openvpn.os.geteuid", lambda: 0)
+    started = []
+
+    class Exited:
+        def __init__(self):
+            self.stdin = io.BytesIO()
+
+        def poll(self):
+            return 1
+
+    monkeypatch.setattr(
+        "evo_cli.commands.openvpn.subprocess.Popen", lambda command, **_: started.append(command) or Exited()
+    )
+    runner = CliRunner()
+    result = runner.invoke(cli, ["openvpn", "connect", "login", "--no-watch"])
+    assert result.exit_code != 0 and "Missing credentials" in result.output and not started
+    result = runner.invoke(cli, ["openvpn", "connect", "cert", "--no-watch"])
+    assert "Missing credentials" not in result.output and started, result.output
+    rows = {
+        line.split()[1]: line.split()[-2] for line in runner.invoke(cli, ["openvpn", "list"]).output.splitlines()[1:3]
+    }
+    assert rows == {"cert": "cert", "login": "no"}
+
+
 def test_pick_profile_by_number_single_or_prompt(store, monkeypatch):
     runner = CliRunner()
     totp = vpn.parse_totp(SECRET)

evo_cli-0.31.0/evo_cli/VERSION

@@ -1 +0,0 @@
-0.31.0