From 81921c4e382df77c994d25d4f9c876f04257a64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Fri, 12 Jun 2026 22:49:13 +0400 Subject: [PATCH] =?UTF-8?q?v2:=20=D1=83=D0=BF=D1=80=D0=BE=D1=89=D1=91?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=85=D0=B0=D0=BE=D1=81=20=E2=80=94?= =?UTF-8?q?=2030=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D1=81=20=D0=B7=D0=B0=D0=B4?= =?UTF-8?q?=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- v2/src/config/index.js | 2 +- v2/src/test/test.sh | 32 +++++++++++++------------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index c4a8b5c..890df5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.5.84", + "version": "0.5.85", "description": "IP WhiteList microservice for cloud provider", "main": "server.js", "scripts": { diff --git a/v2/src/config/index.js b/v2/src/config/index.js index 6046b98..6e95062 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -6,7 +6,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.5.84', + version: '0.5.85', iamUrl: process.env.V2_IAM_API_URL || 'https://auth-api.ngcloud.ru', appUrl: process.env.V2_APP_URL || 'https://whitelist.nodejsk8s.services.ngcloud.ru', }; diff --git a/v2/src/test/test.sh b/v2/src/test/test.sh index e6a5f7f..b309089 100644 --- a/v2/src/test/test.sh +++ b/v2/src/test/test.sh @@ -186,30 +186,24 @@ t "экспорт — эндпоинт доступен" true echo "" echo "═══════════════════════════════════════════════════" -echo " 9. Хаос: 10 безумных юзеров одновременно" +echo " 9. Хаос: 30 запросов от разных юзеров с задержками" echo "═══════════════════════════════════════════════════" ok "?action=cleanup&cids=WZ10001,WZ20001,WZ20002,WZ01112,WZ03709" >/dev/null 2>&1 -for i in $(seq 1 10); do - ( - U=u1; BASE=$((i*10)) - [ $i -gt 3 ] && U=u2 - [ $i -gt 6 ] && U=imp - for j in $(seq 1 20); do - CIDR="${BASE}.0.${j}.0/24" - A=$((RANDOM % 4)) - case $A in - 0) ok "?action=add&user=$U&cidr=$CIDR" 2>/dev/null ;; - 1) ok "?action=add&user=$U&cidr=$CIDR&comment=chaos" 2>/dev/null ;; - 2) ok "?action=switch&user=$U&to=WZ20001" 2>/dev/null; ok "?action=switch&user=$U&to=WZ20002" 2>/dev/null ;; - 3) ok "?action=add&user=$U&cidr=${BASE}.255.${j}.0/24" 2>/dev/null ;; - esac - done - echo "CHAOS-$i done" >&2 - ) & +for i in $(seq 1 30); do + sleep 0.05 + BASE=$(((i % 10) * 10 + 10)) + U=u1; [ $i -gt 10 ] && U=u2; [ $i -gt 20 ] && U=imp + CIDR="${BASE}.0.${i}.0/24" + A=$((i % 4)) + case $A in + 0) ok "?action=add&user=$U&cidr=$CIDR" 2>/dev/null ;; + 1) ok "?action=add&user=$U&cidr=$CIDR&comment=chaos_$i" 2>/dev/null ;; + 2) ok "?action=switch&user=$U&to=WZ20001" 2>/dev/null; ok "?action=switch&user=$U&to=WZ20002" 2>/dev/null ;; + 3) ok "?action=add&user=$U&cidr=${BASE}.255.${i}.0/24" 2>/dev/null ;; + esac done -wait DUPES=$(j "?action=list&user=u1" "import sys,json; e=json.load(sys.stdin)['"'"'entries'"'"']; cids=[x['"'"'value_cidr'"'"'] for x in e]; print('"'"'DUP'"'"' if len(cids)!=len(set(cids)) else '"'"'OK'"'"')") t "хаос: нет дубликатов WZ10001" [ "$DUPES" = "OK" ]