devconfig-gen-singbox 2.1.3__tar.gz → 2.1.4__tar.gz

{devconfig_gen_singbox-2.1.3/src/devconfig_gen_singbox.egg-info → devconfig_gen_singbox-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.3
+Version: 2.1.4
 Summary: Provider-based developer configuration generation engine and CLI
 Author-email: henryliu443 <henryliu443@gmail.com>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Dynamic: license-file
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.3-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.4-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/README.md

@@ -3,7 +3,7 @@
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.3-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.4-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devconfig_gen_singbox"
-version = "2.1.3"
+version = "2.1.4"
 authors = [
   { name = "henryliu443", email = "henryliu443@gmail.com" },
 ]

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/src/devconfig_gen/__init__.py

@@ -66,4 +66,4 @@ __all__ = [
     "loads",
     "validate_request",
 ]
-__version__ = "2.1.3"
+__version__ = "2.1.4"

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4/src/devconfig_gen_singbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.3
+Version: 2.1.4
 Summary: Provider-based developer configuration generation engine and CLI
 Author-email: henryliu443 <henryliu443@gmail.com>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Dynamic: license-file
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.3-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.4-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/src/devconfig_gen_singbox.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ src/singbox_ops/adapters/base.py
 src/singbox_ops/adapters/acme/__init__.py
 src/singbox_ops/adapters/acme/base.py
 src/singbox_ops/adapters/acme/cloudflare_dns01.py
+src/singbox_ops/adapters/acme/prune.py
 src/singbox_ops/adapters/dns/__init__.py
 src/singbox_ops/adapters/dns/base.py
 src/singbox_ops/adapters/dns/cloudflare.py

devconfig_gen_singbox-2.1.4/src/singbox_ops/adapters/acme/__init__.py

@@ -0,0 +1,8 @@
+"""ACME certificate adapters."""
+
+from __future__ import annotations
+
+from .cloudflare_dns01 import CloudflareDNS01ACME
+from .prune import DEFAULT_ACME_HOME, plan_prune, prune_certs
+
+__all__ = ["CloudflareDNS01ACME", "DEFAULT_ACME_HOME", "plan_prune", "prune_certs"]

devconfig_gen_singbox-2.1.4/src/singbox_ops/adapters/acme/prune.py

@@ -0,0 +1,56 @@
+"""Prune stale acme.sh certificate directories.
+
+Only ``<acme_home>/<host>_ecc`` directories are ever considered. Anything whose
+host is not in the keep set is removed. The operation refuses to run with an
+empty keep set, and defaults to a dry run, so a slip can never wipe every
+certificate (the failure mode of hand-rolled shell).
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Mapping, Sequence
+
+from ...core.command import CommandRunner, LocalCommandRunner
+from ...core.exceptions import AdapterError
+
+DEFAULT_ACME_HOME = "/root/.acme.sh"
+SUFFIX = "_ecc"
+
+
+def plan_prune(
+    runner: CommandRunner,
+    acme_home: str,
+    keep_hosts: Sequence[str],
+) -> "tuple[list, list]":
+    keep_set = {str(item).strip() for item in keep_hosts if str(item).strip()}
+    if not keep_set:
+        raise AdapterError("refusing to prune: no hosts to keep")
+    try:
+        entries = runner.listdir(acme_home)
+    except OSError as exc:
+        raise AdapterError(f"cannot list {acme_home}: {exc}") from exc
+
+    keep: list = []
+    remove: list = []
+    for entry in entries:
+        if not entry.endswith(SUFFIX):
+            continue
+        domain = entry[: -len(SUFFIX)]
+        (keep if domain in keep_set else remove).append(entry)
+    return keep, remove
+
+
+def prune_certs(
+    runner: CommandRunner,
+    acme_home: str = DEFAULT_ACME_HOME,
+    keep_hosts: Sequence[str] = (),
+    dry_run: bool = True,
+) -> Mapping[str, object]:
+    keep, remove = plan_prune(runner, acme_home, keep_hosts)
+    result = {"acme_home": acme_home, "keep": sorted(keep), "remove": sorted(remove), "dry_run": dry_run}
+    if dry_run:
+        return result
+    for entry in remove:
+        runner.run(["rm", "-rf", os.path.join(acme_home, entry)], check=False)
+    return result

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/src/singbox_ops/cli.py

@@ -33,6 +33,7 @@ SUBCOMMANDS = (
     ("deploy", "Deploy sing-box (interactive wizard when --plan is omitted)"),
     ("redeploy", "Regenerate credentials and redeploy"),
     ("destroy", "Tear down what a previous deploy created"),
+    ("certs", "Prune stale acme.sh certificate dirs (dry-run unless --apply)"),
 )
 
 
@@ -46,6 +47,14 @@ def add_subparsers(sub) -> None:
         command.add_argument("--protocols", help="Comma-separated protocols (skips that prompt)")
         if name == "plan":
             command.add_argument("--output", default="plan.yaml", help="Where to write the plan")
+        if name == "certs":
+            command.add_argument("--keep", required=True, help="Comma-separated hosts to keep")
+            command.add_argument("--acme-home", default="/root/.acme.sh", help="acme.sh home dir")
+            command.add_argument(
+                "--apply",
+                action="store_true",
+                help="Actually delete (default is a dry run)",
+            )
         if name == "context":
             command.add_argument("--format", choices=("json", "yaml"), help="Output format")
         if name in ("deploy", "redeploy", "destroy"):
@@ -142,6 +151,22 @@ def _detect_or_placeholder(plan) -> str:
 
 def _run(args) -> int:
     try:
+        if getattr(args, "command", None) == "certs":
+            from .adapters.acme.prune import DEFAULT_ACME_HOME, prune_certs
+            from .core.command import LocalCommandRunner, RecordingRunner
+
+            keep = [item for item in (getattr(args, "keep", "") or "").split(",") if item.strip()]
+            dry_run = not bool(getattr(args, "apply", False))
+            runner = RecordingRunner() if dry_run else LocalCommandRunner()
+            result = prune_certs(
+                runner,
+                acme_home=getattr(args, "acme_home", DEFAULT_ACME_HOME),
+                keep_hosts=keep,
+                dry_run=dry_run,
+            )
+            print(json.dumps(result, indent=2, ensure_ascii=False))
+            return 0
+
         if getattr(args, "plan", None):
             plan = load_plan(args.plan)
         elif args.command == "destroy":

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/src/singbox_ops/core/command.py

@@ -55,6 +55,9 @@ class CommandRunner:
     def islink(self, path) -> bool:
         raise NotImplementedError
 
+    def listdir(self, path) -> List[str]:
+        raise NotImplementedError
+
     def mkdir(self, path, *, mode: Optional[int] = None) -> None:
         raise NotImplementedError
 
@@ -113,6 +116,9 @@ class LocalCommandRunner(CommandRunner):
     def islink(self, path) -> bool:
         return Path(path).is_symlink()
 
+    def listdir(self, path) -> List[str]:
+        return sorted(os.listdir(str(path)))
+
     def mkdir(self, path, *, mode: Optional[int] = None) -> None:
         target = Path(path)
         target.mkdir(parents=True, exist_ok=True)
@@ -149,6 +155,7 @@ class RecordingRunner(CommandRunner):
         self.links: List[Tuple[str, str]] = []
         self._existing = set(str(item) for item in (existing or ()))
         self._files = {}
+        self._dirs = {}
 
     def run(self, args: Sequence[str], *, check: bool = True, env=None) -> CommandResult:
         self.commands.append(("run", tuple(str(item) for item in args), dict(env or {})))
@@ -173,9 +180,13 @@ class RecordingRunner(CommandRunner):
     def islink(self, path) -> bool:
         return False
 
+    def listdir(self, path) -> List[str]:
+        return sorted(self._dirs.get(str(path), set()))
+
     def mkdir(self, path, *, mode: Optional[int] = None) -> None:
         self.directories.append((str(path), mode))
         self._existing.add(str(path))
+        self._dirs.setdefault(str(path), set())
 
     def unlink(self, path, *, missing_ok: bool = True) -> None:
         self.removed.append(str(path))

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/tests/test_singbox_ops_acme.py

@@ -1,7 +1,9 @@
 import unittest
 
 from singbox_ops.adapters.acme.cloudflare_dns01 import CloudflareDNS01ACME
+from singbox_ops.adapters.acme.prune import plan_prune, prune_certs
 from singbox_ops.core.command import CommandResult
+from singbox_ops.core.exceptions import AdapterError
 from tests._ops_support import FakeRunner
 
 HOSTS = {"tuic": "c3d4.example.com", "hysteria2": "e5f6.example.com"}
@@ -62,5 +64,33 @@ class ACMETests(unittest.TestCase):
         self.assertEqual(runner.commands, [])
 
 
+class PruneTests(unittest.TestCase):
+    def _runner(self, entries):
+        return FakeRunner(dirs={"/root/.acme.sh": entries})
+
+    def test_plan_keep_and_remove(self):
+        runner = self._runner(["a.example.com_ecc", "b.example.com_ecc", "ca", "account.conf"])
+        keep, remove = plan_prune(runner, "/root/.acme.sh", ["a.example.com"])
+        self.assertEqual(keep, ["a.example.com_ecc"])
+        self.assertEqual(remove, ["b.example.com_ecc"])
+
+    def test_refuses_empty_keep(self):
+        runner = self._runner(["a.example.com_ecc"])
+        with self.assertRaises(AdapterError):
+            plan_prune(runner, "/root/.acme.sh", [])
+
+    def test_dry_run_does_not_delete(self):
+        runner = self._runner(["a.example.com_ecc", "b.example.com_ecc"])
+        result = prune_certs(runner, "/root/.acme.sh", ["a.example.com"], dry_run=True)
+        self.assertEqual(result["remove"], ["b.example.com_ecc"])
+        self.assertEqual(runner.commands, [])
+
+    def test_apply_deletes_only_stale(self):
+        runner = self._runner(["a.example.com_ecc", "b.example.com_ecc"])
+        prune_certs(runner, "/root/.acme.sh", ["a.example.com"], dry_run=False)
+        runs = [cmd[1] for cmd in runner.commands if cmd[0] == "run"]
+        self.assertEqual(runs, [("rm", "-rf", "/root/.acme.sh/b.example.com_ecc")])
+
+
 if __name__ == "__main__":
     unittest.main()

{devconfig_gen_singbox-2.1.3 → devconfig_gen_singbox-2.1.4}/tests/test_singbox_ops_cli.py

@@ -14,7 +14,7 @@ class SingleCliNameTests(unittest.TestCase):
         result = run_cli("--help")
         self.assertEqual(result.returncode, 0, result.stderr)
         self.assertIn("devconfig_gen_singbox", result.stdout)
-        for name in ("generate", "init", "ui", "context", "plan", "deploy", "redeploy", "destroy"):
+        for name in ("generate", "init", "ui", "context", "plan", "deploy", "redeploy", "destroy", "certs"):
             self.assertIn(name, result.stdout)
         self.assertNotIn("singbox-ops", result.stdout)
 

devconfig_gen_singbox-2.1.3/src/singbox_ops/adapters/acme/__init__.py

@@ -1,7 +0,0 @@
-"""ACME certificate adapters."""
-
-from __future__ import annotations
-
-from .cloudflare_dns01 import CloudflareDNS01ACME
-
-__all__ = ["CloudflareDNS01ACME"]