feat(serverless): forward X-Real-Ip as X-Forwarded-For & X-Lagon-Regi…

…on (#379)
lagonapp · Dec 12, 2022 · d48f00c · d48f00c · vercel · Dec 12, 2022
1 parent cf89165
commit d48f00c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.changeset/spotty-wombats-bathe.md b/.changeset/spotty-wombats-bathe.md
@@ -0,0 +1,5 @@
+---
+'@lagon/serverless': patch
+---
+
+Forward X-Real-Ip header to X-Forwarded-For
diff --git a/.changeset/wise-cooks-warn.md b/.changeset/wise-cooks-warn.md
@@ -0,0 +1,5 @@
+---
+'@lagon/serverless': patch
+---
+
+Forward X-Lagon-Region header
diff --git a/packages/runtime/tests/disallow_codegen.rs b/packages/runtime/tests/disallow_codegen.rs
@@ -51,4 +51,3 @@ async fn disallow_function() {
         RunResult::Error("Uncaught EvalError: Code generation from strings disallowed for this context, at:\n    const result = new Function('return 1 + 1')".into())
     );
 }
-
diff --git a/packages/serverless/src/main.rs b/packages/serverless/src/main.rs
@@ -41,14 +41,16 @@ mod logger;
 lazy_static! {
     pub static ref ISOLATES: RwLock<HashMap<usize, HashMap<String, Isolate>>> =
         RwLock::new(HashMap::new());
-    static ref X_FORWARDED_FOR: String = String::from("X-Forwarded-For");
     pub static ref REGION: String = env::var("LAGON_REGION").expect("LAGON_REGION must be set");
 }
 
 const POOL_SIZE: usize = 8;
 const PAGE_404: &str = include_str!("../public/404.html");
 const PAGE_502: &str = include_str!("../public/502.html");
 const PAGE_500: &str = include_str!("../public/500.html");
+const X_FORWARDED_FOR: &str = "x-forwarded-for";
+const X_LAGON_REGION: &str = "x-lagon-region";
+const X_REAL_IP: &str = "x-real-ip";
 
 async fn handle_request(
     req: HyperRequest<Body>,
@@ -156,7 +158,14 @@ async fn handle_request(
                     };
 
                     counter!("lagon_bytes_in", request.len() as u64, &thread_labels);
+
+                    // Try to Extract the X-Real-Ip header or fallback to remote addr IP
+                    let ip = request.headers
+                        .as_ref()
+                        .map_or(&ip, |headers| headers.get(X_REAL_IP).unwrap_or(&ip)).to_string();
+
                     request.add_header(X_FORWARDED_FOR.to_string(), ip);
+                    request.add_header(X_LAGON_REGION.to_string(), REGION.to_string());
 
                     // Only acquire the lock when we are sure we have a
                     // deployment and that the isolate should be called.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,3 @@ async fn disallow_function() {
		RunResult::Error("Uncaught EvalError: Code generation from strings disallowed for this context, at:\n const result = new Function('return 1 + 1')".into())
		);
		}