Merge pull request #43 from homebysix/1.8.2

v1.8.2 merge to master

Author: homebysix

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [1.8.2] - 2021-01-18
+
+### Added
+- Added check for unexpected processor arguments in CodeSignatureVerifier.
+
 ## [1.8.1] - 2020-12-08
 
 ### Removed
@@ -201,7 +206,8 @@ All notable changes to this project will be documented in this file. This projec
 - Initial release
 
 
-[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.1...HEAD
+[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.2...HEAD
+[1.8.2]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.1...v1.8.2
 [1.8.1]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.0...v1.8.1
 [1.8.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.6.2...v1.7.0

README.md

@@ -15,7 +15,7 @@ For any hook in this repo you wish to use, add the following to your pre-commit
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.8.1
+    rev: v1.8.2
     hooks:
     -   id: check-plists
     # -   id: ...
@@ -121,7 +121,7 @@ When combining arguments that take lists (for example: `--required-keys`, `--cat
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.8.1
+    rev: v1.8.2
     hooks:
     -   id: check-munki-pkgsinfo
         args: ['--catalogs', 'testing', 'stable', '--']
@@ -131,7 +131,7 @@ But if you also use the `--categories` argument, you would move the trailing `--
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.8.1
+    rev: v1.8.2
     hooks:
     -   id: check-munki-pkgsinfo
         args: ['--catalogs', 'testing', 'stable', '--categories', 'Design', 'Engineering', 'Web Browsers', '--']
@@ -143,7 +143,7 @@ If it looks better to your eye, feel free to use a multi-line list for long argu
 
 ```yaml
 -   repo: https://github.com/homebysix/pre-commit-macadmin
-    rev: v1.8.1
+    rev: v1.8.2
     hooks:
     -   id: check-munki-pkgsinfo
         args: [

pre_commit_hooks/check_autopkg_recipes.py

@@ -148,6 +148,26 @@ def validate_endofcheckphase(process, filename):
     return passed
 
 
+def validate_codesignatureverifier(process, filename):
+    """Ensure CodeSignatureVerifier uses correct arguments."""
+
+    passed = True
+    csv_args = [
+        x.get("Arguments")
+        for x in process
+        if x.get("Processor") == "CodeSignatureVerifier"
+    ]
+    if csv_args:
+        if "requirements" in csv_args[0]:
+            print(
+                '{}: Found unexpected key "{}" in '
+                "CodeSignatureVerifier arguments.".format(filename, "requirements")
+            )
+            passed = False
+
+    return passed
+
+
 def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename):
     """Ensure MinimumVersion is set appropriately for the processors used."""
 
@@ -462,6 +482,9 @@ def main(argv=None):
             if not validate_endofcheckphase(process, filename):
                 retval = 1
 
+            if not validate_codesignatureverifier(process, filename):
+                retval = 1
+
             if not validate_no_var_in_app_path(process, filename):
                 retval = 1
 

setup.py

@@ -7,7 +7,7 @@
     name="pre-commit-macadmin",
     description="Pre-commit hooks for Mac admins, client engineers, and IT consultants.",
     url="https://github.com/homebysix/pre-commit-macadmin",
-    version="1.8.1",
+    version="1.8.2",
     author="Elliot Jordan",
     author_email="elliot@elliotjordan.com",
     packages=["pre_commit_hooks"],