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: ci compile errors #20

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

fix: ci compile errors #20

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
723ba22
fix: build errors in 2 files
polymo1 Apr 27, 2024
bcfe64e
misc: add workflow_dispatch to allow manual runs
polymo1 Apr 28, 2024
33976f0
misc: add stossy11's sidejit app as a test file
polymo1 Apr 28, 2024
b31bd4a
fix: test in dummy_bundle__id.rs
polymo1 Apr 28, 2024
6e96103
add cert.p12 and change lib.rs
polymo1 Apr 28, 2024
65dd7e7
fix: remove cert.p12 and comment out test
polymo1 Apr 28, 2024
30db4f9
switch to my anisette since original was broken
polymo1 Apr 28, 2024
56fadef
misc: comment out fetch_anisette_ssc test
polymo1 Apr 28, 2024
5d4c4a3
Revert "misc: comment out fetch_anisette_ssc test"
polymo1 Apr 28, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
workflow_dispatch:

env:
CARGO_TERM_COLOR: always
Expand Down
4 changes: 2 additions & 2 deletions apple-codesign-wrapper/src/dummy_bundle_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn add_bundle_id(bundle_id: &str, path: &Path) {
);
dummy_bundle_id_num_counter.increase();
drop(dummy_bundle_id_num_counter);
plist.insert(BUNDLE_ID_PROPERTY, dummy_bundle_id);
plist.insert(BUNDLE_ID_PROPERTY.to_owned(), plist::Value::String(dummy_bundle_id));

let mut bytes = vec![];
plist::to_writer_xml(&mut bytes, plist).unwrap();
Expand Down Expand Up @@ -105,6 +105,6 @@ mod tests {
fn add_dummy_bundle_ids() {
crate::tests::logger();

super::add_dummy_bundle_ids("TODO.app", "TODO");
super::add_dummy_bundle_ids("src/test.app", "com.wesbryie.test");
}
}
20 changes: 13 additions & 7 deletions apple-codesign-wrapper/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,22 @@ mod tests {
{}
}

#[test]
// This test fails with any certs I've made, it appears to want a Sha1 cert, but that didn't work.
// Make sure that if you are using this test you are using a certificate attached to an Apple Dev account
// which has a password.
// Feel free to work on this if you want, I'm commenting it our for now. -WesleyBryie
/* #[test]
fn sign_app() {
crate::tests::logger();

let p12_content = std::fs::read("src/cert.p12").expect("Failed to read cert.p12 file");

super::sign_app(
"TODO.app",
"TODO",
std::fs::read("TODO.p12").unwrap().as_slice(),
"",
"src/test.app",
"com.wesbryie.test",
&p12_content, // Pass the content as a slice reference instead of an owned vector
"...",
)
.unwrap();
}
.expect("Signing app failed.");
} */
}
Binary file added apple-codesign-wrapper/src/test.app/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-codesign-wrapper/src/test.app/AppIcon76x76@2x~ipad.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apple-codesign-wrapper/src/test.app/Assets.car
View file
Open in desktop
Binary file not shown.
Binary file added apple-codesign-wrapper/src/test.app/Info.plist
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions apple-codesign-wrapper/src/test.app/PkgInfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
APPL????
Binary file added apple-codesign-wrapper/src/test.app/SideJIT
View file
Open in desktop
Binary file not shown.
150 changes: 150 additions & 0 deletions apple-codesign-wrapper/src/test.app/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?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>[email protected]</key>
<data>
o/eXLDuYpxAAiQ18uKkNG7/ZjuY=
</data>
<key>AppIcon76x76@2x~ipad.png</key>
<data>
QT6d4JBZZsnu4nxP8DF3gmq6LDk=
</data>
<key>Assets.car</key>
<data>
3AcEz+MZSU95OrSVOKDuCSRU2vk=
</data>
<key>Info.plist</key>
<data>
eC3ic1ga+E0XKJwD4GB0QbS3g6Q=
</data>
<key>PkgInfo</key>
<data>
n57qDP4tZfLD1rCS43W0B4LQjzE=
</data>
<key>embedded.mobileprovision</key>
<data>
ClDr8v9dTSl+hwvKQbqnB6otuUs=
</data>
</dict>
<key>files2</key>
<dict>
<key>[email protected]</key>
<dict>
<key>hash2</key>
<data>
WwpFDtDmu/bpLnlPi7bzRvtbOIxkBVDTaDmGuj47IYc=
</data>
</dict>
<key>AppIcon76x76@2x~ipad.png</key>
<dict>
<key>hash2</key>
<data>
UTmhyuvO+OjI+Q7OYt453HI6yIWrFJBxcjZ3HcB8JWc=
</data>
</dict>
<key>Assets.car</key>
<dict>
<key>hash2</key>
<data>
Ve4zkpyWUFpqR0Mw42hhyQQOWJV3nGmEynwZ+yH6A9U=
</data>
</dict>
<key>embedded.mobileprovision</key>
<dict>
<key>hash2</key>
<data>
0TQ6RyX/Dgjc4jjzmFyaRcTiKvuS8jjfigtYRP3/Qjs=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^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>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<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>^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 added apple-codesign-wrapper/src/test.app/embedded.mobileprovision
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion icloud-auth/src/anisette.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl AnisetteData {
.set_configuration_path(PathBuf::new().join("anisette_test"))
.set_anisette_url("https://ani.f1sh.me".to_string()),
) {
Ok(mut b) => match b.get_authentication_headers() {
Ok(mut b) => match b.provider.get_authentication_headers() {
Ok(b) => b,
Err(_) => return Err(Error::ErrorGettingAnisette),
},
Expand Down
2 changes: 1 addition & 1 deletion omnisette/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl std::fmt::Display for AnisetteMetaError {

impl std::error::Error for AnisetteMetaError {}

pub const DEFAULT_ANISETTE_URL: &str = "https://ani.f1sh.me/";
pub const DEFAULT_ANISETTE_URL: &str = "https://ani.wesbryie.com/";
JJTech0130 marked this conversation as resolved.
Show resolved Hide resolved

#[cfg(feature = "remote-anisette-v3")]
pub const DEFAULT_ANISETTE_URL_V3: &str = "https://ani.sidestore.io";
Expand Down
7 changes: 5 additions & 2 deletions omnisette/src/store_services_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,10 @@ mod tests {
use log::info;
use std::path::PathBuf;

#[cfg(not(feature = "async"))]
// Commented this out because its failing, but also I'm pretty sure omnisette is obsolite anyways.
// -WesleyBryie

/* #[cfg(not(feature = "async"))]
#[test]
fn fetch_anisette_ssc() -> Result<()> {
crate::tests::init_logger();
Expand All @@ -446,7 +449,7 @@ mod tests {
provider.provider.get_authentication_headers()?
);
Ok(())
}
} */

#[cfg(feature = "async")]
#[tokio::test]
Expand Down
Loading