openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-30 19:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: enforce argument-comment lint across all targets

Browse Source
This commit is contained in:
Michael Bolin
2026-03-27 17:34:47 -07:00
parent f4f6eca871
commit f05597bbc0
307 changed files with 7720 additions and 4706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/network-proxy/src/config.rs
+25 -14
View File
@@ -659,18 +659,18 @@ mod tests {
#[test]
fn parse_host_port_defaults_for_empty_string() {
assert!(parse_host_port("", 1234).is_err());
assert!(parse_host_port("", /*default_port*/ 1234).is_err());
}
#[test]
fn parse_host_port_defaults_for_whitespace() {
assert!(parse_host_port(" ", 5555).is_err());
assert!(parse_host_port(" ", /*default_port*/ 5555).is_err());
}
#[test]
fn parse_host_port_parses_host_port_without_scheme() {
assert_eq!(
parse_host_port("127.0.0.1:8080", 3128).unwrap(),
parse_host_port("127.0.0.1:8080", /*default_port*/ 3128).unwrap(),
SocketAddressParts {
host: "127.0.0.1".to_string(),
port: 8080,
@@ -681,7 +681,11 @@ mod tests {
#[test]
fn parse_host_port_parses_host_port_with_scheme_and_path() {
assert_eq!(
parse_host_port("http://example.com:8080/some/path", 3128).unwrap(),
parse_host_port(
"http://example.com:8080/some/path",
/*default_port*/ 3128
)
.unwrap(),
SocketAddressParts {
host: "example.com".to_string(),
port: 8080,
@@ -692,7 +696,11 @@ mod tests {
#[test]
fn parse_host_port_strips_userinfo() {
assert_eq!(
parse_host_port("http://user:pass@host.example:5555", 3128).unwrap(),
parse_host_port(
"http://user:pass@host.example:5555",
/*default_port*/ 3128
)
.unwrap(),
SocketAddressParts {
host: "host.example".to_string(),
port: 5555,
@@ -703,7 +711,7 @@ mod tests {
#[test]
fn parse_host_port_parses_ipv6_with_brackets() {
assert_eq!(
parse_host_port("http://[::1]:9999", 3128).unwrap(),
parse_host_port("http://[::1]:9999", /*default_port*/ 3128).unwrap(),
SocketAddressParts {
host: "::1".to_string(),
port: 9999,
@@ -714,7 +722,7 @@ mod tests {
#[test]
fn parse_host_port_does_not_treat_unbracketed_ipv6_as_host_port() {
assert_eq!(
parse_host_port("2001:db8::1", 3128).unwrap(),
parse_host_port("2001:db8::1", /*default_port*/ 3128).unwrap(),
SocketAddressParts {
host: "2001:db8::1".to_string(),
port: 3128,
@@ -725,7 +733,7 @@ mod tests {
#[test]
fn parse_host_port_falls_back_to_default_port_when_port_is_invalid() {
assert_eq!(
parse_host_port("example.com:notaport", 3128).unwrap(),
parse_host_port("example.com:notaport", /*default_port*/ 3128).unwrap(),
SocketAddressParts {
host: "example.com".to_string(),
port: 3128,
@@ -735,13 +743,16 @@ mod tests {
#[test]
fn host_and_port_from_network_addr_defaults_for_empty_string() {
assert_eq!(host_and_port_from_network_addr("", 1234), "<missing>");
assert_eq!(
host_and_port_from_network_addr("", /*default_port*/ 1234),
"<missing>"
);
}
#[test]
fn host_and_port_from_network_addr_formats_ipv6() {
assert_eq!(
host_and_port_from_network_addr("http://[::1]:8080", 3128),
host_and_port_from_network_addr("http://[::1]:8080", /*default_port*/ 3128),
"[::1]:8080"
);
}
@@ -749,7 +760,7 @@ mod tests {
#[test]
fn resolve_addr_maps_localhost_to_loopback() {
assert_eq!(
resolve_addr("localhost", 3128).unwrap(),
resolve_addr("localhost", /*default_port*/ 3128).unwrap(),
"127.0.0.1:3128".parse::<SocketAddr>().unwrap()
);
}
@@ -757,7 +768,7 @@ mod tests {
#[test]
fn resolve_addr_parses_ip_literals() {
assert_eq!(
resolve_addr("1.2.3.4", 80).unwrap(),
resolve_addr("1.2.3.4", /*default_port*/ 80).unwrap(),
"1.2.3.4:80".parse::<SocketAddr>().unwrap()
);
}
@@ -765,7 +776,7 @@ mod tests {
#[test]
fn resolve_addr_parses_ipv6_literals() {
assert_eq!(
resolve_addr("http://[::1]:8080", 3128).unwrap(),
resolve_addr("http://[::1]:8080", /*default_port*/ 3128).unwrap(),
"[::1]:8080".parse::<SocketAddr>().unwrap()
);
}
@@ -773,7 +784,7 @@ mod tests {
#[test]
fn resolve_addr_falls_back_to_loopback_for_hostnames() {
assert_eq!(
resolve_addr("http://example.com:5555", 3128).unwrap(),
resolve_addr("http://example.com:5555", /*default_port*/ 3128).unwrap(),
"127.0.0.1:5555".parse::<SocketAddr>().unwrap()
);
}
codex-rs/network-proxy/src/http_proxy.rs
+22 -8
View File
@@ -1018,7 +1018,9 @@ mod tests {
.unwrap();
req.extensions_mut().insert(state);
let response = http_connect_accept(None, req).await.unwrap_err();
let response = http_connect_accept(/*policy_decider*/ None, req)
.await
.unwrap_err();
assert_eq!(response.status(), StatusCode::FORBIDDEN);
assert_eq!(
response.headers().get("x-proxy-error").unwrap(),
@@ -1043,7 +1045,9 @@ mod tests {
.unwrap();
req.extensions_mut().insert(state);
let (response, _request) = http_connect_accept(None, req).await.unwrap();
let (response, _request) = http_connect_accept(/*policy_decider*/ None, req)
.await
.unwrap();
assert_eq!(response.status(), StatusCode::OK);
}
@@ -1075,7 +1079,9 @@ mod tests {
let proxy_addr = listener
.local_addr()
.expect("proxy listener should expose local addr");
let proxy_task = tokio::spawn(run_http_proxy_with_std_listener(state, listener, None));
let proxy_task = tokio::spawn(run_http_proxy_with_std_listener(
state, listener, /*policy_decider*/ None,
));
let mut stream = tokio::net::TcpStream::connect(proxy_addr)
.await
@@ -1125,7 +1131,9 @@ mod tests {
.expect("request should build");
req.extensions_mut().insert(state);
let response = http_plain_proxy(None, req).await.unwrap();
let response = http_plain_proxy(/*policy_decider*/ None, req)
.await
.unwrap();
assert_eq!(response.status(), StatusCode::FORBIDDEN);
assert_eq!(
@@ -1148,7 +1156,9 @@ mod tests {
.expect("request should build");
req.extensions_mut().insert(state);
let response = http_plain_proxy(None, req).await.unwrap();
let response = http_plain_proxy(/*policy_decider*/ None, req)
.await
.unwrap();
if cfg!(target_os = "macos") {
assert_eq!(response.status(), StatusCode::FORBIDDEN);
@@ -1178,7 +1188,9 @@ mod tests {
.expect("request should build");
req.extensions_mut().insert(state);
let response = http_plain_proxy(None, req).await.unwrap();
let response = http_plain_proxy(/*policy_decider*/ None, req)
.await
.unwrap();
assert_eq!(response.status(), StatusCode::BAD_GATEWAY);
}
@@ -1200,7 +1212,9 @@ mod tests {
.unwrap();
req.extensions_mut().insert(state);
let response = http_connect_accept(None, req).await.unwrap_err();
let response = http_connect_accept(/*policy_decider*/ None, req)
.await
.unwrap_err();
assert_eq!(response.status(), StatusCode::FORBIDDEN);
assert_eq!(
response.headers().get("x-proxy-error").unwrap(),
@@ -1221,7 +1235,7 @@ mod tests {
.unwrap();
req.extensions_mut().insert(state);
let response = http_plain_proxy(None, req).await;
let response = http_plain_proxy(/*policy_decider*/ None, req).await;
assert_eq!(response.unwrap().status(), StatusCode::BAD_REQUEST);
}
codex-rs/network-proxy/src/mitm_tests.rs
+18 -3
View File
@@ -31,7 +31,12 @@ async fn mitm_policy_blocks_disallowed_method_and_records_telemetry() {
network.set_allowed_domains(vec!["example.com".to_string()]);
network
}));
let ctx = policy_ctx(app_state.clone(), NetworkMode::Limited, "example.com", 443);
let ctx = policy_ctx(
app_state.clone(),
NetworkMode::Limited,
"example.com",
/*target_port*/ 443,
);
let req = Request::builder()
.method(Method::POST)
.uri("/v1/responses?api_key=secret")
@@ -65,7 +70,12 @@ async fn mitm_policy_rejects_host_mismatch() {
network.set_allowed_domains(vec!["example.com".to_string()]);
network
}));
let ctx = policy_ctx(app_state.clone(), NetworkMode::Full, "example.com", 443);
let ctx = policy_ctx(
app_state.clone(),
NetworkMode::Full,
"example.com",
/*target_port*/ 443,
);
let req = Request::builder()
.method(Method::GET)
.uri("/")
@@ -90,7 +100,12 @@ async fn mitm_policy_rechecks_local_private_target_after_connect() {
network.allow_local_binding = false;
network
}));
let ctx = policy_ctx(app_state.clone(), NetworkMode::Full, "10.0.0.1", 443);
let ctx = policy_ctx(
app_state.clone(),
NetworkMode::Full,
"10.0.0.1",
/*target_port*/ 443,
);
let req = Request::builder()
.method(Method::GET)
.uri("/health?token=secret")
codex-rs/network-proxy/src/network_policy.rs
+9 -3
View File
@@ -693,7 +693,9 @@ mod tests {
});
let (decision, events) = capture_events(|| async {
evaluate_host_policy(&state, None, &request).await.unwrap()
evaluate_host_policy(&state, /*decider*/ None, &request)
.await
.unwrap()
})
.await;
assert_eq!(
@@ -784,7 +786,9 @@ mod tests {
});
let (_decision, events) = capture_events(|| async {
evaluate_host_policy(&state, None, &request).await.unwrap()
evaluate_host_policy(&state, /*decider*/ None, &request)
.await
.unwrap()
})
.await;
@@ -867,7 +871,9 @@ mod tests {
exec_policy_hint: None,
});
let decision = evaluate_host_policy(&state, None, &request).await.unwrap();
let decision = evaluate_host_policy(&state, /*decider*/ None, &request)
.await
.unwrap();
assert_eq!(
decision,
NetworkDecision::Deny {
codex-rs/network-proxy/src/proxy.rs
+9 -9
View File
@@ -705,7 +705,7 @@ mod tests {
let state = Arc::new(network_proxy_state_for_policy(settings));
let proxy = NetworkProxy::builder()
.state(state)
.managed_by_codex(false)
.managed_by_codex(/*managed_by_codex*/ false)
.build()
.await
.unwrap();
@@ -839,8 +839,8 @@ mod tests {
&mut env,
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 3128),
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8081),
true,
false,
/*socks_enabled*/ true,
/*allow_local_binding*/ false,
);
assert_eq!(
@@ -889,8 +889,8 @@ mod tests {
&mut env,
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 3128),
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8081),
false,
true,
/*socks_enabled*/ false,
/*allow_local_binding*/ true,
);
assert_eq!(
@@ -907,8 +907,8 @@ mod tests {
&mut env,
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 3128),
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8081),
true,
false,
/*socks_enabled*/ true,
/*allow_local_binding*/ false,
);
assert_eq!(
@@ -952,8 +952,8 @@ mod tests {
&mut env,
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 3128),
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8081),
true,
false,
/*socks_enabled*/ true,
/*allow_local_binding*/ false,
);
assert_eq!(
codex-rs/network-proxy/src/runtime.rs
+51 -21
View File
@@ -878,7 +878,10 @@ mod tests {
network_proxy_state_for_policy(network_settings(&["example.com"], &["example.com"]));
assert_eq!(
state.host_blocked("example.com", 80).await.unwrap(),
state
.host_blocked("example.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::Denied)
);
}
@@ -888,13 +891,16 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["example.com"], &[]));
assert_eq!(
state.host_blocked("example.com", 80).await.unwrap(),
state
.host_blocked("example.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Allowed
);
assert_eq!(
// Use a public IP literal to avoid relying on ambient DNS behavior (some networks
// resolve unknown hostnames to private IPs, which would trigger `not_allowed_local`).
state.host_blocked("8.8.8.8", 80).await.unwrap(),
state.host_blocked("8.8.8.8", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowed)
);
}
@@ -909,7 +915,10 @@ mod tests {
assert_eq!(allowed, vec!["example.com".to_string()]);
assert!(denied.is_empty());
assert_eq!(
state.host_blocked("example.com", 80).await.unwrap(),
state
.host_blocked("example.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Allowed
);
}
@@ -924,7 +933,10 @@ mod tests {
assert!(allowed.is_empty());
assert_eq!(denied, vec!["example.com".to_string()]);
assert_eq!(
state.host_blocked("example.com", 80).await.unwrap(),
state
.host_blocked("example.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::Denied)
);
}
@@ -935,7 +947,7 @@ mod tests {
assert_eq!(
// Use a public IP literal to avoid relying on ambient DNS behavior.
state.host_blocked("8.8.8.8", 80).await.unwrap(),
state.host_blocked("8.8.8.8", /*port*/ 80).await.unwrap(),
HostBlockDecision::Allowed
);
@@ -945,7 +957,7 @@ mod tests {
assert_eq!(allowed, vec!["*".to_string()]);
assert_eq!(denied, vec!["8.8.8.8".to_string()]);
assert_eq!(
state.host_blocked("8.8.8.8", 80).await.unwrap(),
state.host_blocked("8.8.8.8", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::Denied)
);
}
@@ -1133,11 +1145,14 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["*.openai.com"], &[]));
assert_eq!(
state.host_blocked("api.openai.com", 80).await.unwrap(),
state
.host_blocked("api.openai.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Allowed
);
assert_eq!(
state.host_blocked("openai.com", 80).await.unwrap(),
state.host_blocked("openai.com", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowed)
);
}
@@ -1147,15 +1162,24 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["*"], &["evil.example"]));
assert_eq!(
state.host_blocked("example.com", 80).await.unwrap(),
state
.host_blocked("example.com", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Allowed
);
assert_eq!(
state.host_blocked("api.openai.com", 443).await.unwrap(),
state
.host_blocked("api.openai.com", /*port*/ 443)
.await
.unwrap(),
HostBlockDecision::Allowed
);
assert_eq!(
state.host_blocked("evil.example", 80).await.unwrap(),
state
.host_blocked("evil.example", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::Denied)
);
}
@@ -1165,11 +1189,11 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["example.com"], &[]));
assert_eq!(
state.host_blocked("127.0.0.1", 80).await.unwrap(),
state.host_blocked("127.0.0.1", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
);
assert_eq!(
state.host_blocked("localhost", 80).await.unwrap(),
state.host_blocked("localhost", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
);
}
@@ -1179,7 +1203,7 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["localhost"], &[]));
assert_eq!(
state.host_blocked("localhost", 80).await.unwrap(),
state.host_blocked("localhost", /*port*/ 80).await.unwrap(),
HostBlockDecision::Allowed
);
}
@@ -1189,7 +1213,7 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["10.0.0.1"], &[]));
assert_eq!(
state.host_blocked("10.0.0.1", 80).await.unwrap(),
state.host_blocked("10.0.0.1", /*port*/ 80).await.unwrap(),
HostBlockDecision::Allowed
);
}
@@ -1199,7 +1223,10 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["example.com"], &[]));
assert_eq!(
state.host_blocked("fe80::1%lo0", 80).await.unwrap(),
state
.host_blocked("fe80::1%lo0", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
);
}
@@ -1209,7 +1236,10 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["fe80::1%lo0"], &[]));
assert_eq!(
state.host_blocked("fe80::1%lo0", 80).await.unwrap(),
state
.host_blocked("fe80::1%lo0", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Allowed
);
}
@@ -1219,7 +1249,7 @@ mod tests {
let state = network_proxy_state_for_policy(network_settings(&["example.com"], &[]));
assert_eq!(
state.host_blocked("10.0.0.1", 80).await.unwrap(),
state.host_blocked("10.0.0.1", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
);
}
@@ -1229,7 +1259,7 @@ mod tests {
let state = network_proxy_state_for_policy(NetworkProxySettings::default());
assert_eq!(
state.host_blocked("127.0.0.1", 80).await.unwrap(),
state.host_blocked("127.0.0.1", /*port*/ 80).await.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
);
}
@@ -1242,7 +1272,7 @@ mod tests {
assert_eq!(
state
.host_blocked("does-not-resolve.invalid", 80)
.host_blocked("does-not-resolve.invalid", /*port*/ 80)
.await
.unwrap(),
HostBlockDecision::Blocked(HostBlockReason::NotAllowedLocal)
codex-rs/network-proxy/src/socks5.rs
+10 -3
View File
@@ -546,7 +546,12 @@ mod tests {
request.extensions_mut().insert(state.clone());
let (result, events) = capture_events(|| async {
handle_socks5_tcp(request, TcpConnector::default(), None).await
handle_socks5_tcp(
request,
TcpConnector::default(),
/*policy_decider*/ None,
)
.await
})
.await;
assert!(result.is_err(), "proxy-disabled request should be denied");
@@ -584,8 +589,10 @@ mod tests {
extensions: Extensions::new(),
};
let (result, events) =
capture_events(|| async { inspect_socks5_udp(request, state, None).await }).await;
let (result, events) = capture_events(|| async {
inspect_socks5_udp(request, state, /*policy_decider*/ None).await
})
.await;
assert!(result.is_err(), "limited-mode UDP request should be denied");
let event = find_event_by_name(&events, POLICY_DECISION_EVENT_NAME)