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

Jump to bottom

feat(macos): add team_id option for apple notarization #52

Merged
merged 5 commits into from
Oct 23, 2023
Merged

feat(macos): add team_id option for apple notarization #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d8c7dc
feat(macos): add team_id option for apple notarization
jason-crabnebula Oct 18, 2023
1529d2c
fix(macos): fix notraytool's apple-id option name
jason-crabnebula Oct 18, 2023
294753d
fix(macos): team ID is now required for notarytool via app password
jason-crabnebula Oct 18, 2023
7eea25a
Merge branch 'main' into port-team-id
jason-crabnebula Oct 20, 2023
b783c3e
refactor: remove Error::MissingNotarizeAuthTeamId
jason-crabnebula Oct 20, 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/mac-notarytool-team-id.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"cargo-packager": minor
---

Read the `APPLE_TEAM_ID` environment variable for macOS notarization arguments.
86 changes: 38 additions & 48 deletions crates/packager/src/codesign/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,13 +338,14 @@ fn staple_app(app_bundle_path: PathBuf) -> crate::Result<()> {
#[derive(Debug)]
pub enum NotarizeAuth {
AppleId {
apple_id: String,
password: String,
apple_id: OsString,
password: OsString,
team_id: OsString,
},
ApiKey {
key: String,
key: OsString,
key_path: PathBuf,
issuer: String,
issuer: OsString,
},
}

Expand All @@ -355,11 +356,20 @@ pub trait NotarytoolCmdExt {
impl NotarytoolCmdExt for Command {
fn notarytool_args(&mut self, auth: &NotarizeAuth) -> &mut Self {
match auth {
NotarizeAuth::AppleId { apple_id, password } => self
.arg("--apple-id")
.arg(apple_id)
.arg("--password")
.arg(password),
NotarizeAuth::AppleId {
apple_id,
password,
team_id,
} => {
self.arg("--apple-id")
.arg(apple_id)
.arg("--password")
.arg(password)
.arg("--team-id")
.arg(team_id);

self
}
NotarizeAuth::ApiKey {
key,
key_path,
Expand All @@ -380,50 +390,28 @@ pub fn notarize_auth() -> crate::Result<NotarizeAuth> {
match (
std::env::var_os("APPLE_ID"),
std::env::var_os("APPLE_PASSWORD"),
std::env::var_os("APPLE_TEAM_ID"),
) {
(Some(apple_id), Some(apple_password)) => {
let apple_id = apple_id
.to_str()
.expect("failed to convert APPLE_ID to string")
.to_string();
let password = apple_password
.to_str()
.expect("failed to convert APPLE_PASSWORD to string")
.to_string();
Ok(NotarizeAuth::AppleId { apple_id, password })
}
(Some(apple_id), Some(password), Some(team_id)) => Ok(NotarizeAuth::AppleId {
apple_id,
password,
team_id,
}),
_ => {
match (
std::env::var_os("APPLE_API_KEY"),
std::env::var_os("APPLE_API_ISSUER"),
std::env::var("APPLE_API_KEY_PATH"),
) {
(Some(api_key), Some(api_issuer), Ok(key_path)) => {
let key = api_key
.to_str()
.expect("failed to convert APPLE_API_KEY to string")
.to_string();
let issuer = api_issuer
.to_str()
.expect("failed to convert APPLE_API_ISSUER to string")
.to_string();
Ok(NotarizeAuth::ApiKey {
key,
key_path: key_path.into(),
issuer,
})
}
(Some(api_key), Some(api_issuer), Err(_)) => {
let key = api_key
.to_str()
.expect("failed to convert APPLE_API_KEY to string")
.to_string();
let issuer = api_issuer
.to_str()
.expect("failed to convert APPLE_API_ISSUER to string")
.to_string();

let api_key_file_name = format!("AuthKey_{key}.p8");
(Some(key), Some(issuer), Ok(key_path)) => Ok(NotarizeAuth::ApiKey {
key,
key_path: key_path.into(),
issuer,
}),
(Some(key), Some(issuer), Err(_)) => {
let mut api_key_file_name = OsString::from("AuthKey_");
api_key_file_name.push(&key);
api_key_file_name.push(".p8");
let mut key_path = None;

let mut search_paths = vec!["./private_keys".into()];
Expand All @@ -448,7 +436,9 @@ pub fn notarize_auth() -> crate::Result<NotarizeAuth> {
})
} else {
Err(Error::ApiKeyMissing {
filename: api_key_file_name,
filename: api_key_file_name
.into_string()
.expect("failed to convert api_key_file_name to string"),
})
}
}
Expand All @@ -458,7 +448,7 @@ pub fn notarize_auth() -> crate::Result<NotarizeAuth> {
}
}

fn find_api_key(folder: PathBuf, file_name: &str) -> Option<PathBuf> {
fn find_api_key(folder: PathBuf, file_name: &OsString) -> Option<PathBuf> {
let path = folder.join(file_name);
if path.exists() {
Some(path)
Expand Down
2 changes: 1 addition & 1 deletion crates/packager/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ pub enum Error {
filename: String,
},
/// Missing notarize environment variables.
#[error("Could not find APPLE_ID & APPLE_PASSWORD or APPLE_API_KEY & APPLE_API_ISSUER & APPLE_API_KEY_PATH environment variables found")]
#[error("Could not find APPLE_ID & APPLE_PASSWORD & APPLE_TEAM_ID or APPLE_API_KEY & APPLE_API_ISSUER & APPLE_API_KEY_PATH environment variables found")]
MissingNotarizeAuthVars,
/// Failed to list keychains
#[error("Failed to list keychains: {0}")]
Expand Down