Nail/ipwhitelist-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.9: защита от пустого clientId (null client_id)

Browse Source
This commit is contained in:
cairnr01probe
2026-06-15 10:35:03 +04:00
parent 54dca739bb
commit b1d30f72b4
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ipwhitelist", "name": "ipwhitelist",
"version": "0.6.8", "version": "0.6.9",
"description": "IP WhiteList microservice for cloud provider", "description": "IP WhiteList microservice for cloud provider",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
v2/src/crud/index.js
+1
View File
@@ -31,6 +31,7 @@ const { validate } = require('../validators');
// Возвращает { id, client_id, name, custom_limit }. // Возвращает { id, client_id, name, custom_limit }.
// Вызывается из list/add/edit/remove перед каждой операцией. // Вызывается из list/add/edit/remove перед каждой операцией.
async function resolve(clientId) { async function resolve(clientId) {
if (!clientId || !clientId.trim()) throw new Error('Ошибка: не определён clientId (W-номер компании). Обратитесь к администратору.');
return q.getOrCreateCompany(clientId, clientId); return q.getOrCreateCompany(clientId, clientId);
} }
v2/src/router/index.js
+1
View File
@@ -42,6 +42,7 @@ function resolveContext(req, res, next) {
// ВЕЗДЕ: created_by, экран, формы // ВЕЗДЕ: created_by, экран, формы
req.email = u.email || ''; req.email = u.email || '';
req.clientId = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || ''); req.clientId = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || '');
if (!req.clientId) return res.status(400).send('<h2>Ошибка</h2><p>Не удалось определить W-номер компании. Проверьте настройки IAM.</p><p><a href="/logout">Выйти</a></p>');
req.companyName = u.companyName || req.clientId; req.companyName = u.companyName || req.clientId;
req.isAdmin = !!(u.isAdmin && u.adminMode) || (ADMIN_EMAIL && u.email === ADMIN_EMAIL); req.isAdmin = !!(u.isAdmin && u.adminMode) || (ADMIN_EMAIL && u.email === ADMIN_EMAIL);
req.isImpersonated = isImpersonated; req.isImpersonated = isImpersonated;