fix(security): backport upstream modpack path traversal fixes
Backport Mystic-Stars/Axolotl b2f81391e584aebf3ef07e8db2fc9cdad2ffb4c7. Adapt validation to this fork and protect CurseForge archive paths and MRPack uninstall cleanup.
This commit is contained in:
1 parent
598fb5c679
commit
159f9e3f38
12 files changed
+545
-153
No files matched your search
@@ -18,6 +18,7 @@ use crate::state::{clear_log_buffer, get_log_buffer, push_log_line};
|
||||
use crate::util::io::IOError;
|
||||
use crate::{ErrorKind, Result};
|
||||
|
||||
use super::files::safe_relative_join;
|
||||
use super::logs::{
|
||||
analyze_exit_reason, stream_server_output, stream_server_pty_output,
|
||||
tail_server_log_file,
|
||||
@@ -131,7 +132,7 @@ async fn start_inner(
|
||||
forge_launch_args(&dir)?
|
||||
} else {
|
||||
let jar_name = resolve_jar_name(&manifest);
|
||||
let jar_path = dir.join(&jar_name);
|
||||
let jar_path = safe_relative_join(&dir, &jar_name)?;
|
||||
if !jar_path.exists() {
|
||||
return Err(ErrorKind::LauncherError(format!(
|
||||
"Server jar not found: {jar_name}. Download the server files first."
|
||||
@@ -275,9 +276,11 @@ async fn start_inner(
|
||||
// so these lines stop the console from looking frozen.
|
||||
let loader_first_run =
|
||||
matches!(manifest.server_type.as_str(), "fabric" | "quilt")
|
||||
&& !dir
|
||||
.join(format!("{}-server-launch.jar", manifest.server_type))
|
||||
.exists();
|
||||
&& !safe_relative_join(
|
||||
&dir,
|
||||
&format!("{}-server-launch.jar", manifest.server_type),
|
||||
)?
|
||||
.exists();
|
||||
|
||||
log_server_step(
|
||||
server_id,
|
||||
|
||||
Reference in new issue
Block a user