Handle relative URIs

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -119,7 +119,7 @@ wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2ffbc3
   "component-model",
 ] }
 wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2ffbc36c377b98e4eabe89ae37bb334605d904cc" }
-spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "6fa69dcac7cae44fccc5671b9908d19c3e1514c0" }
+spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" }
 hyper = { version = "=1.0.0-rc.3", features = ["full"] }
 http-body-util = "=0.1.0-rc.2"
 

Cargo.toml

@@ -20,7 +20,7 @@ use crossbeam_channel::Sender;
 use tracing::instrument;
 use wasmtime::{InstanceAllocationStrategy, PoolingAllocationConfig};
 use wasmtime_wasi::preview2::Table;
-use wasmtime_wasi_http::types::{WasiHttpCtx, WasiHttpView};
+use wasmtime_wasi_http::types::{default_send_request, WasiHttpCtx, WasiHttpView};
 
 use self::host_component::{HostComponents, HostComponentsBuilder};
 
@@ -191,7 +191,7 @@ impl<T: Send> wasmtime_wasi::preview2::WasiView for Data<T> {
     }
 }
 
-impl<T: Send> WasiHttpView for Data<T> {
+impl<T: Send + OutboundWasiHttpHandler> WasiHttpView for Data<T> {
     fn ctx(&mut self) -> &mut WasiHttpCtx {
         match &mut self.wasi {
             Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
@@ -202,6 +202,45 @@ impl<T: Send> WasiHttpView for Data<T> {
     fn table(&mut self) -> &mut Table {
         &mut self.table
     }
+
+    fn send_request(
+        &mut self,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized,
+    {
+        T::send_request(self, request)
+    }
+}
+
+/// Handler for wasi-http based requests
+pub trait OutboundWasiHttpHandler {
+    /// Send the request
+    fn send_request(
+        data: &mut Data<Self>,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized;
+}
+
+impl OutboundWasiHttpHandler for () {
+    fn send_request(
+        data: &mut Data<Self>,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized,
+    {
+        default_send_request(data, request)
+    }
 }
 
 /// An alias for [`wasmtime::Linker`] specialized to [`Data`].
@@ -222,7 +261,7 @@ pub struct EngineBuilder<T> {
     epoch_ticker_thread: bool,
 }
 
-impl<T: Send + Sync> EngineBuilder<T> {
+impl<T: Send + Sync + OutboundWasiHttpHandler> EngineBuilder<T> {
     fn new(config: &Config) -> Result<Self> {
         let engine = wasmtime::Engine::new(&config.inner)?;
 
@@ -244,7 +283,9 @@ impl<T: Send + Sync> EngineBuilder<T> {
             epoch_ticker_thread: true,
         })
     }
+}
 
+impl<T: Send + Sync> EngineBuilder<T> {
     /// Adds definition(s) to the built [`Engine`].
     ///
     /// This method's signature is meant to be used with
@@ -345,7 +386,7 @@ pub struct Engine<T> {
     _epoch_ticker_signal: Option<Sender<()>>,
 }
 
-impl<T: Send + Sync> Engine<T> {
+impl<T: OutboundWasiHttpHandler + Send + Sync> Engine<T> {
     /// Creates a new [`EngineBuilder`] with the given [`Config`].
     pub fn builder(config: &Config) -> Result<EngineBuilder<T>> {
         EngineBuilder::new(config)

crates/core/src/lib.rs

@@ -212,8 +212,8 @@ async fn run_core_wasi_test_engine<'a>(
         let mut exports = instance.exports(&mut store);
 
         let mut instance = exports
-            .instance("wasi:cli/run")
-            .context("missing the expected 'wasi:cli/run' instance")?;
+            .instance("wasi:cli/run@0.2.0-rc-2023-10-18")
+            .context("missing the expected 'wasi:cli/run@0.2.0-rc-2023-10-18' instance")?;
         instance.typed_func::<(), (Result<(), ()>,)>("run")?
     };
     update_store(&mut store);

crates/core/tests/integration_test.rs

@@ -24,7 +24,7 @@
       "trigger_config": {
         "component": "four-lights",
         "executor": {
-          "type": "spin"
+          "type": "http"
         },
         "route": "/lights"
       }

crates/loader/tests/ui/valid-manifest.lock

@@ -21,7 +21,7 @@
       "trigger_config": {
         "component": "fs",
         "executor": {
-          "type": "spin"
+          "type": "http"
         },
         "route": "/..."
       }

crates/loader/tests/ui/valid-with-files/spin.lock

@@ -270,6 +270,7 @@ fn set_http_origin_from_request(
 ) {
     if let Some(authority) = req.uri().authority() {
         if let Some(scheme) = req.uri().scheme_str() {
+            let origin = format!("{}://{}", scheme, authority);
             if let Some(outbound_http_handle) = engine
                 .engine
                 .find_host_component_handle::<Arc<OutboundHttpComponent>>()
@@ -278,8 +279,9 @@ fn set_http_origin_from_request(
                     .host_components_data()
                     .get_or_insert(outbound_http_handle);
 
-                outbound_http_data.origin = format!("{}://{}", scheme, authority);
+                outbound_http_data.origin = origin.clone();
             }
+            store.as_mut().data_mut().as_mut().origin = Some(origin);
         }
     }
 }

crates/trigger-http/src/handler.rs

@@ -23,7 +23,7 @@ use hyper::{
     Request, Response,
 };
 use spin_app::{AppComponent, APP_DESCRIPTION_KEY};
-use spin_core::Engine;
+use spin_core::{Engine, OutboundWasiHttpHandler};
 use spin_http::{
     app_info::AppInfo,
     body,
@@ -43,7 +43,7 @@ use crate::{handler::HttpHandlerExecutor, wagi::WagiHttpExecutor};
 
 pub use tls::TlsConfig;
 
-pub(crate) type RuntimeData = ();
+pub(crate) type RuntimeData = HttpRuntimeData;
 pub(crate) type Store = spin_core::Store<RuntimeData>;
 
 /// The Spin HTTP trigger.
@@ -443,6 +443,54 @@ pub(crate) trait HttpExecutor: Clone + Send + Sync + 'static {
     ) -> Result<Response<Body>>;
 }
 
+#[derive(Default)]
+pub struct HttpRuntimeData {
+    origin: Option<String>,
+}
+
+impl OutboundWasiHttpHandler for HttpRuntimeData {
+    fn send_request(
+        data: &mut spin_core::Data<Self>,
+        mut request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized,
+    {
+        let is_relative_url = request
+            .request
+            .uri()
+            .authority()
+            .map(|a| a.host().trim() == "")
+            .unwrap_or_default();
+        if is_relative_url {
+            // Origin must be set in the incoming http handler
+            let origin = data.as_ref().origin.clone().unwrap();
+            let path_and_query = request
+                .request
+                .uri()
+                .path_and_query()
+                .map(|p| p.as_str())
+                .unwrap_or("/");
+            let uri: Uri = format!("{origin}{path_and_query}")
+                .parse()
+                // origin together with the path and query must be a valid URI
+                .unwrap();
+
+            request.use_tls = uri
+                .scheme()
+                .map(|s| s == &Scheme::HTTPS)
+                .unwrap_or_default();
+            // We know that `uri` has an authority because we set it above
+            request.authority = uri.authority().unwrap().as_str().to_owned();
+            *request.request.uri_mut() = uri;
+        }
+
+        wasmtime_wasi_http::types::default_send_request(data, request)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::BTreeMap;

crates/trigger-http/src/lib.rs

@@ -13,8 +13,8 @@ use serde::de::DeserializeOwned;
 
 use spin_app::{App, AppComponent, AppLoader, AppTrigger, Loader, OwnedApp, APP_NAME_KEY};
 use spin_core::{
-    Config, Engine, EngineBuilder, Instance, InstancePre, ModuleInstance, ModuleInstancePre, Store,
-    StoreBuilder, WasiVersion,
+    Config, Engine, EngineBuilder, Instance, InstancePre, ModuleInstance, ModuleInstancePre,
+    OutboundWasiHttpHandler, Store, StoreBuilder, WasiVersion,
 };
 
 pub use crate::runtime_config::RuntimeConfig;
@@ -32,7 +32,7 @@ pub enum EitherInstance {
 #[async_trait]
 pub trait TriggerExecutor: Sized + Send + Sync {
     const TRIGGER_TYPE: &'static str;
-    type RuntimeData: Default + Send + Sync + 'static;
+    type RuntimeData: OutboundWasiHttpHandler + Default + Send + Sync + 'static;
     type TriggerConfig;
     type RunConfig;