i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-03 09:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: force http1 for tunnel oauth refresh

Browse Source
This commit is contained in:
fawney19
2026-04-28 01:37:40 +08:00
parent 032dcf40e7
commit 639f26ed5d
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/aether-gateway/src/state/oauth.rs
View File

@@ -11,7 +11,7 @@ use crate::provider_key_auth::provider_key_is_oauth_managed;
use aether_admin::provider::quota as admin_provider_quota_pure; use aether_admin::provider::quota as admin_provider_quota_pure;
use aether_contracts::{ use aether_contracts::{
ExecutionPlan, ExecutionTimeouts, ProxySnapshot, RequestBody, ExecutionPlan, ExecutionTimeouts, ProxySnapshot, RequestBody,
EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER, EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER, EXECUTION_REQUEST_HTTP1_ONLY_HEADER,
}; };
use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogKey; use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogKey;
use base64::{engine::general_purpose::STANDARD, Engine as _}; use base64::{engine::general_purpose::STANDARD, Engine as _};
@@ -1262,6 +1262,11 @@ impl AppState {
EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER.to_string(), EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER.to_string(),
"true".to_string(), "true".to_string(),
); );
} else {
headers.insert(
EXECUTION_REQUEST_HTTP1_ONLY_HEADER.to_string(),
"true".to_string(),
);
} }
let plan = ExecutionPlan { let plan = ExecutionPlan {
request_id: request.request_id.to_string(), request_id: request.request_id.to_string(),
@@ -1339,6 +1344,11 @@ impl AppState {
.get(EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER) .get(EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER)
.map(String::as_str) .map(String::as_str)
.unwrap_or("-"), .unwrap_or("-"),
http1_only = plan
.headers
.get(EXECUTION_REQUEST_HTTP1_ONLY_HEADER)
.map(String::as_str)
.unwrap_or("-"),
"gateway local oauth execution request prepared" "gateway local oauth execution request prepared"
); );
let result = let result =

11
apps/aether-gateway/src/tests/control/admin/oauth.rs
View File

@@ -1,6 +1,8 @@
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use aether_contracts::{ExecutionPlan, EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER}; use aether_contracts::{
ExecutionPlan, EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER, EXECUTION_REQUEST_HTTP1_ONLY_HEADER,
};
use aether_crypto::{ use aether_crypto::{
decrypt_python_fernet_ciphertext, encrypt_python_fernet_plaintext, DEVELOPMENT_ENCRYPTION_KEY, decrypt_python_fernet_ciphertext, encrypt_python_fernet_plaintext, DEVELOPMENT_ENCRYPTION_KEY,
}; };
@@ -4707,6 +4709,13 @@ async fn gateway_refreshes_admin_provider_oauth_key_tunnel_proxy_without_follow_
.get(EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER), .get(EXECUTION_REQUEST_FOLLOW_REDIRECTS_HEADER),
None None
); );
assert_eq!(
refresh_plan
.headers
.get(EXECUTION_REQUEST_HTTP1_ONLY_HEADER)
.map(String::as_str),
Some("true")
);
gateway_handle.abort(); gateway_handle.abort();
execution_runtime_handle.abort(); execution_runtime_handle.abort();