这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: sanitize logging prefix for GitLab groups #10850

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

Merged
merged 2 commits into from
Sep 23, 2025
Merged

fix: sanitize logging prefix for GitLab groups #10850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e9a16
fix: sanitize logging prefix for GitLab groups
anthonyshew Sep 15, 2025
f847282
Add a dash.
anthonyshew Sep 23, 2025
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
34 changes: 34 additions & 0 deletions crates/turborepo-ci/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,38 @@ mod tests {
}
}
}

#[test]
fn test_gitlab_ci_group_name_sanitization() {
use chrono::DateTime;

let gitlab_vendor = get_vendor("GitLab CI");
let behavior = gitlab_vendor.behavior.as_ref().unwrap();

// Test with a package name containing @ and /
let group_name = "@organisation/package:build".to_string();
let start_time = DateTime::from_timestamp(1234567890, 0).unwrap();
let end_time = DateTime::from_timestamp(1234567900, 0).unwrap();

let start_fn = (behavior.group_prefix)(group_name.clone());
let end_fn = (behavior.group_suffix)(group_name.clone());

let start_output = start_fn(start_time);
let end_output = end_fn(end_time);

// The section identifier should be sanitized (@ -> at, / -> -)
assert!(start_output.contains("section_start:1234567890:at-organisation-package:build"));
assert!(end_output.contains("section_end:1234567900:at-organisation-package:build"));

// The description should contain the original group name
assert!(start_output.contains("@organisation/package:build"));

// Test with a simple package name (should work unchanged)
let simple_group_name = "simple-package:build".to_string();
let simple_start_fn = (behavior.group_prefix)(simple_group_name.clone());
let simple_start_output = simple_start_fn(start_time);

assert!(simple_start_output.contains("section_start:1234567890:simple-package:build"));
assert!(simple_start_output.contains("simple-package:build"));
}
}
13 changes: 11 additions & 2 deletions crates/turborepo-ci/src/vendors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,16 +299,25 @@ pub(crate) fn get_vendors() -> &'static [Vendor] {
|group_name| {
Arc::new(move |start_time| {
let timestamp = start_time.timestamp();
// GitLab CI section names only allow /a-zA-Z0-9._-/ characters
// Replace @ with 'at' and / with '-' for section identifier
let sanitized_group_name =
group_name.replace('@', "at-").replace('/', "-");
format!(
"\\e[0Ksection_start:{timestamp}:{group_name}\\r\\
"\\e[0Ksection_start:{timestamp}:{sanitized_group_name}\\r\\
e[0K{group_name}"
)
})
},
|group_name| {
Arc::new(move |end_time| {
let timestamp = end_time.timestamp();
format!("\\e[0Ksection_end:{timestamp}:{group_name}\\r\\e[0K")
// Use the same sanitization for section end
let sanitized_group_name =
group_name.replace('@', "at-").replace('/', "-");
format!(
"\\e[0Ksection_end:{timestamp}:{sanitized_group_name}\\r\\e[0K"
)
})
},
)),
Expand Down
Loading