fix: ci compile errors

.github/workflows/rust.yml

@@ -5,6 +5,7 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
+  workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always

apple-codesign-wrapper/src/dummy_bundle_id.rs

@@ -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();
@@ -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");
     }
 }

apple-codesign-wrapper/src/lib.rs

@@ -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.");
+    } */
 }

apple-codesign-wrapper/src/test.app/PkgInfo

@@ -0,0 +1 @@
+APPL????

apple-codesign-wrapper/src/test.app/_CodeSignature/CodeResources

@@ -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>AppIcon60x60@2x.png</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>AppIcon60x60@2x.png</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>

icloud-auth/src/anisette.rs

@@ -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),
             },

omnisette/src/lib.rs

@@ -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/";
 
 #[cfg(feature = "remote-anisette-v3")]
 pub const DEFAULT_ANISETTE_URL_V3: &str = "https://ani.sidestore.io";