Skip to content
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.

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

Allow self.alt host for self-requests #3003

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion crates/factor-outbound-http/src/wasi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ async fn send_request_impl(
let host = request.uri().host().unwrap_or_default();
let tls_client_config = component_tls_configs.get_client_config(host).clone();

if request.uri().authority().is_some() {
let is_self_request = request
.uri()
.authority()
.is_some_and(|a| a.host() == "self.alt");

if request.uri().authority().is_some() && !is_self_request {
// Absolute URI
let is_allowed = outbound_allowed_hosts
.check_url(&request.uri().to_string(), "https")
Expand Down
2 changes: 1 addition & 1 deletion crates/factor-outbound-networking/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ impl HostConfig {
return Ok(Self::Any);
}

if host == "self" {
if host == "self" || host == "self.alt" {
return Ok(Self::ToSelf);
}

Expand Down
47 changes: 28 additions & 19 deletions examples/spin-timer/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,11 @@ mod integration_tests {
Request::new(Method::Get, "/outbound-allowed"),
Response::new_with_body(200, "Hello, Fermyon!\n"),
)?;
assert_spin_request(
spin,
Request::new(Method::Get, "/outbound-allowed-alt"),
Response::new_with_body(200, "Hello, Fermyon!\n"),
)?;

assert_spin_request(
spin,
Expand Down
15 changes: 15 additions & 0 deletions tests/test-components/components/outbound-http/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,29 @@ use spin_sdk::{
/// Send an HTTP request and return the response.
#[http_component]
async fn send_outbound(_req: Request) -> Result<impl IntoResponse> {
// Test self-request via relative URL
let mut res: http::Response<String> = spin_sdk::http::send(
http::Request::builder()
.method("GET")
.uri("/hello")
.body(())?,
)
.await?;

// Test self-request via self.alt
let res_alt: http::Response<String> = spin_sdk::http::send(
http::Request::builder()
.method("GET")
.uri("http://self.alt/hello")
.body(())?,
)
.await?;

assert_eq!(res.body(), res_alt.body());
assert_eq!(res.status(), res_alt.status());

res.headers_mut()
.insert("spin-component", "outbound-http-component".try_into()?);

Ok(res)
}
7 changes: 7 additions & 0 deletions tests/testcases/outbound-http-to-same-app/spin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ allowed_http_hosts = ["self"]
[component.trigger]
route = "/outbound-allowed/..."

[[component]]
id = "outbound-http-allowed-alt"
source = "%{source=outbound-http}"
allowed_http_hosts = ["self.alt"]
[component.trigger]
route = "/outbound-allowed-alt/..."

[[component]]
id = "outbound-http-not-allowed"
source = "%{source=outbound-http}"
Expand Down
Loading