Forwarding requests to upstream added "x-forwarded-for". (#67)

flomesh-io · Oct 9, 2023 · a6ec5a0 · a6ec5a0
1 parent 3806e78
commit a6ec5a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/pjs/http/service.js b/pjs/http/service.js
@@ -11,6 +11,7 @@
   serviceHandlers = new algo.Cache(makeServiceHandler),
 
 ) => pipy({
+  _xff: null,
   _serviceName: null,
   _unauthorized: undefined,
 })
@@ -27,15 +28,21 @@
 
 .pipeline()
 .handleMessageStart(
-  () => (
+  msg => (
     __route?.config?.EnableHeadersAuthorization && (
       (!__consumer || !__consumer?.['Headers-Authorization']) ? (_unauthorized = true) : (_unauthorized = false)
     ),
     __route?.serverRoot ? (
       __root = __route.serverRoot
     ) : (
       (_serviceName = __route?.backendServiceBalancer?.borrow?.({})?.id) && (
-        __service = serviceHandlers.get(_serviceName)
+        (__service = serviceHandlers.get(_serviceName)) && msg?.head?.headers && (
+          (_xff = msg.head.headers['x-forwarded-for']) ? (
+            msg.head.headers['x-forwarded-for'] = _xff + ', ' + __inbound.localAddress
+          ) : (
+            msg.head.headers['x-forwarded-for'] = __inbound.localAddress
+          )
+        )
       )
     )
   )

diff --git a/pjs/tcp/forward.js b/pjs/tcp/forward.js
@@ -87,7 +87,7 @@
         (_serviceConfig = serviceConfigs.get(__service)) && (
           __metricLabel = __service.name,
           _unhealthCache = __healthCheckServices?.[__service.name],
-          (__target = _serviceConfig.targetBalancer?.borrow?.({}, undefined, _unhealthCache)?.id) && (
+          (__target = _serviceConfig.targetBalancer?.borrow?.(__inbound, undefined, _unhealthCache)?.id) && (
             (
               attrs = _serviceConfig?.endpointAttributes?.[__target]
             ) => (
@@ -138,4 +138,4 @@
   )
 )
 
-)()
+)()
diff --git a/pjs/tls/forward.js b/pjs/tls/forward.js
@@ -105,7 +105,7 @@
         (_serviceConfig = serviceConfigs.get(__service)) && (
           __metricLabel = __service.name,
           _unhealthCache = __healthCheckServices?.[__service.name],
-          (__target = _serviceConfig.targetBalancer?.borrow?.({}, undefined, _unhealthCache)?.id) && (
+          (__target = _serviceConfig.targetBalancer?.borrow?.(__inbound, undefined, _unhealthCache)?.id) && (
             (
               attrs = _serviceConfig?.endpointAttributes?.[__target]
             ) => (
@@ -156,4 +156,4 @@
   )
 )
 
-)()
+)()