hipp-https-agent 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

hipp_agent/__init__.py

@@ -1,3 +1,3 @@
 """为 hipp.ink 与 hipp.site 调用系统 certbot 申请和续期证书。"""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

hipp_agent/certinfo.py

@@ -34,7 +34,9 @@ def read_certificate(path: Path) -> tuple[str, str, str]:
 
 
 def _openssl_time(value: str) -> str:
-    text = value.strip().removesuffix(" GMT")
+    text = value.strip()
+    if text.endswith(" GMT"):
+        text = text[: -len(" GMT")]
     try:
         parsed = datetime.strptime(text, "%b %d %H:%M:%S %Y")
     except ValueError:

hipp_agent/render.py

@@ -31,7 +31,7 @@ def certbot_issue_args(config: AppConfig, spec: CertificateSpec, certbot_bin: st
 
 
 def format_command(command: list[str]) -> str:
-    return shlex.join(command)
+    return " ".join(shlex.quote(part) for part in command)
 
 
 def render_acme_snippet(webroot: str) -> str:

hipp_agent/runner.py

@@ -238,7 +238,10 @@ def preflight(domain: str, webroot: Path, timeout: float = 10.0) -> None:
     except OSError as exc:
         raise PreflightError(f"{domain} 的校验地址无法连接：{exc}") from exc
     finally:
-        path.unlink(missing_ok=True)
+        try:
+            path.unlink()
+        except FileNotFoundError:
+            pass
     if status == 200 and payload == body:
         return
     extra = f"，Location: {location}" if location else ""

{hipp_https_agent-0.2.0.dist-info → hipp_https_agent-0.2.1.dist-info}/METADATA

@@ -1,8 +1,16 @@
 Metadata-Version: 2.4
 Name: hipp-https-agent
-Version: 0.2.0
+Version: 0.2.1
 Summary: 在本机申请和续期 HTTPS 证书，并用令牌向服务端上报
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 
 # hipp-https-agent
@@ -16,10 +24,10 @@ Description-Content-Type: text/markdown
 在证书机器上用 root 安装。申请证书、写 `/etc/nginx/certs` 和重新加载 Nginx 都需要 root，常驻进程也用这个用户。
 
 ```sh
-sudo pip install hipp-https-agent
+sudo pip install -i https://pypi.org/simple hipp-https-agent
 ```
 
-安装后得到命令 `hipp-agent`。包在 PyPI 上的名字是 `hipp-https-agent`。
+安装后得到命令 `hipp-agent`。包在 PyPI 上的名字是 `hipp-https-agent`。需要 Python 3.7 或更高。显式指定官方索引，是为了避免云主机默认国内镜像尚未同步新包时出现 `No matching distribution`。
 
 先装好 certbot，并准备校验目录：
 

hipp_https_agent-0.2.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+hipp_agent/__init__.py,sha256=bvALT8R0IXKpzBVdeJJAFhvzx9wcBp91iy4LI_m43zk,102
+hipp_agent/__main__.py,sha256=TK4fT3W8XKhSDiHf4x4ls4asVeeFtLVYZwJnwaDa4c4,3863
+hipp_agent/certinfo.py,sha256=UInWwV-fpqQIU89Hu56fZ20ee6OtsSxB5-0Bw2vkpoc,1464
+hipp_agent/config.py,sha256=Rof8FQEsn1e0rc6UdLfsJFqORgbR_9JDIEJSt7QSEko,10699
+hipp_agent/daemon.py,sha256=YK_WlxVOqky2szLwirzMiLJWyhmm8kTQHqxijHwuvu8,7751
+hipp_agent/install.py,sha256=MJcrQ7V216SudzxuzLYAH-dK1jDoFrQqFXTQSYodxZ4,8320
+hipp_agent/register.py,sha256=FoP4CVrdcBppN_1LbOjpw3yekK1PjYNGt9LkTxcW4zk,5230
+hipp_agent/render.py,sha256=D6cIQvV52wSDPiitzVh64KILPJc5llij2uiGpYk5P3c,3663
+hipp_agent/report.py,sha256=JOkgqiLL_8bqZRVuacRjbKi5gTbygfLc-O1RkNk5wCM,2307
+hipp_agent/runner.py,sha256=ngRTJgAfyISpM_br44svKTMHvtlCoXTMppxgH3DuWeo,10649
+hipp_https_agent-0.2.1.dist-info/METADATA,sha256=QqsP9TUBi9pYhBL9FG6lVv4D0XDB-1J0gjOA0g6lB88,3380
+hipp_https_agent-0.2.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+hipp_https_agent-0.2.1.dist-info/entry_points.txt,sha256=nJj7QyFLH_FT9ciFyjjITiqrLZSsN4ylB7IILOLr3VE,56
+hipp_https_agent-0.2.1.dist-info/top_level.txt,sha256=kkb29UBJy4dUEchZcjrdk3Eunk6yYtMMmPNtIBvudq4,11
+hipp_https_agent-0.2.1.dist-info/RECORD,,

hipp_https_agent-0.2.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-hipp_agent/__init__.py,sha256=FS-AC5MjbrgosCNu2py7orZB69iY69Ro4lUHnaFnGO4,102
-hipp_agent/__main__.py,sha256=TK4fT3W8XKhSDiHf4x4ls4asVeeFtLVYZwJnwaDa4c4,3863
-hipp_agent/certinfo.py,sha256=wtTqtDBvRuEF6nBkvn0p5xTjEq9v1j3UgSF-GukI4yQ,1419
-hipp_agent/config.py,sha256=Rof8FQEsn1e0rc6UdLfsJFqORgbR_9JDIEJSt7QSEko,10699
-hipp_agent/daemon.py,sha256=YK_WlxVOqky2szLwirzMiLJWyhmm8kTQHqxijHwuvu8,7751
-hipp_agent/install.py,sha256=MJcrQ7V216SudzxuzLYAH-dK1jDoFrQqFXTQSYodxZ4,8320
-hipp_agent/register.py,sha256=FoP4CVrdcBppN_1LbOjpw3yekK1PjYNGt9LkTxcW4zk,5230
-hipp_agent/render.py,sha256=H-rRziW_1w4G2x_578nkgMId9IlPqqJn-dDsxsWWXvY,3635
-hipp_agent/report.py,sha256=JOkgqiLL_8bqZRVuacRjbKi5gTbygfLc-O1RkNk5wCM,2307
-hipp_agent/runner.py,sha256=qLcKWr8eak0yQUaZUeRE-qh-lYiyeHbVV7jsvfcjzy0,10596
-hipp_https_agent-0.2.0.dist-info/METADATA,sha256=8LeM6Xt1CZTmO6ilstI6-xvYictc0MTArKwBU197ALQ,2796
-hipp_https_agent-0.2.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-hipp_https_agent-0.2.0.dist-info/entry_points.txt,sha256=nJj7QyFLH_FT9ciFyjjITiqrLZSsN4ylB7IILOLr3VE,56
-hipp_https_agent-0.2.0.dist-info/top_level.txt,sha256=kkb29UBJy4dUEchZcjrdk3Eunk6yYtMMmPNtIBvudq4,11
-hipp_https_agent-0.2.0.dist-info/RECORD,,