Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: codesign doesn't sign frameworks or sidecar, closes #7690 #7774

Merged
merged 10 commits into from
Sep 15, 2023
Merged

fix: codesign doesn't sign frameworks or sidecar, closes #7690 #7774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d806999
sign frameworks and sidecar
tr3ysmith Sep 7, 2023
025f21d
Merge branch '1.x' into framework-codesign-mac
tr3ysmith Sep 13, 2023
ac5ac05
cleanup code, fix bin paths
lucasfernog Sep 15, 2023
3f49a7e
change file
lucasfernog Sep 15, 2023
8e73f16
fix extension check
lucasfernog Sep 15, 2023
e5ad80d
remove to_string call
lucasfernog Sep 15, 2023
1ddf2f5
new framework
tr3ysmith Sep 15, 2023
0af67f0
Merge branch 'framework-codesign-mac' of https://github.com/tr3ysmith…
tr3ysmith Sep 15, 2023
b14df73
Merge branch '1.x' into framework-codesign-mac
tr3ysmith Sep 15, 2023
a3c54c8
remove test symlink
lucasfernog Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/bundler-xattr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-bundler": patch:bug
---

Remove extended attributes on the macOS app bundle using `xattr -cr $PATH`.
5 changes: 5 additions & 0 deletions .changes/codesign-additional-files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-bundler": patch:bug
---

Code sign sidecars and frameworks on macOS.
1 change: 0 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/Headers
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/tests/app-updater/frameworks/test.framework/Headers
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/Headers
1 change: 1 addition & 0 deletions core/tests/app-updater/frameworks/test.framework/Modules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/Modules
1 change: 0 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/Resources
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/tests/app-updater/frameworks/test.framework/Resources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/Resources
19 changes: 18 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/Versions/A/Headers/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
// Testing that a header can be included
//
// test.h
// test
//
// Created by Trey Smith on 9/15/23.
//

#import <Foundation/Foundation.h>

//! Project version number for test.
FOUNDATION_EXPORT double testVersionNumber;

//! Project version string for test.
FOUNDATION_EXPORT const unsigned char testVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <test/PublicHeader.h>


6 changes: 6 additions & 0 deletions core/tests/app-updater/frameworks/test.framework/Versions/A/Modules/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
framework module test {
umbrella header "test.h"

export *
module * { export * }
}
32 changes: 23 additions & 9 deletions core/tests/app-updater/frameworks/test.framework/Versions/A/Resources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,45 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>22D68</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>test</string>
<key>CFBundleIdentifier</key>
<string>com.tauri.test.framework</string>
<string>com.tauri.test</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>test</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleVersion</key>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>NSPrincipalClass</key>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>13.3</string>
<key>DTSDKBuild</key>
<string>22E245</string>
<key>DTSDKName</key>
<string>macosx13.3</string>
<key>DTXcode</key>
<string>1431</string>
<key>DTXcodeBuild</key>
<string>14E300c</string>
<key>LSMinimumSystemVersion</key>
<string>13.2</string>
</dict>
</plist>
1 change: 0 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/Versions/A/Resources/LICENSE
View file
Open in desktop

This file was deleted.

142 changes: 142 additions & 0 deletions core/tests/app-updater/frameworks/test.framework/Versions/A/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/Info.plist</key>
<data>
/aPV7Q20g0elr7OiZJoUNggTOcg=
</data>
</dict>
<key>files2</key>
<dict>
<key>Headers/test.h</key>
<dict>
<key>hash2</key>
<data>
5RA6Mnq5sNoaC4wKcFe6zymVmEL5Vb44G4BGqFjgZMM=
</data>
</dict>
<key>Modules/module.modulemap</key>
<dict>
<key>hash2</key>
<data>
C6uLLSnQu9M2qLElVCkeo2JpnvWMxtArinQzmlh3v2A=
</data>
</dict>
<key>Resources/Info.plist</key>
<dict>
<key>hash2</key>
<data>
nPMotNIMgvMfHtkRdpeehzfBiCZLnksfiD3nldUPzTE=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
Binary file modified core/tests/app-updater/frameworks/test.framework/Versions/A/test
100644 → 100755
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/Versions/Current
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/tests/app-updater/frameworks/test.framework/Versions/Current
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A
1 change: 0 additions & 1 deletion core/tests/app-updater/frameworks/test.framework/test
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions core/tests/app-updater/tests/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ fn update_app() {
.first()
.unwrap()
.1
.join("Contents/Frameworks/test.framework/test"),
.join("Contents/Frameworks/test.framework/Modules"),
)
.expect("test.framework/test metadata");
.expect("test.framework/Modules metadata");
assert!(
meta.file_type().is_symlink(),
"test.framework/test should be a symlink"
"test.framework/Modules should be a symlink"
);
}

Expand Down
Loading