From efa7af1c69fed7ff111572d1dcda9dd5d18be4a0 Mon Sep 17 00:00:00 2001 From: James Smith Date: Wed, 24 Nov 2021 13:11:58 +1100 Subject: [PATCH] Recipe Fixes - Creates payload folder regardless of pkg creation for Webex & iTerm - Fixed indentation in NSLogger - Add PathDeleter to NSLogger - Cleaning Xray app recipes - Cleaning Wireshark recipes - modified pkg_path for sign recipes --- Cisco/Webex.pkg.recipe.yaml | 21 +++++++----- Cisco/Webex.sign.recipe.yaml | 17 +++++----- Docker/Docker.sign.recipe.yaml | 17 +++++----- GitHub/GitHub_Desktop.sign.recipe.yaml | 2 +- Handbrake/Handbrake.sign.recipe.yaml | 17 +++++----- NSLogger/NSLogger.download.recipe.yaml | 11 +++---- NSLogger/NSLogger.install.recipe.yaml | 2 +- NSLogger/NSLogger.jss.recipe.yaml | 24 +++++++------- NSLogger/NSLogger.pkg.recipe.yaml | 33 +++++++------------ NSLogger/NSLogger.sign.recipe.yaml | 17 +++++----- Wireshark/Wireshark.jamf.recipe.yaml | 2 +- Wireshark/Wireshark.pkg.recipe.yaml | 14 ++++++-- .../Xray_Exploratory_App.pkg.recipe.yaml | 16 +++++++-- .../Xray_Exploratory_App.sign.recipe.yaml | 17 +++++----- iTerm2/iTerm2.pkg.recipe.yaml | 23 ++++++++----- iTerm2/iTerm2.sign.recipe.yaml | 16 ++++----- 16 files changed, 131 insertions(+), 118 deletions(-) diff --git a/Cisco/Webex.pkg.recipe.yaml b/Cisco/Webex.pkg.recipe.yaml index a9ea7af..6021bfb 100644 --- a/Cisco/Webex.pkg.recipe.yaml +++ b/Cisco/Webex.pkg.recipe.yaml @@ -7,12 +7,17 @@ Input: NAME: Webex Process: -- Processor: AppPkgCreator - Arguments: - app_path: '%pathname%/Webex.app' - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg' + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/payload' -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/payload' \ No newline at end of file + - Processor: AppPkgCreator + Arguments: + app_path: '%pathname%/Webex.app' + pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg' + + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/payload' diff --git a/Cisco/Webex.sign.recipe.yaml b/Cisco/Webex.sign.recipe.yaml index b5ea597..5f91a36 100644 --- a/Cisco/Webex.sign.recipe.yaml +++ b/Cisco/Webex.sign.recipe.yaml @@ -7,13 +7,12 @@ Input: SIGNING_CERTIFICATE: Override_This_Value Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg' - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg' diff --git a/Docker/Docker.sign.recipe.yaml b/Docker/Docker.sign.recipe.yaml index 49aafd5..819784d 100644 --- a/Docker/Docker.sign.recipe.yaml +++ b/Docker/Docker.sign.recipe.yaml @@ -7,13 +7,12 @@ Input: SIGNING_CERTIFICATE: Override_This_Value Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%.pkg' - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%-%ARCHITECTURE%-%version%-unsigned.pkg' diff --git a/GitHub/GitHub_Desktop.sign.recipe.yaml b/GitHub/GitHub_Desktop.sign.recipe.yaml index 2f7f673..e576826 100644 --- a/GitHub/GitHub_Desktop.sign.recipe.yaml +++ b/GitHub/GitHub_Desktop.sign.recipe.yaml @@ -9,7 +9,7 @@ Input: Process: - Processor: com.github.rtrouton.SharedProcessors/PkgSigner Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%ARCHITECTURE%-%version%.pkg' + pkg_path: '%pkg_path%' signing_cert: '%SIGNING_CERTIFICATE%' - Processor: PathDeleter diff --git a/Handbrake/Handbrake.sign.recipe.yaml b/Handbrake/Handbrake.sign.recipe.yaml index 51cdc1d..75aeb58 100644 --- a/Handbrake/Handbrake.sign.recipe.yaml +++ b/Handbrake/Handbrake.sign.recipe.yaml @@ -7,13 +7,12 @@ Input: SIGNING_CERTIFICATE: Override_This_Value Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg' - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg' diff --git a/NSLogger/NSLogger.download.recipe.yaml b/NSLogger/NSLogger.download.recipe.yaml index e317a78..5485944 100644 --- a/NSLogger/NSLogger.download.recipe.yaml +++ b/NSLogger/NSLogger.download.recipe.yaml @@ -6,11 +6,10 @@ Input: NAME: NSLogger Process: + - Processor: GitHubReleasesInfoProvider + Arguments: + github_repo: 'fpillet/%NAME%' -- Processor: GitHubReleasesInfoProvider - Arguments: - github_repo: 'fpillet/%NAME%' - -- Processor: URLDownloader + - Processor: URLDownloader -- Processor: EndOfCheckPhase + - Processor: EndOfCheckPhase diff --git a/NSLogger/NSLogger.install.recipe.yaml b/NSLogger/NSLogger.install.recipe.yaml index 2f7cfa3..9a35eeb 100644 --- a/NSLogger/NSLogger.install.recipe.yaml +++ b/NSLogger/NSLogger.install.recipe.yaml @@ -7,4 +7,4 @@ Input: NAME: NSLogger Process: -- Processor: Installer + - Processor: Installer diff --git a/NSLogger/NSLogger.jss.recipe.yaml b/NSLogger/NSLogger.jss.recipe.yaml index 9f5c5a5..a356370 100644 --- a/NSLogger/NSLogger.jss.recipe.yaml +++ b/NSLogger/NSLogger.jss.recipe.yaml @@ -14,15 +14,15 @@ Input: SELF_SERVICE_ICON: '%NAME%.png' Process: -- Processor: JSSImporter - Arguments: - category: '%CATEGORY%' - groups: - - name: '%GROUP_NAME%' - smart: true - template_path: '%GROUP_TEMPLATE%' - policy_category: '%POLICY_CATEGORY%' - policy_template: '%POLICY_TEMPLATE%' - prod_name: '%NAME%' - self_service_description: '%SELF_SERVICE_DESCRIPTION%' - self_service_icon: '%SELF_SERVICE_ICON%' + - Processor: JSSImporter + Arguments: + category: '%CATEGORY%' + groups: + - name: '%GROUP_NAME%' + smart: true + template_path: '%GROUP_TEMPLATE%' + policy_category: '%POLICY_CATEGORY%' + policy_template: '%POLICY_TEMPLATE%' + prod_name: '%NAME%' + self_service_description: '%SELF_SERVICE_DESCRIPTION%' + self_service_icon: '%SELF_SERVICE_ICON%' diff --git a/NSLogger/NSLogger.pkg.recipe.yaml b/NSLogger/NSLogger.pkg.recipe.yaml index b476117..fc38557 100644 --- a/NSLogger/NSLogger.pkg.recipe.yaml +++ b/NSLogger/NSLogger.pkg.recipe.yaml @@ -7,26 +7,17 @@ Input: NAME: NSLogger Process: + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/payload' -- Processor: Unarchiver - Arguments: - destination_path: '%RECIPE_CACHE_DIR%/downloads' + - Processor: AppPkgCreator + Arguments: + app_path: '%RECIPE_CACHE_DIR%/downloads/%NAME%.app' -- Processor: CodeSignatureVerifier - Arguments: - input_path: '%RECIPE_CACHE_DIR%/downloads/%NAME%.app' - requirement: anchor apple generic and identifier "com.florentpillet.NSLogger" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = K42G4S78CE) - deep_verification: True - strict_verification: True - -- Processor: EndOfCheckPhase - -- Processor: AppPkgCreator - Arguments: - app_path: '%RECIPE_CACHE_DIR%/downloads/%NAME%.app' - -# - Processor: PathDeleter -# Arguments: -# path_list: -# - '%RECIPE_CACHE_DIR%/downloads/%NAME%.app' -# - '%RECIPE_CACHE_DIR%/payload' \ No newline at end of file + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/downloads/%NAME%.app' + - '%RECIPE_CACHE_DIR%/payload' diff --git a/NSLogger/NSLogger.sign.recipe.yaml b/NSLogger/NSLogger.sign.recipe.yaml index d50fa45..bb980ca 100644 --- a/NSLogger/NSLogger.sign.recipe.yaml +++ b/NSLogger/NSLogger.sign.recipe.yaml @@ -7,13 +7,12 @@ Input: SIGNING_CERTIFICATE: Override_This_Value Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg' - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg' diff --git a/Wireshark/Wireshark.jamf.recipe.yaml b/Wireshark/Wireshark.jamf.recipe.yaml index 6e650c0..09e37e9 100644 --- a/Wireshark/Wireshark.jamf.recipe.yaml +++ b/Wireshark/Wireshark.jamf.recipe.yaml @@ -42,4 +42,4 @@ Process: Arguments: policy_template: '%POLICY_TEMPLATE%' policy_name: '%POLICY_NAME%' - icon: '%SELF_SERVICE_ICON%' \ No newline at end of file + icon: '%SELF_SERVICE_ICON%' diff --git a/Wireshark/Wireshark.pkg.recipe.yaml b/Wireshark/Wireshark.pkg.recipe.yaml index 03333c2..0b5002a 100644 --- a/Wireshark/Wireshark.pkg.recipe.yaml +++ b/Wireshark/Wireshark.pkg.recipe.yaml @@ -7,6 +7,14 @@ Input: NAME: Wireshark Process: -- Processor: AppPkgCreator - # Arguments: - # app_path: '%pathname%/Wireshark*.app' \ No newline at end of file + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/payload' + + - Processor: AppPkgCreator + + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/payload' diff --git a/Xray Exploratory App/Xray_Exploratory_App.pkg.recipe.yaml b/Xray Exploratory App/Xray_Exploratory_App.pkg.recipe.yaml index 7dd0633..8b16af4 100644 --- a/Xray Exploratory App/Xray_Exploratory_App.pkg.recipe.yaml +++ b/Xray Exploratory App/Xray_Exploratory_App.pkg.recipe.yaml @@ -8,6 +8,16 @@ Input: SOFTWARE_TITLE: Xray_Exploratory_App Process: -- Processor: AppPkgCreator - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg' \ No newline at end of file + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/payload' + + - Processor: AppPkgCreator + Arguments: + pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg' + + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/payload' diff --git a/Xray Exploratory App/Xray_Exploratory_App.sign.recipe.yaml b/Xray Exploratory App/Xray_Exploratory_App.sign.recipe.yaml index 92ef181..6fe1f08 100644 --- a/Xray Exploratory App/Xray_Exploratory_App.sign.recipe.yaml +++ b/Xray Exploratory App/Xray_Exploratory_App.sign.recipe.yaml @@ -8,13 +8,12 @@ Input: SOFTWARE_TITLE: Xray_Exploratory_App Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - pkg_path: '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%.pkg' - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%SOFTWARE_TITLE%-%version%-unsigned.pkg' diff --git a/iTerm2/iTerm2.pkg.recipe.yaml b/iTerm2/iTerm2.pkg.recipe.yaml index d337604..b971439 100644 --- a/iTerm2/iTerm2.pkg.recipe.yaml +++ b/iTerm2/iTerm2.pkg.recipe.yaml @@ -7,13 +7,18 @@ Input: NAME: iTerm2 Process: -- Processor: AppPkgCreator - Arguments: - app_path: '%RECIPE_CACHE_DIR%/unpack/iTerm.app' - pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg' + - Processor: PkgRootCreator + Arguments: + pkgdirs: {} + pkgroot: '%RECIPE_CACHE_DIR%/payload' -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/unpack' - - '%RECIPE_CACHE_DIR%/payload' \ No newline at end of file + - Processor: AppPkgCreator + Arguments: + app_path: '%RECIPE_CACHE_DIR%/unpack/iTerm.app' + pkg_path: '%RECIPE_CACHE_DIR%/%NAME%-%version%.pkg' + + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/unpack' + - '%RECIPE_CACHE_DIR%/payload' diff --git a/iTerm2/iTerm2.sign.recipe.yaml b/iTerm2/iTerm2.sign.recipe.yaml index 2d0cf21..b0f653d 100644 --- a/iTerm2/iTerm2.sign.recipe.yaml +++ b/iTerm2/iTerm2.sign.recipe.yaml @@ -9,12 +9,12 @@ Input: SIGNING_CERTIFICATE: Override_This_Value Process: + - Processor: com.github.rtrouton.SharedProcessors/PkgSigner + Arguments: + pkg_path: '%pkg_path%' + signing_cert: '%SIGNING_CERTIFICATE%' -- Processor: com.github.rtrouton.SharedProcessors/PkgSigner - Arguments: - signing_cert: '%SIGNING_CERTIFICATE%' - -- Processor: PathDeleter - Arguments: - path_list: - - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg' + - Processor: PathDeleter + Arguments: + path_list: + - '%RECIPE_CACHE_DIR%/%NAME%-%version%-unsigned.pkg'