Skip to content
Merged
Changes from all commits
Commits
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
38 changes: 26 additions & 12 deletions src-tauri/src/app/win_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,19 @@ fn bind_manifest_checksums(
package_url: &str,
) -> Result<String, AppError> {
let package_file = package_file_name_from_url(package_url)?;
let Some(url_moniker) = msix_stem(&package_file) else {
return Err(AppError::Engine(format!(
"Windows package URL does not end in .msix: {package_url}"
)));
};
if !url_moniker.eq_ignore_ascii_case(&release.package_moniker) {
let err = AppError::Engine(format!(
"Windows manifest package moniker {} does not match URL artifact {}",
release.package_moniker, package_file
));
log::error!("Windows manifest checksums binding mismatch error={err}");
return Err(err);
if let Some(url_moniker) = msix_stem(&package_file) {
if !url_moniker.eq_ignore_ascii_case(&release.package_moniker) {
let err = AppError::Engine(format!(
"Windows manifest package moniker {} does not match URL artifact {}",
release.package_moniker, package_file
));
log::error!("Windows manifest checksums binding mismatch error={err}");
return Err(err);
}
} else {
log::debug!(
"Windows package URL has no direct MSIX artifact name; relying on manifest/checksums binding package_file={package_file}"
);
}
if let Some(identity) = release.package_identity.as_deref() {
if identity != codex_win_engine::OPENAI_PACKAGE_IDENTITY {
Expand Down Expand Up @@ -1189,6 +1190,19 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa OpenAI.Codex_2
);
}

#[test]
fn accepts_stable_windows_short_url_without_msix_suffix() {
let checksums = "\
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa OpenAI.Codex_26.602.3474.0_x64__2p2nqsd0c76g0.Msix
";
let sha = bind_manifest_checksums(&release(), checksums, "https://example.com/latest/win")
.unwrap();
assert_eq!(
sha,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
);
}

#[test]
fn rejects_manifest_url_moniker_mismatch() {
let checksums = "\
Expand Down
Loading