Update for upstream changes to the error-code variant

Author: elliottt

crates/test-programs/src/bin/http_outbound_request_unknown_method.rs

@@ -1,4 +1,4 @@
-use test_programs::wasi::http::types::{ErrorCode, HttpRequestErrorPayload, Method, Scheme};
+use test_programs::wasi::http::types::{ErrorCode, Method, Scheme};
 
 fn main() {
     let res = test_programs::http::request(
@@ -14,9 +14,6 @@ fn main() {
         res.unwrap_err()
             .downcast::<ErrorCode>()
             .expect("expected a wasi-http ErrorCode"),
-        ErrorCode::HttpRequestError(HttpRequestErrorPayload {
-            status_code: Some(405),
-            ..
-        }),
+        ErrorCode::HttpProtocolError,
     ));
 }

crates/test-programs/src/bin/http_outbound_request_unsupported_scheme.rs

@@ -1,4 +1,4 @@
-use test_programs::wasi::http::types::{ErrorCode, HttpRequestErrorPayload, Method, Scheme};
+use test_programs::wasi::http::types::{ErrorCode, Method, Scheme};
 
 fn main() {
     let res = test_programs::http::request(
@@ -14,9 +14,6 @@ fn main() {
         res.unwrap_err()
             .downcast::<ErrorCode>()
             .expect("expected a wasi-http ErrorCode"),
-        ErrorCode::HttpRequestError(HttpRequestErrorPayload {
-            status_code: Some(400),
-            ..
-        }),
+        ErrorCode::HttpProtocolError,
     ));
 }

crates/wasi-http/src/http_impl.rs

@@ -3,7 +3,6 @@ use crate::{
         outgoing_handler,
         types::{self, Scheme},
     },
-    http_request_error,
     types::{HostFutureIncomingResponse, HostOutgoingRequest, OutgoingRequest},
     WasiHttpView,
 };
@@ -35,32 +34,27 @@ impl<T: WasiHttpView> outgoing_handler::Host for T {
         let req = self.table().delete(request_id)?;
 
         let method = match req.method {
-            crate::bindings::http::types::Method::Get => Method::GET,
-            crate::bindings::http::types::Method::Head => Method::HEAD,
-            crate::bindings::http::types::Method::Post => Method::POST,
-            crate::bindings::http::types::Method::Put => Method::PUT,
-            crate::bindings::http::types::Method::Delete => Method::DELETE,
-            crate::bindings::http::types::Method::Connect => Method::CONNECT,
-            crate::bindings::http::types::Method::Options => Method::OPTIONS,
-            crate::bindings::http::types::Method::Trace => Method::TRACE,
-            crate::bindings::http::types::Method::Patch => Method::PATCH,
-            crate::bindings::http::types::Method::Other(method) => {
-                return Ok(Err(http_request_error(
-                    405,
-                    format!("unknown method {method}"),
-                )));
+            types::Method::Get => Method::GET,
+            types::Method::Head => Method::HEAD,
+            types::Method::Post => Method::POST,
+            types::Method::Put => Method::PUT,
+            types::Method::Delete => Method::DELETE,
+            types::Method::Connect => Method::CONNECT,
+            types::Method::Options => Method::OPTIONS,
+            types::Method::Trace => Method::TRACE,
+            types::Method::Patch => Method::PATCH,
+            types::Method::Other(_) => {
+                // We can't support arbitrary methods
+                return Ok(Err(types::ErrorCode::HttpProtocolError));
             }
         };
 
         let (use_tls, scheme, port) = match req.scheme.unwrap_or(Scheme::Https) {
             Scheme::Http => (false, "http://", 80),
             Scheme::Https => (true, "https://", 443),
-            Scheme::Other(scheme) => {
-                return Ok(Err(http_request_error(
-                    400,
-                    format!("unsupported scheme {scheme}"),
-                )))
-            }
+
+            // We can only support http/https
+            Scheme::Other(_) => return Ok(Err(types::ErrorCode::HttpProtocolError)),
         };
 
         let authority = if let Some(authority) = req.authority {

crates/wasi-http/src/lib.rs

@@ -43,15 +43,3 @@ pub(crate) fn dns_error(rcode: String, info_code: u16) -> bindings::http::types:
         info_code: Some(info_code),
     })
 }
-
-pub(crate) fn http_request_error(
-    status_code: u16,
-    status_phrase: String,
-) -> bindings::http::types::ErrorCode {
-    bindings::http::types::ErrorCode::HttpRequestError(
-        bindings::http::types::HttpRequestErrorPayload {
-            status_code: Some(status_code),
-            status_phrase: Some(status_phrase),
-        },
-    )
-}

crates/wasi-http/wit/deps/http/types.wit

@@ -45,8 +45,12 @@ interface types {
     TLS-protocol-error,
     TLS-certificate-error,
     TLS-alert-received(TLS-alert-received-payload),
-    HTTP-request-error(HTTP-request-error-payload),
     HTTP-request-denied,
+    HTTP-request-length-required,
+    HTTP-request-content-too-large,
+    HTTP-request-URI-too-long,
+    HTTP-request-header-section-size(option<u32>),
+    HTTP-request-header-size(option<field-size-payload>),
     HTTP-response-incomplete,
     HTTP-response-header-section-size(option<u32>),
     HTTP-response-header-size(field-size-payload),
@@ -76,12 +80,6 @@ interface types {
     alert-message: option<string>
   }
 
-  /// Defines the case payload type for `HTTP-request-error` above:
-  record HTTP-request-error-payload {
-    status-code: option<u16>,
-    status-phrase: option<string>
-  }
-
   /// Defines the case payload type for `HTTP-response-{header,trailer}-size` above:
   record field-size-payload {
     field-name: option<string>,

crates/wasi/wit/deps/http/types.wit

@@ -45,8 +45,12 @@ interface types {
     TLS-protocol-error,
     TLS-certificate-error,
     TLS-alert-received(TLS-alert-received-payload),
-    HTTP-request-error(HTTP-request-error-payload),
     HTTP-request-denied,
+    HTTP-request-length-required,
+    HTTP-request-content-too-large,
+    HTTP-request-URI-too-long,
+    HTTP-request-header-section-size(option<u32>),
+    HTTP-request-header-size(option<field-size-payload>),
     HTTP-response-incomplete,
     HTTP-response-header-section-size(option<u32>),
     HTTP-response-header-size(field-size-payload),
@@ -76,12 +80,6 @@ interface types {
     alert-message: option<string>
   }
 
-  /// Defines the case payload type for `HTTP-request-error` above:
-  record HTTP-request-error-payload {
-    status-code: option<u16>,
-    status-phrase: option<string>
-  }
-
   /// Defines the case payload type for `HTTP-response-{header,trailer}-size` above:
   record field-size-payload {
     field-name: option<string>,

src/commands/serve.rs

@@ -369,20 +369,8 @@ impl hyper::service::Service<Request> for ProxyHandler {
                 body.map_err(|err| {
                     if err.is_timeout() {
                         http_types::ErrorCode::HttpResponseTimeout
-                    } else if err.is_parse_status() || err.is_user() {
-                        http_types::ErrorCode::HttpRequestError(
-                            http_types::HttpRequestErrorPayload {
-                                status_code: Some(400),
-                                status_phrase: Some("".to_string()),
-                            },
-                        )
                     } else if err.is_parse_too_large() {
-                        http_types::ErrorCode::HttpRequestError(
-                            http_types::HttpRequestErrorPayload {
-                                status_code: Some(413),
-                                status_phrase: Some("".to_string()),
-                            },
-                        )
+                        http_types::ErrorCode::HttpRequestContentTooLarge
                     } else {
                         http_types::ErrorCode::HttpProtocolError
                     }