Skip to content

🔒 Security Batch #99: CORS Wildcard Fix #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BossChaos wants to merge 2 commits into from
Closed

🔒 Security Batch #99: CORS Wildcard Fix #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da94d2
fix: apply cargo fmt to all Rust packages
BossChaos May 8, 2026
49ce1e3
fix: replace CORS wildcard with specific origin
BossChaos May 8, 2026
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
56 changes: 33 additions & 23 deletions cross-chain-airdrop/src/bin/airdrop_cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ async fn main() -> Result<()> {
.with_target(false)
.without_time()
.finish();
tracing::subscriber::set_global_default(subscriber)
.expect("Failed to set tracing subscriber");
tracing::subscriber::set_global_default(subscriber).expect("Failed to set tracing subscriber");

// Load configuration
let mut config = AirdropConfig::from_env()?;
Expand Down Expand Up @@ -151,15 +150,9 @@ async fn main() -> Result<()> {

if eligibility.eligible {
println!("✅ ELIGIBLE for airdrop!");
println!(
" Base allocation: {} wRTC",
eligibility.base_allocation
);
println!(" Base allocation: {} wRTC", eligibility.base_allocation);
println!(" Wallet multiplier: {:.1}x", eligibility.multiplier);
println!(
" Final allocation: {} wRTC",
eligibility.final_allocation
);
println!(" Final allocation: {} wRTC", eligibility.final_allocation);

if let Some(ref gh) = eligibility.github {
println!(" GitHub tier: {:?}", gh.tier);
Expand Down Expand Up @@ -237,10 +230,13 @@ async fn main() -> Result<()> {

Commands::VerifyAddress { chain, address } => {
let target_chain = parse_chain(&chain)?;
let adapter = match target_chain {
TargetChain::Solana => solana_adapter.as_ref() as &dyn cross_chain_airdrop::chain_adapter::ChainAdapter,
TargetChain::Base => base_adapter.as_ref() as &dyn cross_chain_airdrop::chain_adapter::ChainAdapter,
};
let adapter =
match target_chain {
TargetChain::Solana => solana_adapter.as_ref()
as &dyn cross_chain_airdrop::chain_adapter::ChainAdapter,
TargetChain::Base => base_adapter.as_ref()
as &dyn cross_chain_airdrop::chain_adapter::ChainAdapter,
};

match adapter.validate_address(&address) {
Ok(_) => {
Expand All @@ -249,12 +245,23 @@ async fn main() -> Result<()> {
// Also check balance and age
match adapter.verify_wallet(&address).await {
Ok(verification) => {
println!(" Balance: {} {}",
println!(
" Balance: {} {}",
format_balance(&verification.balance_base_units, &target_chain),
chain.to_uppercase());
println!(" Wallet age: {} days", verification.wallet_age_seconds / 86400);
println!(" Meets minimum balance: {}", verification.meets_minimum_balance);
println!(" Meets age requirement: {}", verification.meets_age_requirement);
chain.to_uppercase()
);
println!(
" Wallet age: {} days",
verification.wallet_age_seconds / 86400
);
println!(
" Meets minimum balance: {}",
verification.meets_minimum_balance
);
println!(
" Meets age requirement: {}",
verification.meets_age_requirement
);
println!(" Wallet tier: {:?}", verification.tier);
}
Err(e) => {
Expand All @@ -274,9 +281,9 @@ async fn main() -> Result<()> {
}

fn parse_chain(chain: &str) -> Result<TargetChain> {
chain.parse::<TargetChain>().map_err(|e| {
cross_chain_airdrop::AirdropError::Parse(format!("Invalid chain: {}", e))
})
chain
.parse::<TargetChain>()
.map_err(|e| cross_chain_airdrop::AirdropError::Parse(format!("Invalid chain: {}", e)))
}

fn format_balance(balance_base_units: &u64, chain: &TargetChain) -> String {
Expand All @@ -287,7 +294,10 @@ fn format_balance(balance_base_units: &u64, chain: &TargetChain) -> String {
}
TargetChain::Base => {
// ETH has 18 decimals
format!("{:.18}", *balance_base_units as f64 / 1_000_000_000_000_000_000.0)
format!(
"{:.18}",
*balance_base_units as f64 / 1_000_000_000_000_000_000.0
)
}
}
}
Expand Down
50 changes: 32 additions & 18 deletions cross-chain-airdrop/src/bridge_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ impl BridgeClient {

request = request.json(&body);

let response = request.send().await.map_err(|e| {
AirdropError::Bridge(format!("Failed to lock RTC: {}", e))
})?;
let response = request
.send()
.await
.map_err(|e| AirdropError::Bridge(format!("Failed to lock RTC: {}", e)))?;

if !response.status().is_success() {
let status = response.status();
Expand All @@ -78,9 +79,10 @@ impl BridgeClient {
)));
}

let lock_response: BridgeLockResponse = response.json().await.map_err(|e| {
AirdropError::Bridge(format!("Failed to parse lock response: {}", e))
})?;
let lock_response: BridgeLockResponse = response
.json()
.await
.map_err(|e| AirdropError::Bridge(format!("Failed to parse lock response: {}", e)))?;

Ok(lock_response)
}
Expand All @@ -107,9 +109,10 @@ impl BridgeClient {
"notes": notes,
}));

let response = request.send().await.map_err(|e| {
AirdropError::Bridge(format!("Failed to confirm lock: {}", e))
})?;
let response = request
.send()
.await
.map_err(|e| AirdropError::Bridge(format!("Failed to confirm lock: {}", e)))?;

if !response.status().is_success() {
let status = response.status();
Expand Down Expand Up @@ -186,9 +189,10 @@ impl BridgeClient {
)));
}

let status: BridgeLockStatus = response.json().await.map_err(|e| {
AirdropError::Bridge(format!("Failed to parse lock status: {}", e))
})?;
let status: BridgeLockStatus = response
.json()
.await
.map_err(|e| AirdropError::Bridge(format!("Failed to parse lock status: {}", e)))?;

Ok(status)
}
Expand All @@ -211,9 +215,10 @@ impl BridgeClient {
)));
}

let stats: BridgeStats = response.json().await.map_err(|e| {
AirdropError::Bridge(format!("Failed to parse bridge stats: {}", e))
})?;
let stats: BridgeStats = response
.json()
.await
.map_err(|e| AirdropError::Bridge(format!("Failed to parse bridge stats: {}", e)))?;

Ok(stats)
}
Expand Down Expand Up @@ -299,9 +304,18 @@ mod tests {

#[test]
fn test_bridge_state_conversion() {
assert_eq!(bridge_state_to_claim_state("requested"), ClaimStatus::Pending);
assert_eq!(bridge_state_to_claim_state("confirmed"), ClaimStatus::Verified);
assert_eq!(bridge_state_to_claim_state("complete"), ClaimStatus::Complete);
assert_eq!(
bridge_state_to_claim_state("requested"),
ClaimStatus::Pending
);
assert_eq!(
bridge_state_to_claim_state("confirmed"),
ClaimStatus::Verified
);
assert_eq!(
bridge_state_to_claim_state("complete"),
ClaimStatus::Complete
);
assert_eq!(bridge_state_to_claim_state("failed"), ClaimStatus::Failed);
}
}
Loading
Loading