ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-30 03:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #3381 from n-thumann/fix_ipv6_handling

Browse source 
Fix handling of IPv6 addresses in getClientIP
This commit is contained in:
Louis Lam 2023-07-14 12:34:59 +08:00 committed by GitHub
commit 2f5a565ce4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/uptime-kuma-server.js
View file

@ -249,9 +249,9 @@ class UptimeKumaServer {
return (typeof forwardedFor === "string" ? forwardedFor.split(",")[0].trim() : null) return (typeof forwardedFor === "string" ? forwardedFor.split(",")[0].trim() : null)
|| socket.client.conn.request.headers["x-real-ip"] || socket.client.conn.request.headers["x-real-ip"]
|| clientIP.replace(/^.*:/, ""); || clientIP.replace(/^::ffff:/, "");
} else { } else {
return clientIP.replace(/^.*:/, ""); return clientIP.replace(/^::ffff:/, "");
} }
} }

10
test/backend.spec.js
View file

@ -306,6 +306,16 @@ describe("Test uptimeKumaServer.getClientIP()", () => {
ip = await server.getClientIP(fakeSocket); ip = await server.getClientIP(fakeSocket);
expect(ip).toBe("203.0.113.195"); expect(ip).toBe("203.0.113.195");
fakeSocket.client.conn.remoteAddress = "2001:db8::1";
fakeSocket.client.conn.request.headers = {};
ip = await server.getClientIP(fakeSocket);
expect(ip).toBe("2001:db8::1");
fakeSocket.client.conn.remoteAddress = "::ffff:127.0.0.1";
fakeSocket.client.conn.request.headers = {};
ip = await server.getClientIP(fakeSocket);
expect(ip).toBe("127.0.0.1");
await Database.close(); await Database.close();
}, 120000); }, 120000);
}); });