Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/mergify-ci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ publish = false
[dependencies]
chrono = { version = "0.4", default-features = false, features = ["clock", "serde", "std"] }
mergify-core = { path = "../mergify-core" }
getrandom = "0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml_ng = "0.10"
tokio = { version = "1", default-features = false, features = ["rt"] }
url = "2"
uuid = { version = "1", features = ["v4"] }

[dev-dependencies]
mergify-test-support = { path = "../mergify-test-support" }
Expand Down
20 changes: 19 additions & 1 deletion crates/mergify-ci/src/queue_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fn write_github_output(metadata: &MergeQueueMetadata) -> Result<(), CliError> {
let Some(path) = env::var("GITHUB_OUTPUT").ok().filter(|s| !s.is_empty()) else {
return Ok(());
};
let delimiter = format!("ghadelimiter_{}", uuid::Uuid::new_v4());
let delimiter = format!("ghadelimiter_{}", random_delimiter_suffix()?);
let compact = serde_json::to_string(metadata)
.map_err(|e| CliError::Generic(format!("failed to serialize queue metadata: {e}")))?;
let mut file = OpenOptions::new()
Expand All @@ -61,6 +61,24 @@ fn write_github_output(metadata: &MergeQueueMetadata) -> Result<(), CliError> {
Ok(())
}

/// 16 random bytes rendered as 32 lowercase hex chars — enough
/// entropy to be unguessable inside one GitHub Actions step, which
/// is all the heredoc delimiter needs (it just has to be absent
/// from the metadata payload). `getrandom` reads from the OS RNG
/// directly; we don't need the UUID parsing/formatting plumbing
/// that `uuid` adds on top.
fn random_delimiter_suffix() -> Result<String, CliError> {
let mut buf = [0u8; 16];
getrandom::fill(&mut buf)
.map_err(|e| CliError::Generic(format!("OS random source unavailable: {e}")))?;
let mut hex = String::with_capacity(buf.len() * 2);
for b in buf {
use std::fmt::Write as _;
write!(hex, "{b:02x}").expect("writing to String is infallible");
}
Ok(hex)
}

#[cfg(test)]
mod tests {
use mergify_core::ExitCode;
Expand Down
Loading