CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(macos-sign): use base64 crate instead of Command (#15038)

Browse Source 
* refactor(macos-sign): use base64 crate instead of Command

* add base64 crate as a dependency

* add change file

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>
This commit is contained in:
Amr Bashir
2026-03-10 14:14:58 +02:00
committed by GitHub
parent 6cb86c9e42
commit eacd36a4ea
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/base64.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri-macos-sign": patch:enhance
---
Do not rely on system base64 CLI to decode certificates.

1
Cargo.lock generated
View File

@@ -8712,6 +8712,7 @@ name = "tauri-macos-sign"
version = "2.3.3"
dependencies = [
"apple-codesign",
"base64 0.22.1",
"chrono",
"dirs 6.0.0",
"log",

1
crates/tauri-macos-sign/Cargo.toml
View File

@@ -25,3 +25,4 @@ log = { version = "0.4.21", features = ["kv"] }
apple-codesign = { version = "0.27", default-features = false }
chrono = "0.4"
p12 = "0.6"
base64 = "0.22"

41
crates/tauri-macos-sign/src/lib.rs
View File

@@ -64,6 +64,8 @@ pub enum Error {
},
#[error("failed to encode DER: {error}")]
FailedToEncodeDER { error: std::io::Error },
#[error("failed to decode base64 certificate: {0}")]
Base64Decode(base64::DecodeError),
#[error("certificate missing common name")]
CertificateMissingCommonName,
#[error("certificate missing organization unit for common name {common_name}")]
@@ -329,36 +331,23 @@ impl NotarytoolCmdExt for Command {
}
}
fn decode_base64(base64: &OsStr, out_path: &Path) -> Result<()> {
let tmp_dir = tempfile::tempdir().map_err(Error::TempDir)?;
fn decode_base64(base64_input: &OsStr, out_path: &Path) -> Result<()> {
use base64::Engine;
let src_path = tmp_dir.path().join("src");
let base64 = base64
let input = base64_input
.to_str()
.expect("failed to convert base64 to string")
.as_bytes();
.expect("failed to convert base64 to string");
// as base64 contain whitespace decoding may be broken
// https://github.com/marshallpierce/rust-base64/issues/105
// we'll use builtin base64 command from the OS
std::fs::write(&src_path, base64).map_err(|error| Error::Fs {
context: "failed to write base64 to temp file",
path: src_path.clone(),
error,
})?;
// strip whitespace before decoding
let cleaned: String = input.chars().filter(|c| !c.is_ascii_whitespace()).collect();
assert_command(
std::process::Command::new("base64")
.arg("--decode")
.arg("-i")
.arg(&src_path)
.arg("-o")
.arg(out_path)
.piped(),
"failed to decode certificate",
)
.map_err(|error| Error::CommandFailed {
command: "base64 --decode".to_string(),
let decoded = base64::engine::general_purpose::STANDARD
.decode(&cleaned)
.map_err(Error::Base64Decode)?;
std::fs::write(out_path, &decoded).map_err(|error| Error::Fs {
context: "failed to write decoded certificate",
path: out_path.to_path_buf(),
error,
})?;