From 912dc58fc2d0f9c0d4516bbdaf64696b4a999b90 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 4 Nov 2026 18:59:19 +1100 Subject: [PATCH 1/3] Add `wpmreleasetoolkit` fastlane plugin Pinned to the release-toolkit branch adding bare binary support until that ships in a release. --- Generated with the help of Claude Code (Opus 5.5), https://code.claude.com --- Gemfile | 2 ++ Gemfile.lock | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/Gemfile b/Gemfile index ee407d5..aca08b5 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,5 @@ source 'https://rubygems.org' gem 'fastlane', '~> 2.241' +# TODO: Move to a released version once wordpress-mobile/release-toolkit#782 ships. +gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: 'mokagio/macos-verify-bare-binaries' diff --git a/Gemfile.lock b/Gemfile.lock index 41ae74e..dad03fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,27 @@ +GIT + remote: https://github.com/wordpress-mobile/release-toolkit + revision: 69214438466f39f56ead687ed1d3f19f22a09396 + branch: mokagio/macos-verify-bare-binaries + specs: + fastlane-plugin-wpmreleasetoolkit (15.2.0) + buildkit (~> 1.5) + chroma (= 0.2.0) + diffy (~> 3.3) + dotenv (~> 2.8) + fastlane (~> 2.240) + gettext (~> 3.5) + git (~> 1.3) + google-cloud-storage (~> 1.31) + java-properties (~> 0.3.0) + nokogiri (~> 1.19, >= 1.19.4) + octokit (~> 6.1) + parallel (~> 1.14) + plist (~> 3.1) + progress_bar (~> 1.3) + rake (>= 12.3, < 14.0) + rake-compiler (~> 1.0) + xcodeproj (~> 1.22) + GEM remote: https://rubygems.org/ specs: @@ -31,7 +55,10 @@ GEM base64 (0.3.0) benchmark (0.5.0) bigdecimal (4.1.3) + buildkit (1.6.2) + sawyer (>= 0.6) cgi (0.5.2) + chroma (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -39,12 +66,14 @@ GEM highline (~> 2.0.0) csv (3.3.7) declarative (0.0.20) + diffy (3.4.4) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.7.20261007) dotenv (2.8.1) emoji_regex (3.2.3) erb (6.0.7) + erubi (1.13.1) excon (1.10.0) faraday (2.15.1) faraday-net_http (>= 2.0, < 3.6) @@ -118,7 +147,18 @@ GEM xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.1.0) + fiddle (1.1.8) + forwardable (1.4.0) + gettext (3.5.2) + erubi + locale (>= 2.0.5) + prime + racc + text (>= 1.3.0) gh_inspector (1.1.3) + git (1.19.1) + addressable (~> 2.8) + rchardet (~> 1.8) google-apis-androidpublisher_v3 (0.110.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-core (1.4.0) @@ -170,13 +210,17 @@ GEM prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) + java-properties (0.3.0) jmespath (1.6.2) json (2.21.2) jwt (3.3.0) base64 + locale (2.1.5) + fiddle logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) + mini_portile2 (2.8.9) multi_json (1.21.2) multipart-post (2.4.1) mutex_m (0.3.0) @@ -188,21 +232,39 @@ GEM net-protocol (0.4.0) timeout nkf (0.3.0) + nokogiri (1.19.7) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + octokit (6.1.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + options (2.3.2) optparse (0.8.1) os (1.1.4) ostruct (0.6.3) + parallel (1.28.0) plist (3.7.2) pp (0.6.4) prettyprint prettyprint (0.2.1) + prime (0.1.4) + forwardable + singleton prism (2.1.0) + progress_bar (1.3.4) + highline (>= 1.6) + options (~> 2.3.0) pstore (0.3.0) public_suffix (7.0.5) + racc (1.8.1) rake (13.4.2) + rake-compiler (1.3.3) + rake rbs (4.2.0) logger prism (>= 1.6.0) tsort + rchardet (1.10.2) rdoc (8.1.0) erb prism (>= 1.6.0) @@ -218,6 +280,9 @@ GEM rexml (3.4.4) rouge (3.28.0) rubyzip (3.7.0) + sawyer (0.9.3) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) security (0.4.0) signet (0.22.2) addressable (~> 2.8) @@ -226,9 +291,11 @@ GEM simctl (1.6.10) CFPropertyList naturally + singleton (0.3.0) terminal-notifier (3.1.0) terminal-table (4.0.0) unicode-display_width (>= 1.1.1, < 4) + text (1.3.1) timeout (0.6.1) trailblazer-option (0.1.2) tsort (0.2.0) @@ -261,6 +328,7 @@ PLATFORMS DEPENDENCIES fastlane (~> 2.241) + fastlane-plugin-wpmreleasetoolkit! CHECKSUMS CFPropertyList (3.0.8) sha256=2c99d0d980536d3d7ab252f7bd59ac8be50fbdd1ff487c98c949bb66bb114261 @@ -278,19 +346,23 @@ CHECKSUMS base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c bigdecimal (4.1.3) sha256=61ebe1e5e559bdc3cc6f2c0ee7f427321fc838f59611c294356eb04d6e21cf66 + buildkit (1.6.2) sha256=04c0f3cfbf22bfb18d8a851ed46d4ba52302ec0f4c6506843b66f24ddd6fe510 bundler (4.0.23) sha256=407ba8a1d928f412847f819aa5f8b6aef7c59fb51feb517112af8a165487287b cgi (0.5.2) sha256=61ca30298171190fd4fa0d8018e57ada456eae9b7a2b78526debf7f0a0e6f8bb + chroma (0.2.0) sha256=64bdcd36a4765fbcd45adc64960cc153101300b4918f90ffdd89f4e2eb954b54 claide (1.1.0) sha256=6d3c5c089dde904d96aa30e73306d0d4bd444b1accb9b3125ce14a3c0183f82e colored (1.2) sha256=9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c colored2 (3.1.2) sha256=b13c2bd7eeae2cf7356a62501d398e72fde78780bd26aec6a979578293c28b4a commander (4.6.0) sha256=7d1ddc3fccae60cc906b4131b916107e2ef0108858f485fdda30610c0f2913d9 csv (3.3.7) sha256=15a3f16f6628da8664d455eb634e7f22031bcf53044923caf56975109e71b9f8 declarative (0.0.20) sha256=8021dd6cb17ab2b61233c56903d3f5a259c5cf43c80ff332d447d395b17d9ff9 + diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 digest-crc (0.7.0) sha256=64adc23a26a241044cbe6732477ca1b3c281d79e2240bcff275a37a5a0d78c07 domain_name (0.7.20261007) sha256=0976c6ab837dbde991b433d03acc38fdb91fa8839df31a1ed75ce0318dc0441c dotenv (2.8.1) sha256=c5944793349ae03c432e1780a2ca929d60b88c7d14d52d630db0508c3a8a17d8 emoji_regex (3.2.3) sha256=ecd8be856b7691406c6bf3bb3a5e55d6ed683ffab98b4aa531bb90e1ddcc564b erb (6.0.7) sha256=c5ca6dc25b0ef974a44dc8f59fe847577122483b1968a38dec305c60bf91ee92 + erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9 excon (1.10.0) sha256=868d456c6db29f965d7cc6c5eddbb4d77df08e2a2b2dca7ca3547f2a55afc4b4 faraday (2.15.1) sha256=8708154deda739c5e86cc42b74960e23e8491fce0eba9e11639a6a34b1ac288f faraday-cookie_jar (0.0.8) sha256=0140605823f8cc63c7028fccee486aaed8e54835c360cffc1f7c8c07c4299dbb @@ -300,8 +372,13 @@ CHECKSUMS faraday-retry (2.4.0) sha256=7b79c48fb7e56526faf247b12d94a680071ff40c9fda7cf1ec1549439ad11ebe fastimage (2.4.3) sha256=304457e3c35bfdaefda3f1dacab2222a96b230b8ce6977b6b54748c1cc7ec539 fastlane (2.241.2) sha256=9c23f6d1b4aa5d8570ff8584186d5fdb1fdf7a01dd7ad168501b43fe360fe122 + fastlane-plugin-wpmreleasetoolkit (15.2.0) fastlane-sirp (1.1.0) sha256=10bc94f9682efd8e1badfb31452a76dd8981f1f3a33717c765fde6d75b54d847 + fiddle (1.1.8) sha256=7fa8ee3627271497f3add5503acdbc3f40b32f610fc1cf49634f083ef3f32eee + forwardable (1.4.0) sha256=f1cd40cc9812937980e1c76f1aa053660990a7c9b6a98fc37d945468afcce838 + gettext (3.5.2) sha256=ada02c59aa7e9f56bd2522faedaed16421dd2f3ddb5fe28628c0be5abcbf3c74 gh_inspector (1.1.3) sha256=04cca7171b87164e053aa43147971d3b7f500fcb58177698886b48a9fc4a1939 + git (1.19.1) sha256=b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70 google-apis-androidpublisher_v3 (0.110.0) sha256=0b0b84af02fb7f3a062849bc60d545ff8b37670ea7e90bd947199cc671916513 google-apis-core (1.4.0) sha256=74e838a334926e79ce685d3ff9f418956cc23e48c5fd7cade779fea933e96582 google-apis-iamcredentials_v1 (0.28.0) sha256=0a92ffe6cc39c569554af2a77a25dfc61519ed8bbb64ab04cffdd352dc5ef106 @@ -317,12 +394,15 @@ CHECKSUMS http-cookie (1.1.6) sha256=ba4b82be64de61dc281243dac70e3c382c45142f20268ed9276a3670c93feaa9 io-console (0.9.5) sha256=83dd9bbf4c4680416629245b39cd4212eb5f4d9a4ea91804870c1f6b846414d5 irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 + java-properties (0.3.0) sha256=0a9fdda90c25ba9ba4de0e242d954a5688629652b592aab66ed54e2b16b93093 jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1 json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a jwt (3.3.0) sha256=44cc34fbc341c148233cf66641522b4bce0dfb1ce55e8073f05c56f44f4ee546 + locale (2.1.5) sha256=1c6803e8aa6bdb2c29e91945d095050601bf6d58474993575adf6f3b89b32ef4 logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 mini_magick (4.13.2) sha256=71d6258e0e8a3d04a9a0a09784d5d857b403a198a51dd4f882510435eb95ddd9 mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef + mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289 multi_json (1.21.2) sha256=245531eaf54bdba57aba515ff08b4503505c5e09911daa89c5a561e2f85bea8e multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8 mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751 @@ -331,17 +411,26 @@ CHECKSUMS net-http (0.10.0) sha256=1a2ff6e37a05724973c43f2bf7bf105f59c36a4cd0a7e9b1c021a0a566987c27 net-protocol (0.4.0) sha256=f9f90c8c6f64794a45160bf422177a336db12809de3beeeaa26b88fcd2e8c853 nkf (0.3.0) sha256=357a8dbeba38b727b75930f665146546076a394a1c243faf634ff176e3588895 + nokogiri (1.19.7) sha256=abe94507c54cb18f872777b16bdca4aad32b1abdc4c52fe843f1c80fbdf992b8 + octokit (6.1.1) sha256=920e4a9d820205f70738f58de6a7e6ef0e2f25b27db954b5806a63105207b0bf + options (2.3.2) sha256=32413a4b9e363234eed2eecfb2a1a9deb32810f72c54820a37a62f65b905c5e8 optparse (0.8.1) sha256=42bea10d53907ccff4f080a69991441d611fbf8733b60ed1ce9ee365ce03bd1a os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912 + parallel (1.28.0) sha256=33e6de1484baf2524792d178b0913fc8eb94c628d6cfe45599ad4458c638c970 plist (3.7.2) sha256=d37a4527cc1116064393df4b40e1dbbc94c65fa9ca2eec52edf9a13616718a42 pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570 prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4 + prime (0.1.4) sha256=4d755ebf7c2994a6f3a3fee0d072063be3fff2d4042ebff6cd5eebd4747a225e prism (2.1.0) sha256=1c0a7c6dea0e93183390fb123f007564dbe663198e2f86ad87204151147601f3 + progress_bar (1.3.4) sha256=adb10e040275e08eadfbe405749584e4b01fd15e8e692fdcb4b1969e9c071c8c pstore (0.3.0) sha256=97888d57cdc8b99b3587dde5e1d01fc5ca4a9124dfeb2afb84e3dd982e78f829 public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 + racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rake-compiler (1.3.3) sha256=8ed1a2cebd91ef02f2fd8285f85009d5b066ba219a1c03c5739c428ee84ceff9 rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674 + rchardet (1.10.2) sha256=e041cb195f464dc10e49ab130f78c8b5956cd9a4f4f6df84e0c183b87c135f33 rdoc (8.1.0) sha256=befc37880a5cfd36dcb176c748b5fd5ee39dd3536a75e81824e4972ce230f60a reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d representable (3.3.1) sha256=8a5fc8eef99f598147eee0390f606386268b429a840419fcfd3f7a8ccc40f566 @@ -349,11 +438,14 @@ CHECKSUMS rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142 rouge (3.28.0) sha256=0d6de482c7624000d92697772ab14e48dca35629f8ddf3f4b21c99183fd70e20 rubyzip (3.7.0) sha256=65c19294da75297a939006f3516deacc33185fbd721ff1954f7a231db6d3e121 + sawyer (0.9.3) sha256=0d0f19298408047037638639fe62f4794483fb04320269169bd41af2bdcf5e41 security (0.4.0) sha256=fd3fdbd2e50e45616082dbeec0bf0813b1134b2420a034ad35c3af2807f3fdbc signet (0.22.2) sha256=9c6861bb599845ea0cb05ffadd3d64c7a3b07a29bdee0f5352bcbe87b7ade21d simctl (1.6.10) sha256=b99077f4d13ad81eace9f86bf5ba4df1b0b893a4d1b368bd3ed59b5b27f9236b + singleton (0.3.0) sha256=83ea1bca5f4aa34d00305ab842a7862ea5a8a11c73d362cb52379d94e9615778 terminal-notifier (3.1.0) sha256=073609e9da7bb60176ffadda903c8d9231fcdf18ffa7074dc9478b63fe25c69c terminal-table (4.0.0) sha256=f504793203f8251b2ea7c7068333053f0beeea26093ec9962e62ea79f94301d2 + text (1.3.1) sha256=2fbbbc82c1ce79c4195b13018a87cbb00d762bda39241bb3cdc32792759dd3f4 timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb trailblazer-option (0.1.2) sha256=20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3 tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f From 5901203450d31330a9696aa73b7e78b7fd01ffa5 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 4 Nov 2026 18:59:21 +1100 Subject: [PATCH 2/3] Verify signatures with `macos_verify_code_signing` Suggested by Ian in https://github.com/beeper/cli/pull/56#discussion_r4455635831. The action has no hardened runtime check, so that stays in the lane. `sh` merges stderr, so the `2>&1` and the comment justifying it were unnecessary. --- Generated with the help of Claude Code (Opus 5.5), https://code.claude.com --- fastlane/Fastfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9ee82af..b2ad5f7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,7 +3,6 @@ require 'digest' require 'fileutils' require 'json' -require 'shellwords' UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler? @@ -137,15 +136,13 @@ end lane :verify_code_signing do |binary:| binary = resolve_from_project_root(binary) - sh('codesign', '--verify', '--strict', '--verbose=2', binary) - - # `codesign --display` reports on stderr, which `sh` does not capture. - details = sh("codesign --display --verbose=2 #{binary.shellescape} 2>&1", log: false) - - unless details.include?("Authority=#{SIGNING_IDENTITY}") - UI.user_error!("#{binary} is not signed by '#{SIGNING_IDENTITY}':\n#{details}") - end + macos_verify_code_signing( + artifact_path: binary, + expected_authority: SIGNING_IDENTITY, + verify_notarization: false + ) + details = sh('codesign', '--display', '--verbose=2', binary, log: false) UI.user_error!("#{binary} is not signed with the hardened runtime:\n#{details}") unless details.include?('(runtime)') UI.success("#{binary} is signed by #{SIGNING_IDENTITY}") From 85905efbe76c22c5f068977f4ff05aa35d6ed090 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 6 Nov 2026 15:40:09 +1100 Subject: [PATCH 3/3] Check hardened runtime via the toolkit action The `macos_verify_code_signing` action gained a `verify_hardened_runtime` option in wordpress-mobile/release-toolkit#782, so the lane no longer needs its own `codesign --display` check. --- Generated with the help of Claude Code (Opus 5.5), https://code.claude.com --- Gemfile.lock | 2 +- fastlane/Fastfile | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dad03fe..1f248f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/wordpress-mobile/release-toolkit - revision: 69214438466f39f56ead687ed1d3f19f22a09396 + revision: 3b3d2221b48cfda6a1067fa76a0913e47dfb0f50 branch: mokagio/macos-verify-bare-binaries specs: fastlane-plugin-wpmreleasetoolkit (15.2.0) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b2ad5f7..b084466 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -139,13 +139,9 @@ lane :verify_code_signing do |binary:| macos_verify_code_signing( artifact_path: binary, expected_authority: SIGNING_IDENTITY, - verify_notarization: false + verify_notarization: false, + verify_hardened_runtime: true ) - - details = sh('codesign', '--display', '--verbose=2', binary, log: false) - UI.user_error!("#{binary} is not signed with the hardened runtime:\n#{details}") unless details.include?('(runtime)') - - UI.success("#{binary} is signed by #{SIGNING_IDENTITY}") end # fastlane runs lanes from the `fastlane/` directory, so a path a caller wrote