lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Check versions on uninstall for safety (#579)

Browse source
This commit is contained in:
Ana Hobden 2023-08-10 10:23:07 -07:00 committed by GitHub
parent c31535a824
commit 5e68cf127b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/cli/subcommand/uninstall.rs
View file

@ -7,7 +7,7 @@ use std::{
use crate::{
cli::{ensure_root, interaction::PromptChoice, signal_channel},
error::HasExpectedErrors,
plan::RECEIPT_LOCATION,
plan::{current_version, RECEIPT_LOCATION},
InstallPlan, NixInstallerError,
};
use clap::{ArgAction, Parser};
@ -111,7 +111,48 @@ impl CommandExecute for Uninstall {
let install_receipt_string = tokio::fs::read_to_string(receipt)
.await
.wrap_err("Reading receipt")?;
let mut plan: InstallPlan = serde_json::from_str(&install_receipt_string)?;
let mut plan: InstallPlan = match serde_json::from_str(&install_receipt_string) {
Ok(plan) => plan,
Err(plan_err) => {
#[derive(serde::Deserialize)]
struct MinimalPlan {
version: semver::Version,
}
let minimal_plan: Result<MinimalPlan, _> =
serde_json::from_str(&install_receipt_string);
match minimal_plan {
Ok(minimal_plan) => {
return Err(plan_err).wrap_err_with(|| {
let plan_version = minimal_plan.version;
let current_version = current_version().map(|v| v.to_string()).unwrap_or_else(|_| env!("CARGO_PKG_VERSION").to_string());
format!(
"\
Unable to parse plan, this plan was created by `nix-installer` version `{plan_version}`, this is `nix-installer` version `{current_version}`\n\
To uninstall, either run `/nix/nix-installer uninstall` or `curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/tag/{plan_version} | sh -s -- uninstall`\
").red().to_string()
});
},
Err(_minimal_plan_err) => return Err(plan_err)?,
}
},
};
if let Err(e) = plan.check_compatible() {
let version = plan.version;
eprintln!(
"{}",
format!("\
{e}\n\
\n\
Found existing plan in `{RECEIPT_LOCATION}` which was created by a version incompatible `nix-installer`.\n\
\n
To uninstall, either run `/nix/nix-installer uninstall` or `curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/tag/${version} | sh -s -- uninstall`\n\
\n\
").red()
);
return Ok(ExitCode::FAILURE);
}
if let Err(err) = plan.pre_uninstall_check().await {
if let Some(expected) = err.expected() {

2
src/plan.rs
View file

@ -425,7 +425,7 @@ async fn write_receipt(plan: InstallPlan) -> Result<(), NixInstallerError> {
Result::<(), NixInstallerError>::Ok(())
}
fn current_version() -> Result<Version, NixInstallerError> {
pub fn current_version() -> Result<Version, NixInstallerError> {
let nix_installer_version_str = env!("CARGO_PKG_VERSION");
Version::from_str(nix_installer_version_str).map_err(|e| {
NixInstallerError::InvalidCurrentVersion(nix_installer_version_str.to_string(), e)