Fix X-Forwarded-Port when not present

Signed-off-by: Eloi DEMOLIS <eloi.demolis@clever-cloud.com>
sozu-proxy · Oct 20, 2023 · cda2f01 · cda2f01
1 parent 2760078
commit cda2f01
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/lib/src/protocol/kawa_h1/editor.rs b/lib/src/protocol/kawa_h1/editor.rs
@@ -171,11 +171,9 @@ impl HttpContext {
             let has_forwarded = forwarded.is_some();
 
             if let Some(header) = x_for {
-                header.val = kawa::Store::from_string(format!(
-                    "{}, {}",
-                    unsafe { from_utf8_unchecked(header.val.data(buf)) },
-                    peer_ip
-                ));
+                header.val = kawa::Store::from_string(format!("{}, {peer_ip}", unsafe {
+                    from_utf8_unchecked(header.val.data(buf))
+                }));
             }
             if let Some(header) = &mut forwarded {
                 let value = unsafe { from_utf8_unchecked(header.val.data(buf)) };
@@ -208,19 +206,13 @@ impl HttpContext {
                     val: kawa::Store::from_string(peer_ip.to_string()),
                 }));
             }
-            if !has_x_port {
-                request.push_block(kawa::Block::Header(kawa::Pair {
-                    key: kawa::Store::Static(b"X-Forwarded-Port"),
-                    val: kawa::Store::from_string(peer_port.to_string()),
-                }));
-            }
             if !has_forwarded {
                 let value = match (peer_ip, public_ip) {
                     (IpAddr::V4(_), IpAddr::V4(_)) => {
                         format!("proto={proto};for={peer_ip}:{peer_port};by={public_ip}")
                     }
                     (IpAddr::V4(_), IpAddr::V6(_)) => {
-                        format!("proto={proto};for={peer_ip}:{peer_port};by=\"{public_ip}")
+                        format!("proto={proto};for={peer_ip}:{peer_port};by=\"{public_ip}\"")
                     }
                     (IpAddr::V6(_), IpAddr::V4(_)) => {
                         format!("proto={proto};for=\"{peer_ip}:{peer_port}\";by={public_ip}")
@@ -235,6 +227,12 @@ impl HttpContext {
                 }));
             }
         }
+        if !has_x_port {
+            request.push_block(kawa::Block::Header(kawa::Pair {
+                key: kawa::Store::Static(b"X-Forwarded-Port"),
+                val: kawa::Store::from_string(public_port.to_string()),
+            }));
+        }
         if !has_x_proto {
             request.push_block(kawa::Block::Header(kawa::Pair {
                 key: kawa::Store::Static(b"X-Forwarded-Proto"),

diff --git a/lib/src/protocol/kawa_h1/mod.rs b/lib/src/protocol/kawa_h1/mod.rs
@@ -238,6 +238,9 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
         self.container_backend_timeout.cancel();
         self.frontend_readiness.interest = Ready::READABLE | Ready::HUP | Ready::ERROR;
         self.backend_readiness.interest = Ready::HUP | Ready::ERROR;
+        if !self.request_stream.storage.is_empty() {
+            self.frontend_readiness.event.insert(Ready::READABLE);
+        }
     }
 
     pub fn readable(&mut self, metrics: &mut SessionMetrics) -> StateResult {