Mirrors/xc
1
0
Fork 0
mirror of https://github.com/michael-yuji/xc.git synced 2026-03-21 16:24:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

clippy fixes

Browse Source
This commit is contained in:
Yan Ka, Chiu
2023-07-14 02:07:31 -04:00
parent ba9f7aa5be
commit 2fb0b5e23d
5 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
varutil/src/parse.rs
View File

@@ -378,7 +378,9 @@ mod tests {
var,
Variable::OrElse(
"PROFILE".to_string(),
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))));
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))
)
);
assert_eq!(v2, None);
}
@@ -391,7 +393,9 @@ mod tests {
var,
Variable::OrElse(
"PROFILE".to_string(),
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))));
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))
)
);
assert_eq!(v2, None);
}
@@ -405,7 +409,9 @@ mod tests {
var,
&Variable::OrElse(
"PROFILE".to_string(),
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))));
Box::new(Variable::Const("profile-arm64-minimum.txt".to_string()))
)
);
assert_eq!(v2, None);
}
#[test]

1
xc-bin/src/jailfile/directives/copy.rs
View File

@@ -137,7 +137,6 @@ mod tests {
fn test_parse_args() {
let input = ["oo", "--from", "abcde", "--to", "fgh", ".", "."];
let parsed = CopyDirective::parse_from(input);
println!("{parsed:?}");
assert_eq!(parsed.from, Some("abcde".to_string()));
assert_eq!(parsed.to, Some("fgh".to_string()));
assert_eq!(parsed.source_path, ".".to_string());

124
xc-bin/src/main.rs
View File

@@ -612,77 +612,75 @@ fn main() -> Result<(), ActionError> {
}
let entry_point = entry_point.unwrap_or_else(|| "main".to_string());
let envs = {
let mut map = std::collections::HashMap::new();
for env in envs.into_iter() {
map.insert(env.key, env.value);
}
map
};
let dns = if empty_dns {
DnsSetting::Specified {
servers: Vec::new(),
search_domains: Vec::new(),
}
} else if dns_servers.is_empty() && dns_searchs.is_empty() {
DnsSetting::Inherit
} else {
DnsSetting::Specified {
servers: dns_servers,
search_domains: dns_searchs,
}
};
let hostname = hostname.or_else(|| name.clone());
let mount_req = mounts
.iter()
.map(|mount| {
let source = std::fs::canonicalize(mount.source.clone())
.unwrap()
.to_string_lossy()
.to_string();
MountReq {
source,
dest: mount.destination.clone(),
}
})
.collect::<Vec<_>>();
let copies: List<CopyFile> = copy
.into_iter()
.map(|bind| {
let file = std::fs::OpenOptions::new()
.read(true)
.open(bind.source)
.expect("cannot open file for reading");
let source = Fd(file.into_raw_fd());
CopyFile {
source,
destination: bind.destination,
}
})
.collect();
let mut extra_layer_files = Vec::new();
for layer in extra_layers.iter() {
extra_layer_files.push(std::fs::OpenOptions::new().read(true).open(layer)?);
}
let extra_layers =
List::from_iter(extra_layer_files.iter().map(|file| Fd(file.as_raw_fd())));
let (res, notify) = {
let envs = {
let mut map = std::collections::HashMap::new();
for env in envs.into_iter() {
map.insert(env.key, env.value);
}
map
};
let dns = if empty_dns {
DnsSetting::Specified {
servers: Vec::new(),
search_domains: Vec::new(),
}
} else if dns_servers.is_empty() && dns_searchs.is_empty() {
DnsSetting::Inherit
} else {
DnsSetting::Specified {
servers: dns_servers,
search_domains: dns_searchs,
}
};
let hostname = hostname.or_else(|| name.clone());
let mount_req = mounts
.iter()
.map(|mount| {
let source = std::fs::canonicalize(mount.source.clone())
.unwrap()
.to_string_lossy()
.to_string();
MountReq {
source,
dest: mount.destination.clone(),
}
})
.collect::<Vec<_>>();
let copies: List<CopyFile> = copy
.into_iter()
.map(|bind| {
let file = std::fs::OpenOptions::new()
.read(true)
.open(bind.source)
.expect("cannot open file for reading");
let source = Fd(file.into_raw_fd());
CopyFile {
source,
destination: bind.destination,
}
})
.collect();
let main_started_notify = if detach {
Maybe::None
} else {
let fd = unsafe { eventfd(0, nix::libc::EFD_NONBLOCK) };
Maybe::Some(Fd(fd))
};
let mut extra_layer_files = Vec::new();
for layer in extra_layers.iter() {
extra_layer_files.push(std::fs::OpenOptions::new().read(true).open(layer)?);
}
let extra_layers =
List::from_iter(extra_layer_files.iter().map(|file| Fd(file.as_raw_fd())));
let mut reqt = InstantiateRequest {
alt_root: None,
name,

5
xc/src/container/runner.rs
View File

@@ -338,6 +338,7 @@ impl ProcessRunner {
exec: &Jexec,
notify: Option<Arc<EventFdNotify>>,
) -> Result<SpawnInfo, ExecError> {
debug!("spawn: {exec:#?}");
let jail = freebsd::jail::RunningJail::from_jid_unchecked(self.container.jid);
let paths = exec
.envs
@@ -446,7 +447,9 @@ impl ProcessRunner {
pub fn run_main(&mut self) {
if let Some(main) = self.container.main_proto.clone() {
_ = self.spawn_process("main", &main, None);
if let Err(error) = self.spawn_process("main", &main, None) {
error!("cannot spawn main: {error:#?}");
}
self.container.main_started_notify.notify_waiters();
self.main_started = true;
self.should_run_main = false;

4
xcd/src/auth/mod.rs
View File

@@ -51,7 +51,7 @@ impl Credential {
#[inline(always)]
pub(crate) fn can_read(&self, metadata: &Metadata) -> bool {
let mode = metadata.mode();
self.unix_credential.uid == 0
self.unix_credential.uid == 0
|| mode & 0o004 > 0
|| mode & 0o400 > 0 && self.unix_credential.uid == metadata.uid()
|| mode & 0o040 > 0 && self.unix_credential.gids.contains(&metadata.gid())
@@ -60,7 +60,7 @@ impl Credential {
#[inline(always)]
pub(crate) fn can_write(&self, metadata: &Metadata) -> bool {
let mode = metadata.mode();
self.unix_credential.uid == 0
self.unix_credential.uid == 0
|| mode & 0o002 > 0
|| mode & 0o200 > 0 && self.unix_credential.uid == metadata.uid()
|| mode & 0o020 > 0 && self.unix_credential.gids.contains(&metadata.gid())