Skip to content

Harden Windows crashtracking trampoline handling #1967

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

Draft
paullegranddc wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −8
Draft

Harden Windows crashtracking trampoline handling #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion datadog-sidecar/src/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use libdd_crashtracker_ffi::{ddog_crasht_init_windows, Metadata};
use manual_future::ManualFuture;
use spawn_worker::{write_crashtracking_trampoline, SpawnWorker, Stdio, TrampolineData};
use std::ffi::CStr;
use std::fs::File;
use std::io::{self, Error};
use std::os::windows::io::{FromRawHandle, IntoRawHandle, OwnedHandle};
use std::ptr::null_mut;
Expand Down Expand Up @@ -124,7 +125,8 @@ pub fn ddog_setup_crashtracking(endpoint: Option<&Endpoint>, metadata: Metadata)
"datadog-crashtracking-{}",
primary_sidecar_identifier()
)) {
Ok((path, _)) => {
Ok((path, file)) => {
*CRASHTRACKING_TRAMPOLINE.lock_or_panic() = Some(file);
if let Ok(path_str) = path.into_os_string().into_string() {
return ddog_crasht_init_windows(
CharSlice::from(path_str.as_str()),
Expand All @@ -143,6 +145,8 @@ pub fn ddog_setup_crashtracking(endpoint: Option<&Endpoint>, metadata: Metadata)
false
}

static CRASHTRACKING_TRAMPOLINE: LazyLock<Mutex<Option<File>>> = LazyLock::new(|| Mutex::new(None));

static SIDECAR_IDENTIFIER: LazyLock<String> = LazyLock::new(fetch_sidecar_identifier);

fn fetch_sidecar_identifier() -> String {
Expand Down
21 changes: 14 additions & 7 deletions spawn_worker/src/win32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,19 @@ fn write_trampoline(process_name: &Option<String>) -> io::Result<(PathBuf, File)
}

pub fn write_crashtracking_trampoline(process_name: &String) -> io::Result<(PathBuf, File)> {
let mut path = env::temp_dir().join(process_name);
path.set_extension("dll");

// Attempt to move it just in case it already exists
let mut old_path = path.clone();
old_path.set_extension("old");
let _ = fs::rename(&path, old_path);
let path = loop {
let mut path = env::temp_dir().join(format!(
"{}-{}",
process_name,
std::iter::repeat_with(fastrand::alphanumeric)
.take(8)
.collect::<String>()
));
path.set_extension("dll");
if !path.exists() {
break path;
}
};

let mut file = OpenOptions::new()
.create_new(true)
Expand All @@ -109,6 +115,7 @@ pub fn write_crashtracking_trampoline(process_name: &String) -> io::Result<(Path
let file = OpenOptions::new()
.read(true)
.share_mode(FILE_SHARE_READ | FILE_SHARE_DELETE)
.custom_flags(FILE_FLAG_DELETE_ON_CLOSE)
.open(path.clone())?;

Ok((path, file))
Expand Down
Loading