Skip to content

Fix CVE-2025-5791 #60

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

Merged
schaefi merged 2 commits into from
Jun 25, 2025
Merged

Fix CVE-2025-5791 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7b9f9
Fix CVE-2025-5791
schaefi Jun 25, 2025
98ae4e9
Fix CVE-2025-3416
schaefi Jun 25, 2025
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
2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ log = { version = "0.4" }
thiserror = { version = "1.0" }
serde_yaml = { version = "0.9" }
lazy_static = { version = "1.4" }
users = { version = "0.11" }
uzers = { version = "0.12" }
rust-ini = { version = "0.21" }
tempfile = { version = "3.4" }

Expand Down
2 changes: 1 addition & 1 deletion common/src/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use crate::flakelog::FlakeLog;
use crate::error::FlakeError;
use crate::user::User;
use crate::command::CommandExtTrait;
use users::{get_current_uid, get_current_gid};
use uzers::{get_current_uid, get_current_gid};

#[derive(Debug, Default, Clone, Copy)]
pub struct Container {
Expand Down
2 changes: 1 addition & 1 deletion common/src/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use std::path::Path;
use std::{process::Command, ffi::OsStr};
use serde::{Serialize, Deserialize};
use crate::command::{CommandExtTrait, CommandError};
use users::{get_current_uid, get_current_groupname};
use uzers::{get_current_uid, get_current_groupname};

#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize)]
pub struct User<'a> {
Expand Down
2 changes: 1 addition & 1 deletion flake-ctl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ indicatif = { version = "0.15" }
tokio = { version = "1.32", features = ["full"] }
tempfile = { version = "3.4" }
flakes = { version = "3.1.18", path = "../common" }
users = { version = "0.11" }
uzers = { version = "0.12" }
2 changes: 1 addition & 1 deletion flake-ctl/src/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ pub async fn send_request(
let request_status = format!("{}", status);
if request_status != "200 OK" {
return Err(
Box::new(Error::new(ErrorKind::Other, request_status))
Box::new(Error::other(request_status))
)
}
},
Expand Down
2 changes: 1 addition & 1 deletion flake-ctl/src/podman.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::defaults;
use crate::{app, app_config};
use flakes::container::Container;
use flakes::config::get_flakes_dir;
use users::{get_current_username};
use uzers::{get_current_username};

pub fn pull(uri: &String) -> i32 {
/*!
Expand Down
2 changes: 1 addition & 1 deletion podman-pilot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ serde_yaml = { version = "0.9" }
regex = { version = "1.9" }
flakes = { version = "3.1.18", path = "../common" }
rust-ini = { version = "0.21" }
users = { version = "0.11" }
uzers = { version = "0.12" }
atty = { version = "0.2" }
2 changes: 1 addition & 1 deletion podman-pilot/src/podman.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use spinoff::{Spinner, spinners, Color};
use tempfile::tempfile;
use regex::Regex;

use users::{get_current_username};
use uzers::{get_current_username};

pub fn create(
program_name: &String
Expand Down