merge: 10.9 from main

2025-04-02 21:47:49 +06:00
parent 07d4393d27 fc050d78e2
commit 06bc51db54
25 changed files with 479 additions and 146 deletions
--- a/api/src/processing/request.js
+++ b/api/src/processing/request.js
@@ -118,14 +118,13 @@ export function normalizeRequest(request) {
    ));
 }

-export function getIP(req) {
+export function getIP(req, prefix = 56) {
    const strippedIP = req.ip.replace(/^::ffff:/, '');
    const ip = ipaddr.parse(strippedIP);
    if (ip.kind() === 'ipv4') {
        return strippedIP;
    }

-    const prefix = 56;
    const v6Bytes = ip.toByteArray();
          v6Bytes.fill(0, prefix / 8);