Skip to content
Merged
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
142 changes: 127 additions & 15 deletions guards/github-guard/rust-guard/src/labels/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//! This module contains utility functions used across the labeling system,
//! including JSON extraction, integrity determination, and common operations.

use std::borrow::Cow;
use std::sync::atomic::{AtomicBool, Ordering};

use serde_json::Value;
Expand Down Expand Up @@ -156,10 +157,10 @@ pub struct PolicyContext {
pub demotion_label: String,
}

fn normalize_scope(scope: &str, ctx: &PolicyContext) -> String {
fn normalize_scope<'a>(scope: &'a str, ctx: &'a PolicyContext) -> Cow<'a, str> {
let token = policy_scope_token(&ctx.scopes);
if token.is_empty() {
scope.to_string()
Cow::Borrowed(scope)
} else if ctx
.scopes
.iter()
Expand All @@ -176,10 +177,10 @@ fn normalize_scope(scope: &str, ctx: &PolicyContext) -> String {
if matches_any_scope {
token
} else {
scope.to_string()
Cow::Borrowed(scope)
}
} else {
scope.to_string()
Cow::Borrowed(scope)
}
}

Expand All @@ -191,16 +192,24 @@ fn split_repo_id(repo_id: &str) -> Option<(&str, &str)> {
Some((owner, repo))
}

pub(crate) fn policy_scope_token(scopes: &[PolicyScopeEntry]) -> String {
let labels: Vec<&str> = scopes
pub(crate) fn policy_scope_token(scopes: &[PolicyScopeEntry]) -> Cow<'_, str> {
let mut labels = scopes
.iter()
.map(|s| s.scope_label.as_str())
.filter(|s| !s.is_empty())
.collect();
if labels.is_empty() {
String::new()
} else {
labels.join(" | ")
.filter(|s| !s.is_empty());
match (labels.next(), labels.next()) {
(None, _) => Cow::Borrowed(""),
(Some(first), None) => Cow::Borrowed(first),
(Some(first), Some(second)) => {
let mut value = String::from(first);
value.push_str(" | ");
value.push_str(second);
for rest in labels {
value.push_str(" | ");
value.push_str(rest);
}
Cow::Owned(value)
}
}
}

Expand Down Expand Up @@ -1284,16 +1293,43 @@ fn integrity_rank(scope: &str, labels: &[String], ctx: &PolicyContext) -> u8 {
}

fn integrity_rank_normalized(normalized_scope: &str, labels: &[String]) -> u8 {
// Check from highest to lowest, allocating one label at a time.
if normalized_scope.contains('|') {
// Multi-scope uses canonical "integrity=<base>;scopes=..." encoding.
for (rank, (prefix, base)) in INTEGRITY_LEVELS.iter().enumerate().rev() {
let expected = format_integrity_label(prefix, normalized_scope, base);
if labels.iter().any(|label| label == &expected) {
return (rank + 1) as u8;
}
}
return 0;
}

// Check from highest to lowest.
for (rank, (prefix, base)) in INTEGRITY_LEVELS.iter().enumerate().rev() {
let tag = format_integrity_label(prefix, normalized_scope, base);
if labels.iter().any(|l| l == &tag) {
if labels
.iter()
.any(|label| label_matches_normalized(label, prefix, normalized_scope, base))
{
return (rank + 1) as u8;
}
}
0
}

#[inline]
fn label_matches_normalized(
label: &str,
prefix: &str,
scope: &str,
base: &str,
) -> bool {
if scope.is_empty() {
label == base
} else {
label.strip_prefix(prefix) == Some(scope)
}
}

/// Elevate integrity to the max of current and candidate levels for a scope.
pub fn max_integrity(
scope: &str,
Expand Down Expand Up @@ -1917,11 +1953,54 @@ pub(crate) fn is_any_trusted_actor(username: &str, ctx: &PolicyContext) -> bool
#[cfg(test)]
mod tests {
use super::*;
use std::borrow::Cow;

fn test_ctx() -> PolicyContext {
PolicyContext::default()
}

#[test]
fn test_policy_scope_token_borrows_for_single_scope() {
let scopes = vec![PolicyScopeEntry {
scope_kind: ScopeKind::Owner,
scope_owner: Some("octocat".to_string()),
scope_repo: None,
scope_label: "octocat".to_string(),
}];
let token = policy_scope_token(&scopes);
assert_eq!(token, "octocat");
assert!(matches!(token, Cow::Borrowed(_)));
}

#[test]
fn test_policy_scope_token_owns_for_multi_scope() {
let scopes = vec![
PolicyScopeEntry {
scope_kind: ScopeKind::Owner,
scope_owner: Some("octocat".to_string()),
scope_repo: None,
scope_label: "octocat".to_string(),
},
PolicyScopeEntry {
scope_kind: ScopeKind::RepoPrefix,
scope_owner: Some("octocat".to_string()),
scope_repo: Some("hello".to_string()),
scope_label: "octocat/hello*".to_string(),
},
];
let token = policy_scope_token(&scopes);
assert_eq!(token, "octocat | octocat/hello*");
assert!(matches!(token, Cow::Owned(_)));
}

#[test]
fn test_normalize_scope_borrows_input_when_no_scopes() {
let ctx = test_ctx();
let normalized = normalize_scope("owner/repo", &ctx);
assert_eq!(normalized, "owner/repo");
assert!(matches!(normalized, Cow::Borrowed(_)));
}

#[test]
fn test_is_any_trusted_actor_tiers_and_negative() {
let ctx = PolicyContext {
Expand Down Expand Up @@ -2317,6 +2396,39 @@ mod tests {
assert_eq!(result, candidate, "max_integrity should keep the higher integrity rank");
}

#[test]
fn test_label_matches_normalized_common_paths() {
assert!(label_matches_normalized(
"approved:owner/repo",
label_constants::WRITER_PREFIX,
"owner/repo",
label_constants::WRITER_BASE
));
assert!(label_matches_normalized(
label_constants::READER_BASE,
label_constants::READER_PREFIX,
"",
label_constants::READER_BASE
));
assert!(!label_matches_normalized(
"approved:owner/repo",
label_constants::MERGED_PREFIX,
"owner/repo",
label_constants::MERGED_BASE
));
}

#[test]
fn test_integrity_rank_normalized_multiscope_path() {
let scope = "owner/repo | owner/tool*";
let labels = vec![format_integrity_label(
label_constants::WRITER_PREFIX,
scope,
label_constants::WRITER_BASE,
)];
assert_eq!(integrity_rank_normalized(scope, &labels), 3);
}

#[test]
fn test_integrity_for_level_mapping() {
let ctx = test_ctx();
Expand Down
2 changes: 1 addition & 1 deletion guards/github-guard/rust-guard/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@ pub extern "C" fn label_agent(
})
.collect();

let token = labels::helpers::policy_scope_token(&scopes);
let scope_kind_str = normalized_scope_kind(&scopes);

let ctx = PolicyContext {
Expand All @@ -547,6 +546,7 @@ pub extern "C" fn label_agent(
};

// Compute integrity before moving ctx into the global — borrows ctx, no clone needed.
let token = labels::helpers::policy_scope_token(&ctx.scopes);
let integrity = match integrity_floor {
MinIntegrity::None => labels::none_integrity(&token, &ctx),
MinIntegrity::Unapproved => labels::reader_integrity(&token, &ctx),
Expand Down
Loading