refactor: options, signer, include team id picker (#4)

* some moving around

* fix: clear entitlements before setting

* fix: Correctly sign lc & sidestore (#3)

- embeds altcertificate to lc+ss
- can now add multiple appgroups, previously only accepted one due to poor api design
- extra handling for sidestore ALTAppGroups

* major refactor (super unfinished)

* bring back some stuff

* improve registering speed by 90%

* team id picker

---------

Co-authored-by: Huge_Black <60165378+hugeBlack@users.noreply.github.com>

Author: claration

.github/workflows/build.yml

@@ -3,6 +3,13 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'crates/**'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+      - 'apps/**'
+      - 'package/**'
+      - '.github/workflows/build.yml'
   workflow_dispatch:
 
 env:

Cargo.lock

@@ -3,7 +3,8 @@ resolver = "3"
 members = [
     "apps/plumeimpactor",
     "apps/plumesign",
-    "crates/grand_slam"
+    "crates/grand_slam",
+    "crates/utils"
 ]
 
 [workspace.package]
@@ -30,7 +31,7 @@ incremental = true          # Improves re-compile times
 tokio = { version = "1.43", features = ["macros", "rt-multi-thread"] }
 
 # Application
-idevice = { git = "https://github.com/jkcoxson/idevice", rev = "ea61459", features = ["afc", "installation_proxy", "debug_proxy", "rsd", "tunnel_tcp_stack", "heartbeat", "usbmuxd"] }
+idevice = { git = "https://github.com/jkcoxson/idevice", rev = "ea61459", features = ["afc", "installation_proxy", "debug_proxy", "rsd", "tunnel_tcp_stack", "heartbeat", "usbmuxd", "house_arrest"] }
 zip = { version = "4.3", default-features = false, features = ["deflate"] }
 plist = "1.8.0"
 omnisette = { git = "https://github.com/PlumeImpactor/omnisette", rev = "ce1e5cc", package = "omnisette", features = ["remote-anisette-v3"] }
@@ -47,6 +48,7 @@ apple-codesign = { version = "0.29.0", default-features = false }
 uuid = "1.18.1"
 reqwest = { version = "0.11.14", features = ["blocking", "json", "default-tls"] }
 serde_json = { version = "1" }
+futures = "0.3.31"
 
 [patch.crates-io]
 srp = { path="./target/patch/srp-0.6.0" }

Cargo.toml

@@ -9,19 +9,19 @@ repository.workspace = true
 
 [dependencies]
 idevice.workspace = true
-zip.workspace = true
 tokio.workspace = true
 thiserror.workspace = true
 uuid.workspace = true
 plist.workspace = true
+futures.workspace = true
 grand_slam = { path = "../../crates/grand_slam", features = ["vendored-botan"] }
+utils = { path = "../../crates/utils" }
 
 wxdragon = "0.9.2"
-futures = "0.3.31"
 rustls = { version = "0.23.32", features = ["ring"] }
 
 keyring = { version = "3.6.3", default-features = false, features = ["windows-native", "apple-native", "linux-native"] }
 
 [target.'cfg(target_os = "windows")'.build-dependencies]
 embed-manifest = "1.4"
-winres = "0.1"
+winres = "0.1"

apps/plumeimpactor/Cargo.toml

@@ -1,15 +1,18 @@
 use wxdragon::prelude::*;
-
-use tokio::sync::mpsc;
-use tokio::sync::mpsc::error::TryRecvError;
+use tokio::sync::{
+    mpsc, 
+    mpsc::error::TryRecvError
+};
 use std::sync::mpsc as std_mpsc;
-
 use grand_slam::auth::Account;
-use grand_slam::utils::{PlistInfoTrait, SignerSettings};
-
+use utils::{
+    SignerOptions, 
+    Package, 
+    PlistInfoTrait,
+    Device
+};
 use crate::frame::PlumeFrame;
 use crate::keychain::AccountCredentials;
-use crate::utils::{Device, Package};
 
 #[derive(Debug)]
 pub enum PlumeFrameMessage {
@@ -20,6 +23,7 @@ pub enum PlumeFrameMessage {
     AccountLogin(Account),
     AccountDeleted,
     AwaitingTwoFactorCode(std_mpsc::Sender<Result<String, String>>),
+    RequestTeamSelection(Vec<String>, std_mpsc::Sender<Result<i32, String>>),
     InstallProgress(i32, Option<String>),
     Error(String),
 }
@@ -36,15 +40,15 @@ pub struct PlumeFrameMessageHandler {
     // --- account ---
     pub account_credentials: Option<Account>,
     // --- signer settings ---
-    pub signer_settings: SignerSettings,
+    pub signer_settings: SignerOptions,
 }
 
 impl PlumeFrameMessageHandler {
     pub fn new(
         receiver: mpsc::UnboundedReceiver<PlumeFrameMessage>,
         plume_frame: PlumeFrame,
     ) -> Self {
-        let signer_settings = SignerSettings::default();
+        let signer_settings = SignerOptions::default();
         Self {
             receiver,
             plume_frame,
@@ -119,7 +123,7 @@ impl PlumeFrameMessageHandler {
                     return;
                 }
 
-                package.load_into_signer_settings(&mut self.signer_settings);
+                package.load_into_signer_options(&mut self.signer_settings);
 
                 self.package_selected = Some(package);
                 self.plume_frame.install_page.set_settings(&self.signer_settings, Some(self.package_selected.as_ref().unwrap()));
@@ -139,7 +143,7 @@ impl PlumeFrameMessageHandler {
                 self.plume_frame.install_page.panel.hide();
                 self.plume_frame.default_page.panel.show(true);
                 self.plume_frame.frame.layout();
-                self.signer_settings = SignerSettings::default();
+                self.signer_settings = SignerOptions::default();
                 self.plume_frame.install_page.set_settings(&self.signer_settings, None);
                 self.plume_frame.add_ipa_button.enable(true);
             }
@@ -182,6 +186,17 @@ impl PlumeFrameMessageHandler {
                     self.handle_message(PlumeFrameMessage::Error(format!("Failed to send two-factor code response: {}", e)));
                 }
             }
+            PlumeFrameMessage::RequestTeamSelection(teams, tx) => {
+                let result = self.plume_frame.create_text_selection_dialog(
+                    "Select a Team",
+                    "Please select a team from the list:",
+                    teams,
+                );
+
+                if let Err(e) = tx.send(result) {
+                    self.handle_message(PlumeFrameMessage::Error(format!("Failed to send team selection response: {}", e)));
+                }
+            }
             PlumeFrameMessage::InstallProgress(progress, message_opt) => {
                 println!("Progress: {} - {:?}", progress, message_opt);
                 let Some(selected_package) = &self.package_selected else {

apps/plumeimpactor/src/frame.rs

@@ -4,7 +4,6 @@ mod frame;
 mod keychain;
 mod pages;
 mod handlers;
-mod utils;
 
 use std::{
     env, 
@@ -25,18 +24,16 @@ use thiserror::Error as ThisError;
 
 #[derive(Debug, ThisError)]
 pub enum Error {
-    #[error("Info.plist not found")]
-    PackageInfoPlistMissing,
     #[error("I/O error: {0}")]
     Io(#[from] std::io::Error),
     #[error("Plist error: {0}")]
     Plist(#[from] plist::Error),
-    #[error("Zip error: {0}")]
-    Zip(#[from] zip::result::ZipError),
     #[error("Idevice error: {0}")]
     Idevice(#[from] idevice::IdeviceError),
     #[error("GrandSlam error: {0}")]
     GrandSlam(#[from] grand_slam::Error),
+    #[error("Utils error: {0}")]
+    Utils(#[from] utils::Error),
 }
 
 pub fn get_data_path() -> PathBuf {
@@ -51,4 +48,4 @@ pub fn get_data_path() -> PathBuf {
     fs::create_dir_all(&dir).ok();
 
     dir
-}
+}

apps/plumeimpactor/src/handlers.rs

@@ -1,8 +1,6 @@
-use grand_slam::utils::{PlistInfoTrait, SignerSettings};
+use utils::{PlistInfoTrait, SignerOptions, Package};
 use wxdragon::prelude::*;
 
-use crate::utils::Package;
-
 #[derive(Clone)]
 pub struct InstallPage {
     pub panel: Panel,
@@ -17,7 +15,6 @@ pub struct InstallPage {
     ipad_fullscreen_checkbox: CheckBox,
     game_mode_checkbox: CheckBox,
     pro_motion_checkbox: CheckBox,
-    should_embed_pairing_checkbox: CheckBox,
     skip_registering_extensions_checkbox: CheckBox,
 
     original_name: Option<String>,
@@ -80,10 +77,6 @@ pub fn create_install_page(frame: &Frame) -> InstallPage {
     let advanced_label = StaticText::builder(&panel)
         .with_label("Advanced:")
         .build();
-    let should_embed_pairing_checkbox = CheckBox::builder(&panel)
-        .with_label("Embed Pairing File")
-        .build();
-    should_embed_pairing_checkbox.enable(false);
     let skip_registering_extensions_checkbox = CheckBox::builder(&panel)
         .with_label("Only Register Main Bundle")
         .build();
@@ -94,8 +87,7 @@ pub fn create_install_page(frame: &Frame) -> InstallPage {
     checkbox_sizer.add(&game_mode_checkbox, 0, SizerFlag::Expand | SizerFlag::Top | SizerFlag::Left, 8);
     checkbox_sizer.add(&pro_motion_checkbox, 0, SizerFlag::Expand | SizerFlag::Top | SizerFlag::Left | SizerFlag::Bottom, 8);
     checkbox_sizer.add(&advanced_label, 0, SizerFlag::Top | SizerFlag::Bottom, 6);
-    checkbox_sizer.add(&should_embed_pairing_checkbox, 0, SizerFlag::Expand | SizerFlag::Left, 8);
-    checkbox_sizer.add(&skip_registering_extensions_checkbox, 0, SizerFlag::Expand | SizerFlag::Top | SizerFlag::Left, 8);
+    checkbox_sizer.add(&skip_registering_extensions_checkbox, 0, SizerFlag::Expand | SizerFlag::Left, 8);
 
     settings_sizer.add_sizer(&textfields_sizer, 1, SizerFlag::Expand | SizerFlag::Right, 13);
     settings_sizer.add_sizer(&checkbox_sizer, 1, SizerFlag::Expand, 13);
@@ -140,7 +132,6 @@ pub fn create_install_page(frame: &Frame) -> InstallPage {
         ipad_fullscreen_checkbox,
         game_mode_checkbox,
         pro_motion_checkbox,
-        should_embed_pairing_checkbox,
         skip_registering_extensions_checkbox,
 
         original_name: None,
@@ -151,14 +142,13 @@ pub fn create_install_page(frame: &Frame) -> InstallPage {
 
 
 impl InstallPage {
-    pub fn set_settings(&mut self, settings: &SignerSettings, package: Option<&Package>) {
-        self.support_older_versions_checkbox.set_value(settings.support_minimum_os_version);
-        self.support_file_sharing_checkbox.set_value(settings.support_file_sharing);
-        self.ipad_fullscreen_checkbox.set_value(settings.support_ipad_fullscreen);
-        self.game_mode_checkbox.set_value(settings.support_game_mode);
-        self.pro_motion_checkbox.set_value(settings.support_pro_motion);
-        self.should_embed_pairing_checkbox.set_value(settings.should_embed_pairing);
-        self.skip_registering_extensions_checkbox.set_value(settings.should_only_use_main_provisioning);
+    pub fn set_settings(&mut self, settings: &SignerOptions, package: Option<&Package>) {
+        self.support_older_versions_checkbox.set_value(settings.features.support_minimum_os_version);
+        self.support_file_sharing_checkbox.set_value(settings.features.support_file_sharing);
+        self.ipad_fullscreen_checkbox.set_value(settings.features.support_ipad_fullscreen);
+        self.game_mode_checkbox.set_value(settings.features.support_game_mode);
+        self.pro_motion_checkbox.set_value(settings.features.support_pro_motion);
+        self.skip_registering_extensions_checkbox.set_value(settings.embedding.single_profile);
 
         if let Some(package) = package {
             if let Some(ref name) = package.get_name() {
@@ -194,15 +184,14 @@ impl InstallPage {
         }
     }
 
-    pub fn update_fields(&self, settings: &mut SignerSettings) {
-        settings.support_minimum_os_version = self.support_older_versions_checkbox.get_value();
-        settings.support_file_sharing = self.support_file_sharing_checkbox.get_value();
-        settings.support_ipad_fullscreen = self.ipad_fullscreen_checkbox.get_value();
-        settings.support_game_mode = self.game_mode_checkbox.get_value();
-        settings.support_pro_motion = self.pro_motion_checkbox.get_value();
-        settings.should_embed_pairing = self.should_embed_pairing_checkbox.get_value();
-        settings.should_only_use_main_provisioning = self.skip_registering_extensions_checkbox.get_value();
-        
+    pub fn update_fields(&self, settings: &mut SignerOptions) {
+        settings.features.support_minimum_os_version = self.support_older_versions_checkbox.get_value();
+        settings.features.support_file_sharing = self.support_file_sharing_checkbox.get_value();
+        settings.features.support_ipad_fullscreen = self.ipad_fullscreen_checkbox.get_value();
+        settings.features.support_game_mode = self.game_mode_checkbox.get_value();
+        settings.features.support_pro_motion = self.pro_motion_checkbox.get_value();
+        settings.embedding.single_profile = self.skip_registering_extensions_checkbox.get_value();
+
         if let Some(ref original_name) = self.original_name {
             let current_name = self.custom_name_textfield.get_value();
             if &current_name != original_name {

apps/plumeimpactor/src/main.rs

@@ -111,17 +111,6 @@ pub fn create_settings_dialog(parent: &Window) -> SettingsDialog {
 
     sizer.add(&StaticLine::builder(&dialog).build(), 0, SizerFlag::Expand | SizerFlag::All, 13);
 
-    let cert_button_sizer = BoxSizer::builder(Orientation::Horizontal).build();
-    let import_cert_button = Button::builder(&dialog).with_label("Import P12").build();
-    import_cert_button.enable(false);
-    let export_cert_button = Button::builder(&dialog).with_label("Export P12").build();
-    export_cert_button.enable(false);
-    cert_button_sizer.add(&import_cert_button, 1, SizerFlag::Expand, 0);
-    cert_button_sizer.add_spacer(13);
-    cert_button_sizer.add(&export_cert_button, 1, SizerFlag::Expand, 0);
-
-    sizer.add_sizer(&cert_button_sizer, 0, SizerFlag::Right | SizerFlag::Left, 13);
-
     dialog.set_sizer(sizer, true);
 
     SettingsDialog {
@@ -206,3 +195,21 @@ impl PlumeFrame {
         result
     }
 }
+
+// MARK: - Text Selection Dialog
+impl PlumeFrame {
+    pub fn create_text_selection_dialog(
+        &self, title: &str,
+        label: &str,
+        choices: Vec<String>,
+    ) -> Result<i32, String> {
+        let choice_refs: Vec<&str> = choices.iter().map(|s| s.as_str()).collect();
+        let dialog = SingleChoiceDialog::builder(&self.frame, label, title, &choice_refs).build();
+        let rc = dialog.show_modal();
+        if rc == ID_OK as i32 {
+            Ok(dialog.get_selection())
+        } else {
+            Err("Dialog cancelled".to_string())
+        }
+    }
+}