Fixes #337

Dockerfile.odin

@@ -14,6 +14,7 @@ RUN cargo chef prepare --recipe-path recipe.json
 # ------------------ #
 FROM lukemathwalker/cargo-chef:latest-rust-${RUST_VERSION} as cacher
 WORKDIR /data/odin
+RUN apt-get update && apt-get install -y cmake
 COPY --from=planner /data/odin/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
@@ -24,6 +25,7 @@ RUN cargo chef cook --release --recipe-path recipe.json
 FROM rust:${RUST_VERSION} as builder
 WORKDIR /data/odin
 COPY . .
+RUN apt-get update && apt-get install -y cmake
 # Copy over the cached dependencies
 COPY --from=cacher /data/odin/target target
 COPY --from=cacher /usr/local/cargo/registry /usr/local/cargo/

README.md

@@ -15,7 +15,9 @@
 <a href="https://github.com/mbround18/valheim-docker/actions/workflows/docker-release.yml"><img src="https://img.shields.io/github/actions/workflow/status/mbround18/valheim-docker/docker-release.yml?label=Docker&style=for-the-badge" alt=""></a>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+
 [![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## Table of Contents

src/huginn/main.rs

@@ -1,6 +1,7 @@
 mod routes;
 
 use log::info;
+use odin::utils::is_root::is_root;
 use odin::{logger::initialize_logger, server::ServerInfo, utils::environment::fetch_var};
 use std::net::SocketAddrV4;
 use std::str::FromStr;
@@ -14,6 +15,9 @@ fn fetch_info() -> ServerInfo {
 
 #[tokio::main]
 async fn main() {
+  if is_root() {
+    panic!("You must run this executable without root permissions");
+  }
   // Logger
   let debug_mode = fetch_var("DEBUG_MODE", "0").eq("1");
   initialize_logger(debug_mode).unwrap();

src/odin/Cargo.toml

@@ -40,14 +40,16 @@ tar = "0.4"
 flate2 = "1.0"
 inflections = "1.1.1"
 md5 = "0.7"
-reqwest = { version = "0.11", default_features = false, features = ["blocking", "json", "rustls-tls"] }
+reqwest = { version = "0.12.4", default_features = false, features = ["blocking", "json", "rustls-tls"] }
 chrono = "0.4"
-zip = { version = "0.6" }
+zip = { version = "1.1.0" }
 fs_extra = "1.3"
 glob = "0.3"
 a2s = "0.5"
 serde_with = "3"
 regex = "1"
+users = "0.11.0"
+
 
 [dev-dependencies]
 once_cell = "1"

src/odin/main.rs

@@ -8,6 +8,7 @@ use crate::commands::configure::Modifiers;
 use crate::executable::handle_exit_status;
 use crate::logger::debug_mode;
 use crate::messages::about;
+use crate::utils::is_root::is_root;
 
 mod cli;
 pub mod commands;
@@ -25,6 +26,10 @@ pub mod traits;
 pub mod utils;
 
 fn main() {
+  if is_root() {
+    panic!("You must run this executable without root permissions");
+  }
+
   dotenv().ok();
 
   use cli::{Cli, Commands};

src/odin/mods/mod.rs

@@ -26,15 +26,16 @@ impl ZipExt for ZipArchive<File> {
   fn extract_sub_dir_custom<P: AsRef<Path>>(&mut self, dst_dir: P, sub_dir: &str) -> ZipResult<()> {
     for i in 0..self.len() {
       let mut file = self.by_index(i)?;
-      let filepath = match file
+      let enclosed = match file
         .enclosed_name()
-        .ok_or(ZipError::InvalidArchive("Invalid file path"))?
-        .strip_prefix(sub_dir)
+        .ok_or(ZipError::InvalidArchive("Invalid file path"))
       {
         Ok(path) => path,
         Err(_) => continue,
       };
 
+      let filepath = enclosed.strip_prefix(sub_dir).unwrap();
+
       let mut out_path = dst_dir.as_ref().join(filepath);
 
       debug!("Extracting file: {:?}", out_path);

src/odin/utils/is_root.rs

@@ -0,0 +1,9 @@
+use users::{get_current_uid, get_user_by_uid};
+
+pub fn is_root() -> bool {
+  let current_uid = get_current_uid();
+  match get_user_by_uid(current_uid) {
+    Some(user) => user.uid() == 0,
+    None => panic!("Failed to get user information."),
+  }
+}

src/odin/utils/mod.rs

@@ -1,6 +1,7 @@
 pub mod common_paths;
 pub mod environment;
 pub mod fetch_public_ip_address;
+pub mod is_root;
 pub mod parse_truthy;
 
 pub use fetch_public_ip_address::fetch_public_address;