i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-06 01:17:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(security): harden gateway boundaries and usage policies

Browse Source 
Consolidate subscription usage policy enforcement, privacy-safe persistence, and gateway security hardening into one reviewable change.

Includes bounded HTTP and execution envelopes, header and protocol guards, DNS and relay validation, authentication and secret projection hardening, secure backup/install paths, and regression coverage.
This commit is contained in:
elky
2026-09-04 03:45:52 +08:00
parent ddcbeb3ae9
commit 579f2c7cc1
1019 changed files with 190437 additions and 26080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/api/core.rs
+1 -1
View File
@@ -133,7 +133,7 @@ pub(crate) async fn frontdoor_manifest(State(state): State<AppState>) -> impl In
"internal_gateway": {
"route_groups": INTERNAL_GATEWAY_ROUTE_GROUPS,
"path_prefixes": INTERNAL_GATEWAY_PATH_PREFIXES,
"status": "rust_native_control_plane",
"status": state.internal_gateway_auth_status(),
},
},
"features": {
apps/aether-gateway/src/api/ops.rs
+254 -3
View File
@@ -1,5 +1,14 @@
use std::net::SocketAddr;
use axum::body::Body;
use axum::extract::{ConnectInfo, Request, State};
use axum::http::{self, HeaderValue, StatusCode};
use axum::middleware::{self, Next};
use axum::response::{IntoResponse, Response};
use axum::routing::{get, post};
use axum::Router;
use axum::{Json, Router};
use serde_json::json;
use tracing::warn;
use crate::async_task::{
cancel_video_task, get_video_task_detail, get_video_task_stats, get_video_task_video,
@@ -10,8 +19,18 @@ use crate::hooks::{get_request_audit_bundle, get_request_usage_audit};
use crate::router::metrics;
use crate::state::AppState;
pub(crate) fn mount_operational_routes(router: Router<AppState>) -> Router<AppState> {
router
#[derive(Clone, Copy)]
struct OperationalPermission {
required_permissions: &'static [&'static str],
write: bool,
requires_full_admin_role: bool,
}
pub(crate) fn mount_operational_routes(
router: Router<AppState>,
state: AppState,
) -> Router<AppState> {
let operational = Router::<AppState>::new()
.route("/_gateway/metrics", get(metrics))
.route("/_gateway/async-tasks/video-tasks", get(list_video_tasks))
.route(
@@ -50,4 +69,236 @@ pub(crate) fn mount_operational_routes(router: Router<AppState>) -> Router<AppSt
"/_gateway/audit/request-usage/{request_id}",
get(get_request_usage_audit),
)
.route_layer(middleware::from_fn_with_state(
state,
authorize_operational_request,
));
router.merge(operational)
}
async fn authorize_operational_request(
State(state): State<AppState>,
request: Request,
next: Next,
) -> Response<Body> {
let Some(permission) = operational_permission(request.method(), request.uri().path()) else {
return operational_error_response(
StatusCode::FORBIDDEN,
"operational route permission is not configured",
None,
);
};
let Some(remote_addr) = request
.extensions()
.get::<ConnectInfo<SocketAddr>>()
.map(|value| value.0)
else {
return operational_error_response(
StatusCode::SERVICE_UNAVAILABLE,
"operational authentication unavailable",
None,
);
};
let headers = request.headers().clone();
let uri = request.uri().clone();
if headers.get_all(http::header::AUTHORIZATION).iter().count() > 1 {
return operational_auth_required_response();
}
match crate::control::resolve_local_admin_session_principal(&state, &headers, &uri).await {
Ok(Some(principal)) => {
if permission.requires_full_admin_role
&& !crate::roles::is_full_admin_role(&principal.user_role)
{
return operational_permission_denied_response(permission.required_permissions[0]);
}
if permission.write && !crate::roles::can_write_admin_console(&principal.user_role) {
return operational_permission_denied_response(permission.required_permissions[0]);
}
}
Ok(None) => {
let client_ip = crate::headers::effective_client_ip(&headers, &remote_addr);
let authenticated = match crate::management_token_auth::authenticate_management_token(
&state, &headers, client_ip,
)
.await
{
Ok(authenticated) => authenticated,
Err(
crate::management_token_auth::ManagementTokenAuthError::Missing
| crate::management_token_auth::ManagementTokenAuthError::Invalid,
) => return operational_auth_required_response(),
Err(crate::management_token_auth::ManagementTokenAuthError::Unavailable) => {
return operational_error_response(
StatusCode::SERVICE_UNAVAILABLE,
"operational authentication unavailable",
None,
)
}
};
if permission.requires_full_admin_role
&& !crate::roles::is_full_admin_role(&authenticated.user.role)
{
return operational_permission_denied_response(permission.required_permissions[0]);
}
if permission.write && !crate::roles::can_write_admin_console(&authenticated.user.role)
{
return operational_permission_denied_response(permission.required_permissions[0]);
}
let missing_permission =
permission
.required_permissions
.iter()
.copied()
.find(|required| {
!management_token_has_operational_permission(
&authenticated.permissions,
required,
)
});
if let Some(required_permission) = missing_permission {
return operational_permission_denied_response(required_permission);
}
let client_ip = client_ip.to_string();
if let Err(err) = state
.record_management_token_usage(&authenticated.token.id, Some(client_ip.as_str()))
.await
{
warn!(
token_id = %authenticated.token.id,
error = ?err,
"gateway failed to record operational management token usage"
);
}
}
Err(err) => {
warn!(error = ?err, "operational admin session authentication failed");
return operational_error_response(
StatusCode::SERVICE_UNAVAILABLE,
"operational authentication unavailable",
None,
);
}
}
let mut response = next.run(request).await;
response.headers_mut().insert(
http::header::CACHE_CONTROL,
HeaderValue::from_static("no-store"),
);
response
}
fn operational_permission(method: &http::Method, path: &str) -> Option<OperationalPermission> {
if path == "/_gateway/metrics" {
return Some(OperationalPermission {
required_permissions: &["admin:monitoring:read"],
write: false,
requires_full_admin_role: false,
});
}
if path.starts_with("/_gateway/async-tasks/video-tasks") {
let write = *method == http::Method::POST && path.ends_with("/cancel");
return Some(OperationalPermission {
required_permissions: if write {
&["admin:video_tasks:write"]
} else {
&["admin:video_tasks:read"]
},
write,
requires_full_admin_role: false,
});
}
if path.starts_with("/_gateway/audit/auth/users/") {
return Some(OperationalPermission {
required_permissions: &["admin:api_keys:read"],
write: false,
requires_full_admin_role: false,
});
}
if path.starts_with("/_gateway/audit/request-audit/") {
return Some(OperationalPermission {
required_permissions: &[
"admin:monitoring:admin",
"admin:usage:read",
"admin:api_keys:read",
],
write: false,
requires_full_admin_role: true,
});
}
if path.starts_with("/_gateway/audit/request-candidates/")
|| path.starts_with("/_gateway/audit/decision-trace/")
{
return Some(OperationalPermission {
required_permissions: &["admin:monitoring:admin"],
write: false,
requires_full_admin_role: true,
});
}
if path.starts_with("/_gateway/audit/") {
return Some(OperationalPermission {
required_permissions: &["admin:usage:read"],
write: false,
requires_full_admin_role: false,
});
}
None
}
fn management_token_has_operational_permission(
permissions: &[String],
required_permission: &str,
) -> bool {
let scope = required_permission
.rsplit_once(':')
.map(|(scope, _)| scope)
.unwrap_or(required_permission);
let admin_permission = format!("{scope}:admin");
permissions
.iter()
.any(|permission| permission == required_permission || permission == &admin_permission)
}
fn operational_auth_required_response() -> Response<Body> {
let mut response = operational_error_response(
StatusCode::UNAUTHORIZED,
"admin authentication required",
None,
);
response.headers_mut().insert(
http::header::WWW_AUTHENTICATE,
HeaderValue::from_static("Bearer"),
);
response
}
fn operational_permission_denied_response(required_permission: &'static str) -> Response<Body> {
operational_error_response(
StatusCode::FORBIDDEN,
"operational permission denied",
Some(required_permission),
)
}
fn operational_error_response(
status: StatusCode,
detail: &'static str,
required_permission: Option<&'static str>,
) -> Response<Body> {
let mut response = (
status,
Json(json!({
"detail": detail,
"required_permission": required_permission,
})),
)
.into_response();
response.headers_mut().insert(
http::header::CACHE_CONTROL,
HeaderValue::from_static("no-store"),
);
response
}
apps/aether-gateway/src/api/response.rs
+301 -13
View File
@@ -11,6 +11,7 @@ use crate::constants::*;
use crate::control::GatewayControlDecision;
use crate::control::GatewayLocalAuthRejection;
use crate::headers::should_skip_response_header;
use crate::plan_usage_policy::PlanUsagePolicyRejection;
use crate::rate_limit::FrontdoorUserRpmRejection;
use crate::{insert_header_if_missing, GatewayError};
@@ -52,22 +53,34 @@ pub(crate) fn apply_streaming_response_headers(headers: &mut http::HeaderMap) {
);
}
fn apply_gateway_browser_security_headers(headers: &mut http::HeaderMap) {
// Provider responses are API data, even when an untrusted provider labels
// them as HTML or SVG. Keep a direct navigation to a gateway API route
// from becoming same-origin active content, and prevent referrer leakage
// if a user follows a link rendered from such a response.
headers.insert(
http::header::X_CONTENT_TYPE_OPTIONS,
HeaderValue::from_static("nosniff"),
);
headers.insert(
HeaderName::from_static("content-security-policy"),
HeaderValue::from_static(
"default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; sandbox",
),
);
headers.insert(
HeaderName::from_static("referrer-policy"),
HeaderValue::from_static("no-referrer"),
);
}
pub(crate) fn build_client_response(
upstream_response: reqwest::Response,
trace_id: &str,
control_decision: Option<&GatewayControlDecision>,
) -> Result<Response<Body>, GatewayError> {
let status = upstream_response.status();
let upstream_headers = upstream_response
.headers()
.iter()
.map(|(name, value)| {
(
name.as_str().to_string(),
value.to_str().unwrap_or_default().to_string(),
)
})
.collect::<BTreeMap<_, _>>();
let upstream_headers = collect_safe_response_headers(upstream_response.headers());
let upstream_stream = upstream_response.bytes_stream();
build_client_response_from_parts(
status.as_u16(),
@@ -78,6 +91,40 @@ pub(crate) fn build_client_response(
)
}
fn collect_safe_response_headers(headers: &http::HeaderMap) -> BTreeMap<String, String> {
let connection_declared = aether_http::connection_declared_header_names(
headers
.get_all(http::header::CONNECTION)
.iter()
.filter_map(|value| value.to_str().ok()),
);
headers
.iter()
.filter_map(|(name, value)| {
let normalized = name.as_str().to_ascii_lowercase();
if should_skip_client_response_header(&normalized)
|| connection_declared.contains(&normalized)
{
return None;
}
value
.to_str()
.ok()
.map(|value| (normalized, value.to_string()))
})
.collect()
}
fn should_skip_client_response_header(name: &str) -> bool {
should_skip_response_header(name)
// A provider Location is relative to the provider, not to the gateway.
// Forwarding it lets redirect-following clients bypass the gateway and
// can disclose their gateway Authorization header to another origin.
// Keep Location available inside execution reports, but never expose
// it on the client-facing response boundary.
|| name.eq_ignore_ascii_case(http::header::LOCATION.as_str())
}
pub(crate) fn build_client_response_from_parts(
status_code: u16,
upstream_headers: &BTreeMap<String, String>,
@@ -111,8 +158,17 @@ where
.body(body)
.map_err(|err| GatewayError::Internal(err.to_string()))?;
let connection_declared = aether_http::connection_declared_header_names(
upstream_headers
.iter()
.filter(|(name, _)| name.eq_ignore_ascii_case(http::header::CONNECTION.as_str()))
.map(|(_, value)| value.as_str()),
);
for (name, value) in upstream_headers {
if should_skip_response_header(name.as_str()) {
if should_skip_client_response_header(name.as_str())
|| connection_declared.contains(&name.to_ascii_lowercase())
{
continue;
}
let header_name = HeaderName::from_bytes(name.as_bytes())
@@ -123,6 +179,7 @@ where
}
mutate_headers(response.headers_mut())?;
apply_streaming_response_headers(response.headers_mut());
apply_gateway_browser_security_headers(response.headers_mut());
insert_header_if_missing(response.headers_mut(), TRACE_ID_HEADER, trace_id)?;
insert_header_if_missing(response.headers_mut(), GATEWAY_HEADER, "rust-phase3b")?;
if let Some(decision) = control_decision {
@@ -258,6 +315,57 @@ pub(crate) fn build_local_user_rpm_limited_response(
)
}
pub(crate) fn build_local_plan_usage_limited_response(
trace_id: &str,
control_decision: Option<&GatewayControlDecision>,
rejection: &PlanUsagePolicyRejection,
) -> Result<Response<Body>, GatewayError> {
let message = "套餐使用限制已达到上限，请稍后重试";
let fallback_payload = json!({
"error": {
"type": "plan_usage_limit_exceeded",
"message": message,
"details": {
"metric": rejection.metric,
"window": rejection.window,
"limit": rejection.limit,
"retry_after": rejection.retry_after,
}
}
});
let payload = build_local_error_payload(
control_decision,
None,
message,
LocalCoreSyncErrorKind::RateLimit,
fallback_payload,
);
let body =
serde_json::to_vec(&payload).map_err(|err| GatewayError::Internal(err.to_string()))?;
let headers = BTreeMap::from([
("content-type".to_string(), "application/json".to_string()),
("Retry-After".to_string(), rejection.retry_after.to_string()),
("X-RateLimit-Limit".to_string(), rejection.limit.to_string()),
("X-RateLimit-Remaining".to_string(), "0".to_string()),
("X-RateLimit-Scope".to_string(), "plan".to_string()),
(
"X-RateLimit-Metric".to_string(),
rejection.metric.to_string(),
),
(
"X-RateLimit-Window".to_string(),
rejection.window.to_string(),
),
]);
build_client_response_from_parts(
StatusCode::TOO_MANY_REQUESTS.as_u16(),
&headers,
Body::from(body),
trace_id,
control_decision,
)
}
pub(crate) fn build_local_http_error_response(
trace_id: &str,
control_decision: Option<&GatewayControlDecision>,
@@ -454,11 +562,13 @@ fn local_error_kind_for_status(status: StatusCode) -> LocalCoreSyncErrorKind {
#[cfg(test)]
mod tests {
use super::{
build_client_response_from_parts, build_local_auth_rejection_response,
build_client_response, build_client_response_from_parts,
build_client_response_from_parts_with_mutator, build_local_auth_rejection_response,
build_local_http_error_response_with_request_path, build_local_overloaded_response,
build_local_user_rpm_limited_response,
build_local_plan_usage_limited_response, build_local_user_rpm_limited_response,
};
use crate::control::{GatewayControlDecision, GatewayLocalAuthRejection};
use crate::plan_usage_policy::PlanUsagePolicyRejection;
use crate::rate_limit::FrontdoorUserRpmRejection;
use axum::body::{to_bytes, Body};
use std::collections::BTreeMap;
@@ -490,6 +600,163 @@ mod tests {
);
}
#[test]
fn upstream_security_headers_are_stripped_before_gateway_headers_are_added() {
let response = build_client_response_from_parts_with_mutator(
200,
&BTreeMap::from([
("set-cookie".to_string(), "session=attacker".to_string()),
(
"x-aether-gateway".to_string(),
"attacker-gateway".to_string(),
),
(
"x-aether-control-action".to_string(),
"attacker-action".to_string(),
),
(
"x-aether-future-control".to_string(),
"attacker-future".to_string(),
),
(
"x-accel-redirect".to_string(),
"/internal/private-file".to_string(),
),
("x-sendfile".to_string(), "/etc/passwd".to_string()),
(
"x-reproxy-url".to_string(),
"http://127.0.0.1:9000/private".to_string(),
),
(
"access-control-allow-origin".to_string(),
"https://attacker.example".to_string(),
),
(
"access-control-allow-credentials".to_string(),
"true".to_string(),
),
("content-length".to_string(), "999999".to_string()),
(
"content-security-policy".to_string(),
"default-src * 'unsafe-inline' 'unsafe-eval'".to_string(),
),
(
"content-security-policy-report-only".to_string(),
"default-src 'none'; report-uri https://attacker.example/csp".to_string(),
),
(
"reporting-endpoints".to_string(),
"attacker=\"https://attacker.example/reports\"".to_string(),
),
("report-to".to_string(), "attacker".to_string()),
(
"nel".to_string(),
"{\"report_to\":\"attacker\"}".to_string(),
),
(
"refresh".to_string(),
"0; url=https://attacker.example".to_string(),
),
("referrer-policy".to_string(), "unsafe-url".to_string()),
("x-content-type-options".to_string(), "invalid".to_string()),
(
"location".to_string(),
"https://provider.example/direct".to_string(),
),
("x-upstream-visible".to_string(), "ok".to_string()),
]),
Body::empty(),
"trace-upstream-header-filter",
None,
|headers| {
headers.insert(
http::HeaderName::from_static("x-aether-control-action"),
http::HeaderValue::from_static("gateway-action"),
);
Ok(())
},
)
.expect("response should build");
assert!(response.headers().get(http::header::SET_COOKIE).is_none());
assert!(response.headers().get("x-aether-future-control").is_none());
assert!(response.headers().get("x-accel-redirect").is_none());
assert!(response.headers().get("x-sendfile").is_none());
assert!(response.headers().get("x-reproxy-url").is_none());
assert!(response
.headers()
.get("access-control-allow-origin")
.is_none());
assert!(response
.headers()
.get("access-control-allow-credentials")
.is_none());
assert!(response
.headers()
.get(http::header::CONTENT_LENGTH)
.is_none());
assert!(response
.headers()
.get("content-security-policy-report-only")
.is_none());
assert!(response.headers().get("reporting-endpoints").is_none());
assert!(response.headers().get("report-to").is_none());
assert!(response.headers().get("nel").is_none());
assert!(response.headers().get("refresh").is_none());
assert!(response.headers().get(http::header::LOCATION).is_none());
assert_eq!(
response.headers()["content-security-policy"],
"default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; sandbox"
);
assert_eq!(response.headers()["referrer-policy"], "no-referrer");
assert_eq!(
response.headers()[http::header::X_CONTENT_TYPE_OPTIONS],
"nosniff"
);
assert_eq!(response.headers()["x-aether-gateway"], "rust-phase3b");
assert_eq!(
response.headers()["x-aether-control-action"],
"gateway-action"
);
assert_eq!(response.headers()["x-upstream-visible"], "ok");
}
#[tokio::test]
async fn raw_response_collector_honors_all_connection_header_lines() {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
.await
.expect("listener");
let addr = listener.local_addr().expect("address");
let server = tokio::spawn(async move {
let (mut stream, _) = listener.accept().await.expect("connection");
use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
let mut request = [0_u8; 1024];
let _ = stream.read(&mut request).await.expect("request read");
stream
.write_all(
b"HTTP/1.1 200 OK\r\nConnection: x-first-hop\r\nConnection: x-second-hop\r\nX-First-Hop: first-secret\r\nX-Second-Hop: second-secret\r\nContent-Length: 2\r\n\r\nok",
)
.await
.expect("response write");
});
let upstream = reqwest::Client::builder()
.redirect(reqwest::redirect::Policy::none())
.build()
.expect("client")
.get(format!("http://{addr}/"))
.send()
.await
.expect("upstream response");
let response = build_client_response(upstream, "trace-connection-lines", None)
.expect("client response");
server.await.expect("server");
assert!(response.headers().get("connection").is_none());
assert!(response.headers().get("x-first-hop").is_none());
assert!(response.headers().get("x-second-hop").is_none());
}
fn claude_decision() -> GatewayControlDecision {
GatewayControlDecision::synthetic(
"/v1/messages",
@@ -581,4 +848,25 @@ mod tests {
);
}
}
#[tokio::test]
async fn plan_usage_rejection_exposes_machine_readable_limit_headers() {
let response = build_local_plan_usage_limited_response(
"trace-plan-limit",
None,
&PlanUsagePolicyRejection {
metric: "request_count",
limit: 100.0,
retry_after: 42,
window: "calendar_week",
},
)
.expect("response");
assert_eq!(response.status(), http::StatusCode::TOO_MANY_REQUESTS);
assert_eq!(response.headers()["retry-after"], "42");
assert_eq!(response.headers()["x-ratelimit-scope"], "plan");
assert_eq!(response.headers()["x-ratelimit-window"], "calendar_week");
let payload = response_json(response).await;
assert_eq!(payload["error"]["type"], "plan_usage_limit_exceeded");
}
}