Debugging first version of mcp path

Author: amigin

src/configurations/my_reverse_proxy_remote_endpoint.rs

@@ -35,6 +35,21 @@ impl MyReverseProxyRemoteEndpoint {
             MyReverseProxyRemoteEndpoint::Direct { remote_host } => Some(remote_host.get_host()),
         }
     }
+
+    pub fn get_path_and_query(&self) -> &str {
+        match self {
+            MyReverseProxyRemoteEndpoint::Gateway { id: _, remote_host } => {
+                remote_host.get_http_path_and_query().unwrap_or("/")
+            }
+            MyReverseProxyRemoteEndpoint::OverSsh {
+                ssh_credentials: _,
+                remote_host,
+            } => remote_host.get_http_path_and_query().unwrap_or("/"),
+            MyReverseProxyRemoteEndpoint::Direct { remote_host } => {
+                remote_host.get_http_path_and_query().unwrap_or("/")
+            }
+        }
+    }
     pub async fn try_parse(
         remote_host: &str,
         settings_model: &SettingsCompiled,

src/configurations/proxy_pass_location_config.rs

@@ -146,6 +146,7 @@ impl ProxyPassLocationConfig {
                     }
                 }
             },
+
             ProxyPassToConfig::Http2(proxy_pass) => match &proxy_pass.remote_host {
                 MyReverseProxyRemoteEndpoint::Gateway { .. } => {
                     todo!("Should not be here. Remote it at the end of the day");

src/configurations/proxy_pass_to_config.rs

@@ -36,6 +36,7 @@ pub struct ProxyPassToModel {
     pub remote_host: MyReverseProxyRemoteEndpoint,
     pub request_timeout: Duration,
     pub connect_timeout: Duration,
+    pub is_mcp: bool,
 }
 
 #[derive(Debug)]
@@ -55,19 +56,20 @@ impl ProxyPassToConfig {
             ProxyPassToConfig::UnixHttp1(proxy_pass) => proxy_pass.remote_host.to_string(),
             ProxyPassToConfig::UnixHttp2(proxy_pass) => proxy_pass.remote_host.to_string(),
             ProxyPassToConfig::Http2(proxy_pass) => proxy_pass.remote_host.to_string(),
+
             ProxyPassToConfig::FilesPath(model) => model.to_string(),
             ProxyPassToConfig::Static(model) => model.to_string(),
         }
     }
 
     pub fn get_type_as_str(&self) -> &'static str {
         match self {
-            ProxyPassToConfig::UnixHttp1(_) => "unix+http1",
-            ProxyPassToConfig::UnixHttp2(_) => "unix+http2",
-            ProxyPassToConfig::Http1(_) => "http1",
-            ProxyPassToConfig::Http2(_) => "http2",
-            ProxyPassToConfig::FilesPath(_) => "files_path",
-            ProxyPassToConfig::Static(_) => "static",
+            Self::UnixHttp1(_) => "unix+http1",
+            Self::UnixHttp2(_) => "unix+http2",
+            Self::Http1(_) => "http1",
+            Self::Http2(_) => "http2",
+            Self::FilesPath(_) => "files_path",
+            Self::Static(_) => crate::consts::location_type::STATIC,
         }
     }
 }

src/consts.rs

@@ -10,3 +10,9 @@ pub const WRITE_TIMEOUT: Duration = Duration::from_secs(30);
 pub const HTTP_CR_LF: &[u8] = b"\r\n";
 
 pub const AUTHORIZED_COOKIE_NAME: &str = "x-authorized";
+
+pub mod location_type {
+
+    pub const MCP: &'static str = "mcp";
+    pub const STATIC: &'static str = "static";
+}

src/error_templates/generate_layout.rs

@@ -55,10 +55,10 @@ pub fn generate_layout(status_code: u16, text: &str, second_line: Option<StrOrSt
     .into_bytes();
 
     let mut headers = crate::h1_utils::Http1HeadersBuilder::new();
-    headers.add_response_first_line(200);
+    headers.push_response_first_line(200);
 
-    headers.add_content_length(body.len());
-    headers.write_cl_cr();
+    headers.push_content_length(body.len());
+    headers.push_cl_cr();
 
     let mut result = headers.into_bytes();
     result.extend_from_slice(body.as_bytes());

src/h1_proxy_server/h1_read_part.rs

@@ -108,13 +108,24 @@ impl<TNetworkReadPart: NetworkStreamReadPart + Send + Sync + 'static> H1Reader<T
         modify_headers: &ModifyHeadersConfig,
         http_connection_info: &HttpConnectionInfo,
         identity: &Option<HttpProxyPassIdentity>,
+        mcp_path: Option<&str>,
     ) -> Result<bool, ProxyServerError> {
         self.h1_headers_builder.clear();
         let data = self.loop_buffer.get_data();
 
-        self.h1_headers_builder.push_raw_payload(
-            &data[..http_headers.first_line_end + crate::consts::HTTP_CR_LF.len()],
-        );
+        if let Some(mcp_path) = mcp_path {
+            println!("Pushing mcp path {}", mcp_path);
+            http_headers.push_first_line_with_other_path(
+                data,
+                mcp_path,
+                &mut self.h1_headers_builder,
+            );
+            self.h1_headers_builder.push_cl_cr();
+        } else {
+            self.h1_headers_builder.push_raw_payload(
+                &data[..http_headers.first_line_end + crate::consts::HTTP_CR_LF.len()],
+            );
+        }
 
         let mut pos = http_headers.first_line_end + crate::consts::HTTP_CR_LF.len();
 
@@ -161,9 +172,9 @@ impl<TNetworkReadPart: NetworkStreamReadPart + Send + Sync + 'static> H1Reader<T
                 add_header.1.as_str(),
             );
             self.h1_headers_builder
-                .add_header(add_header.0, value.as_str());
+                .push_header(add_header.0, value.as_str());
         }
-        self.h1_headers_builder.write_cl_cr();
+        self.h1_headers_builder.push_cl_cr();
 
         let mut web_socket_upgrade = false;
 

src/h1_proxy_server/server_loop.rs

@@ -179,6 +179,7 @@ async fn execute_request<
         &end_point_info.modify_request_headers,
         &http_connection_info,
         &identity,
+        connection.mcp_path.as_deref(),
     )?;
 
     let send_headers_result = connection