Tune client IP detection (#2359)

sakura-tel · Dec 31, 2022 · 88b8c0f · 88b8c0f
1 parent c94ecfd
commit 88b8c0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.config/example.yml b/.config/example.yml
@@ -133,7 +133,7 @@ autoAdmin: true
 #mediaProxy: https://example.com/proxy
 
 # Sign to ActivityPub GET request (default: true)
-#signToActivityPubGet: flase
+#signToActivityPubGet: false
 
 # Allowed network address (default: all allowed)
 #allowedPrivateNetworks: [
@@ -145,3 +145,7 @@ autoAdmin: true
 
 # Hide server infomation (default: false)
 #hideServerInfo: true
+
+# Header for get original IP address from reverse proxy
+# ex. X-Forwarded-For, CF-Connecting-IP
+#proxyIpHeader: 'X-Forwarded-For'
diff --git a/src/config/types.ts b/src/config/types.ts
@@ -63,6 +63,8 @@ export type Source = {
 	mediaProxy?: string;
 
 	signToActivityPubGet?: boolean;
+
+	proxyIpHeader?: string;
 };
 
 /**

diff --git a/src/server/index.ts b/src/server/index.ts
@@ -28,7 +28,10 @@ export const serverLogger = new Logger('server', 'gray', false);
 
 // Init app
 const app = new Koa();
+
 app.proxy = true;
+(app as any).maxIpsCount = 1;
+(app as any).proxyIpHeader = config.proxyIpHeader ?? 'X-Forwarded-For';
 
 if (!['production', 'test'].includes(process.env.NODE_ENV || '')) {
 	// Logger
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,8 @@ export type Source = { @@
     	mediaProxy?: string;
     	signToActivityPubGet?: boolean;
+    	proxyIpHeader?: string;
     };
     /**
@@ Expand Down @@