pyhanko-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{pyhanko_cli-0.1.0/src/pyhanko_cli.egg-info → pyhanko_cli-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhanko-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: CLI tools for stamping and signing PDF files
 Author-email: Matthias Valvekens <dev@mvalvekens.be>
 Maintainer-email: Matthias Valvekens <dev@mvalvekens.be>
@@ -27,9 +27,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asn1crypto>=1.5.1
 Requires-Dist: tzlocal>=4.3
-Requires-Dist: pyhanko<0.30,>=0.29.0
+Requires-Dist: pyhanko<0.30,>=0.29.1
 Requires-Dist: pyhanko-certvalidator<0.28,>=0.27.0
-Requires-Dist: click<8.2.0,>=8.1.3
+Requires-Dist: click!=8.2.0,>=8.1.3
 Dynamic: license-file
 
 The lack of open-source CLI tooling to handle digitally signing and stamping PDF files was bothering me, so I went ahead and rolled my own.

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2}/pyproject.toml

@@ -33,11 +33,11 @@ requires-python = ">=3.9"
 dependencies = [
     "asn1crypto>=1.5.1",
     "tzlocal>=4.3",
-    "pyhanko>=0.29.0,<0.30",
+    "pyhanko>=0.29.1,<0.30",
     "pyhanko-certvalidator>=0.27.0,<0.28",
-    "click>=8.1.3,<8.2.0",
+    "click>=8.1.3,!=8.2.0",
 ]
-version = "0.1.0"
+version = "0.1.2"
 
 
 [project.readme]
@@ -57,7 +57,7 @@ testing-base = [
     "pytest>=6.1.1",
     "requests-mock>=1.8.0",
     "freezegun>=1.1.0",
-    "certomancer>=0.12.3,<0.13",
+    "certomancer>=0.13.0,<0.14",
     "pytest-cov>=4.0,<6.2",
     "pytest-asyncio==0.24.0;python_version<\"3.9\"",
     "pytest-asyncio==0.26.0;python_version>=\"3.9\"",
@@ -65,7 +65,7 @@ testing-base = [
 ]
 testing = [
     {include-group = "testing-base"},
-    "aiohttp>=3.9,<3.12",
+    "aiohttp>=3.9,<3.13",
     "pytest-aiohttp>=1.0.4,<1.2.0",
     "pyhanko[pkcs11,opentype,async_http,image-support,qr]"
 ]
@@ -83,10 +83,6 @@ pyhanko = ["py.typed"]
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
-log_format = "%(asctime)s %(levelname)s %(message)s"
-log_date_format = "%Y-%m-%d %H:%M:%S"
-log_cli = true
-log_cli_level = "INFO"
 asyncio_mode = "strict"
 asyncio_default_fixture_loop_scope="function"
 markers = [

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2}/src/pyhanko/cli/commands/stamp.py

@@ -1,3 +1,4 @@
+import re
 from typing import Optional
 
 import click
@@ -39,7 +40,7 @@ def select_style(ctx: click.Context, style_name: str, url: str):
     return style
 
 
-# TODO: text_params support
+PARAM_REGEX = re.compile("([a-zA-Z0-9_]+):(.*)")
 
 
 @cli_root.command(help='stamp PDF files', name='stamp')
@@ -67,6 +68,13 @@ def select_style(ctx: click.Context, style_name: str, url: str):
     required=False,
     type=str,
 )
+@click.option(
+    '--text-param',
+    help='parameter to interpolate in the stamp text (multiple allowed)',
+    required=False,
+    multiple=True,
+    type=str,
+)
 @click.pass_context
 def stamp(
     ctx,
@@ -77,10 +85,20 @@ def stamp(
     style_name: str,
     page: int,
     stamp_url: str,
+    text_param: list,
 ):
     cli_config: Optional[CLIConfig] = ctx.obj.config
     if cli_config is None:
         raise click.ClickException(_CONFIG_REQUIRED_MSG)
+    text_params = {}
+    for param in text_param:
+        m = PARAM_REGEX.match(param)
+        if not m:
+            raise click.ClickException(
+                f"--text-param must be of the form "
+                f"<name>:<value>, not f{param!r}"
+            )
+        text_params[m.group(1)] = m.group(2)
     with pyhanko_exception_manager():
         stamp_style = select_style(ctx, style_name, stamp_url)
         page_ix = _index_page(page)
@@ -93,8 +111,15 @@ def stamp(
                 x=x,
                 y=y,
                 url=stamp_url,
+                text_params=text_params,
             )
         else:
             text_stamp_file(
-                infile, outfile, stamp_style, dest_page=page_ix, x=x, y=y
+                infile,
+                outfile,
+                stamp_style,
+                dest_page=page_ix,
+                x=x,
+                y=y,
+                text_params=text_params,
             )

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2}/src/pyhanko/cli/commands/validation/validate.py

@@ -310,9 +310,17 @@ def validate_signatures(
             r = PdfFileReader(infile)
         sh = r.security_handler
         if isinstance(sh, crypt.StandardSecurityHandler):
+            auth_result = None
             if password is None:
-                password = getpass.getpass(prompt='File password: ')
-            auth_result = r.decrypt(password)
+                # attempt the empty user password first--validation is a read-only
+                # operation, so this is in line with expected UX in other viewers.
+                empty_auth_result = r.decrypt("")
+                if empty_auth_result.status == crypt.AuthStatus.FAILED:
+                    password = getpass.getpass(prompt='File password: ')
+                else:
+                    auth_result = empty_auth_result
+            if not auth_result:
+                auth_result = r.decrypt(password)
             if auth_result.status == crypt.AuthStatus.FAILED:
                 raise click.ClickException("Password didn't match.")
         elif sh is not None:

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2}/src/pyhanko/cli/runtime.py

@@ -25,7 +25,7 @@ def logging_setup(log_configs, verbose: bool):
         cur_logger.setLevel(log_config.level)
         handler: logging.StreamHandler
         if isinstance(log_config.output, StdLogOutput):
-            if StdLogOutput == StdLogOutput.STDOUT:
+            if log_config.output == StdLogOutput.STDOUT:
                 handler = logging.StreamHandler(sys.stdout)
             else:
                 handler = logging.StreamHandler()
@@ -59,9 +59,6 @@ def pyhanko_exception_manager():
     except misc.PdfReadError as e:
         exception = e
         msg = f"Failed to read PDF file: {e.msg}"
-    except misc.PdfWriteError as e:
-        exception = e
-        msg = f"Failed to write PDF file: {e.msg}"
     except SigningError as e:
         exception = e
         msg = f"Error raised while producing signed file: {e.msg}"

pyhanko_cli-0.1.2/src/pyhanko/cli/version.py

@@ -0,0 +1,2 @@
+__version__ = '0.1.2'
+__version_info__ = (0, 1, 2)

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2/src/pyhanko_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhanko-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: CLI tools for stamping and signing PDF files
 Author-email: Matthias Valvekens <dev@mvalvekens.be>
 Maintainer-email: Matthias Valvekens <dev@mvalvekens.be>
@@ -27,9 +27,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asn1crypto>=1.5.1
 Requires-Dist: tzlocal>=4.3
-Requires-Dist: pyhanko<0.30,>=0.29.0
+Requires-Dist: pyhanko<0.30,>=0.29.1
 Requires-Dist: pyhanko-certvalidator<0.28,>=0.27.0
-Requires-Dist: click<8.2.0,>=8.1.3
+Requires-Dist: click!=8.2.0,>=8.1.3
 Dynamic: license-file
 
 The lack of open-source CLI tooling to handle digitally signing and stamping PDF files was bothering me, so I went ahead and rolled my own.

{pyhanko_cli-0.1.0 → pyhanko_cli-0.1.2}/src/pyhanko_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 asn1crypto>=1.5.1
 tzlocal>=4.3
-pyhanko<0.30,>=0.29.0
+pyhanko<0.30,>=0.29.1
 pyhanko-certvalidator<0.28,>=0.27.0
-click<8.2.0,>=8.1.3
+click!=8.2.0,>=8.1.3

pyhanko_cli-0.1.0/src/pyhanko/cli/version.py

@@ -1,2 +0,0 @@
-__version__ = '0.1.0'
-__version_info__ = (0, 1, 0)