mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-08 10:27:46 +08:00
feat(security): harden gateway boundaries and usage policies
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:
@@ -13,6 +13,7 @@ use aether_data_contracts::repository::provider_catalog::{
|
||||
StoredProviderCatalogKey, StoredProviderCatalogProvider,
|
||||
};
|
||||
use aether_data_contracts::repository::quota::StoredProviderQuotaSnapshot;
|
||||
use aether_data_contracts::DataLayerError;
|
||||
use aether_model_fetch::{
|
||||
aggregate_models_for_cache, build_antigravity_load_code_assist_plan,
|
||||
fetch_models_from_transports, merge_upstream_metadata, model_fetch_interval_minutes,
|
||||
@@ -25,7 +26,7 @@ use tracing::{debug, warn};
|
||||
|
||||
use super::{AppState, GatewayError};
|
||||
use crate::clock::current_unix_secs;
|
||||
use crate::model_fetch::{CodexCatalogRuntime, ModelFetchRuntimeState};
|
||||
use crate::model_fetch::{safe_model_fetch_error, CodexCatalogRuntime, ModelFetchRuntimeState};
|
||||
use crate::provider_transport::{GatewayProviderTransportSnapshot, LocalResolvedOAuthRequestAuth};
|
||||
use crate::request_candidate_runtime::{
|
||||
RequestCandidateRuntimeCapabilityReader, RequestCandidateRuntimeReader,
|
||||
@@ -36,6 +37,44 @@ use crate::{execution_runtime, provider_transport};
|
||||
|
||||
const MODEL_FETCH_RESPONSE_BODY_LIMIT_BYTES: usize = 8 * 1024 * 1024;
|
||||
|
||||
#[async_trait]
|
||||
impl provider_transport::ProviderTransportSnapshotSource for AppState {
|
||||
fn encryption_key(&self) -> Option<&str> {
|
||||
AppState::encryption_key(self)
|
||||
}
|
||||
|
||||
async fn list_provider_catalog_providers_by_ids(
|
||||
&self,
|
||||
ids: &[String],
|
||||
) -> Result<Vec<StoredProviderCatalogProvider>, DataLayerError> {
|
||||
self.read_provider_catalog_providers_by_ids(ids)
|
||||
.await
|
||||
.map_err(provider_transport_snapshot_data_error)
|
||||
}
|
||||
|
||||
async fn list_provider_catalog_endpoints_by_ids(
|
||||
&self,
|
||||
ids: &[String],
|
||||
) -> Result<Vec<StoredProviderCatalogEndpoint>, DataLayerError> {
|
||||
self.read_provider_catalog_endpoints_by_ids(ids)
|
||||
.await
|
||||
.map_err(provider_transport_snapshot_data_error)
|
||||
}
|
||||
|
||||
async fn list_provider_catalog_keys_by_ids(
|
||||
&self,
|
||||
ids: &[String],
|
||||
) -> Result<Vec<StoredProviderCatalogKey>, DataLayerError> {
|
||||
self.read_provider_catalog_keys_by_ids(ids)
|
||||
.await
|
||||
.map_err(provider_transport_snapshot_data_error)
|
||||
}
|
||||
}
|
||||
|
||||
fn provider_transport_snapshot_data_error(error: GatewayError) -> DataLayerError {
|
||||
DataLayerError::UnexpectedValue(error.into_message())
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
pub(crate) async fn hydrate_antigravity_project_metadata_for_transport(
|
||||
&self,
|
||||
@@ -159,7 +198,7 @@ impl AppState {
|
||||
provider_id = %transport.provider.id,
|
||||
endpoint_id = %transport.endpoint.id,
|
||||
key_id = %transport.key.id,
|
||||
error = %err,
|
||||
error = %safe_model_fetch_error(&err),
|
||||
"gemini_cli project metadata hydration failed"
|
||||
);
|
||||
return None;
|
||||
@@ -324,31 +363,12 @@ impl CodexCatalogRuntime for AppState {
|
||||
return Ok(Some(scope));
|
||||
}
|
||||
|
||||
let decrypted_auth_config = match key.encrypted_auth_config.as_deref() {
|
||||
Some(ciphertext) => Some(
|
||||
crate::handlers::shared::decrypt_catalog_secret_with_fallbacks(
|
||||
self.encryption_key(),
|
||||
ciphertext,
|
||||
)
|
||||
.ok_or_else(|| {
|
||||
"Codex catalog auth config could not be verified for credential fencing"
|
||||
.to_string()
|
||||
})?,
|
||||
),
|
||||
None => None,
|
||||
};
|
||||
let decrypted_api_key = match key.encrypted_api_key.as_deref() {
|
||||
Some(ciphertext) => Some(
|
||||
crate::handlers::shared::decrypt_catalog_secret_with_fallbacks(
|
||||
self.encryption_key(),
|
||||
ciphertext,
|
||||
)
|
||||
.ok_or_else(|| {
|
||||
"Codex catalog API key could not be verified for credential fencing".to_string()
|
||||
})?,
|
||||
),
|
||||
None => None,
|
||||
};
|
||||
let decrypted_auth_config = self
|
||||
.decrypt_provider_catalog_key_auth_config(&key)
|
||||
.map_err(GatewayError::into_message)?;
|
||||
let decrypted_api_key = self
|
||||
.decrypt_provider_catalog_key_api_key(&key)
|
||||
.map_err(GatewayError::into_message)?;
|
||||
|
||||
Ok(
|
||||
crate::model_fetch::codex_catalog_credential_scope_from_stored_key(
|
||||
|
||||
Reference in New Issue
Block a user