From 2aa770a07b564b5a95aab9a2b0f0c14ed1f9ec650158d89f0246656902ec98ce Mon Sep 17 00:00:00 2001 From: AidarKC Date: Mon, 16 Nov 2026 09:57:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20fallback=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D1=81=D0=B1=D0=BE=D0=B5=20IndexedDB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.properties | 2 +- shine-UI/js/app.js | 3 + shine-UI/js/services/key-vault.js | 76 ++++++++++++++++--- .../registration-header-bootstrap.test.mjs | 8 ++ 4 files changed, 78 insertions(+), 11 deletions(-) diff --git a/VERSION.properties b/VERSION.properties index 4bd0f2bc..f5027dbe 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.20.47 +client.version=1.20.48 server.version=1.16.25 diff --git a/shine-UI/js/app.js b/shine-UI/js/app.js index bb86251b..cc93a6b8 100644 --- a/shine-UI/js/app.js +++ b/shine-UI/js/app.js @@ -1487,6 +1487,9 @@ async function redirectToActiveKeyRotationIfNeeded() { return true; } } catch (error) { + // Бесплатная регистрация не поддерживает ротацию Solana-ключей — это + // штатный ответ сервера, а не неисправность восстановления сессии. + if (String(error?.code || '').toUpperCase() === 'KEY_ROTATION_PAID_ONLY') return false; console.warn('[key-rotation] status check failed', error); } return false; diff --git a/shine-UI/js/services/key-vault.js b/shine-UI/js/services/key-vault.js index b48686d0..b872dfcd 100644 --- a/shine-UI/js/services/key-vault.js +++ b/shine-UI/js/services/key-vault.js @@ -8,11 +8,45 @@ const DB_NAME = 'shine-ui-auth'; const DB_VERSION = 1; const STORE_SECRETS = 'encrypted-secrets'; const STORE_SESSIONS = 'session-keys'; +const FALLBACK_SECRETS_KEY = 'shine-ui-auth-secrets-fallback-v1'; +const FALLBACK_SESSIONS_KEY = 'shine-ui-auth-sessions-fallback-v1'; + +// Некоторые браузеры/расширения временно ломают IndexedDB и возвращают +// только «UnknownError: Internal error». В памяти держим только текущие +// значения, а в localStorage — те же зашифрованные secrets и session material, +// которые раньше хранились в IndexedDB. +const memorySecrets = new Map(); +const memorySessions = new Map(); function normalizeLoginStorageKey(login) { return String(login || '').trim().toLowerCase(); } +function readFallbackRow(storageKey, login) { + try { + if (typeof localStorage === 'undefined') return null; + const rows = JSON.parse(localStorage.getItem(storageKey) || '{}'); + return rows?.[normalizeLoginStorageKey(login)] || null; + } catch { + return null; + } +} + +function writeFallbackRow(storageKey, login, row) { + try { + if (typeof localStorage === 'undefined') return; + const rows = JSON.parse(localStorage.getItem(storageKey) || '{}'); + rows[normalizeLoginStorageKey(login)] = row; + localStorage.setItem(storageKey, JSON.stringify(rows)); + } catch { + // Память остаётся последним fallback для текущей вкладки. + } +} + +function deleteFallbackRows(storageKey) { + try { localStorage?.removeItem(storageKey); } catch {} +} + function sanitizePersistentSecrets(keys) { const source = keys && typeof keys === 'object' ? keys : {}; const safe = { ...source }; @@ -66,18 +100,26 @@ export async function saveEncryptedUserSecrets(login, storagePwd, keys) { const safeKeys = sanitizePersistentSecrets(keys); const encrypted = await encryptJsonWithStoragePwd(safeKeys, storagePwd); const normalizedLogin = normalizeLoginStorageKey(login); - await put(STORE_SECRETS, { + const row = { login: normalizedLogin, encrypted, updatedAtMs: Date.now(), - }); + }; + memorySecrets.set(normalizedLogin, row); + try { + await put(STORE_SECRETS, row); + } catch { + writeFallbackRow(FALLBACK_SECRETS_KEY, normalizedLogin, row); + } } export async function loadEncryptedUserSecrets(login, storagePwd) { const normalizedLogin = normalizeLoginStorageKey(login); - let row = await get(STORE_SECRETS, normalizedLogin); + let row = null; + try { row = await get(STORE_SECRETS, normalizedLogin); } catch {} + row = row || memorySecrets.get(normalizedLogin) || readFallbackRow(FALLBACK_SECRETS_KEY, normalizedLogin); if (!row?.encrypted && normalizedLogin !== String(login || '').trim()) { - row = await get(STORE_SECRETS, String(login || '').trim()); + try { row = await get(STORE_SECRETS, String(login || '').trim()); } catch {} } if (!row?.encrypted) { throw new Error('На устройстве нет сохранённых ключей для этого логина'); @@ -90,11 +132,13 @@ export async function loadEncryptedUserSecrets(login, storagePwd) { // мог быть сохранён. Перезаписываем тем же storagePwd уже без Recovery private key. if (decrypted && typeof decrypted === 'object' && Object.prototype.hasOwnProperty.call(decrypted, 'rootKey')) { const encrypted = await encryptJsonWithStoragePwd(safe, storagePwd); - await put(STORE_SECRETS, { + const cleanedRow = { login: normalizedLogin, encrypted, updatedAtMs: Date.now(), - }); + }; + memorySecrets.set(normalizedLogin, cleanedRow); + try { await put(STORE_SECRETS, cleanedRow); } catch { writeFallbackRow(FALLBACK_SECRETS_KEY, normalizedLogin, cleanedRow); } } return safe; @@ -117,21 +161,33 @@ export async function updateEncryptedUserSecrets(login, storagePwd, updater) { export async function saveSessionMaterial(login, material) { const normalizedLogin = normalizeLoginStorageKey(login); - await put(STORE_SESSIONS, { + const row = { login: normalizedLogin, ...material, updatedAtMs: Date.now(), - }); + }; + memorySessions.set(normalizedLogin, row); + try { + await put(STORE_SESSIONS, row); + } catch { + writeFallbackRow(FALLBACK_SESSIONS_KEY, normalizedLogin, row); + } } export async function loadSessionMaterial(login) { const normalizedLogin = normalizeLoginStorageKey(login); - const row = await get(STORE_SESSIONS, normalizedLogin); + let row = null; + try { row = await get(STORE_SESSIONS, normalizedLogin); } catch {} + row = row || memorySessions.get(normalizedLogin) || readFallbackRow(FALLBACK_SESSIONS_KEY, normalizedLogin); if (row || normalizedLogin === String(login || '').trim()) return row; - return get(STORE_SESSIONS, String(login || '').trim()); + try { return await get(STORE_SESSIONS, String(login || '').trim()); } catch { return null; } } export async function clearClientAuthData() { + memorySecrets.clear(); + memorySessions.clear(); + deleteFallbackRows(FALLBACK_SECRETS_KEY); + deleteFallbackRows(FALLBACK_SESSIONS_KEY); await new Promise((resolve, reject) => { const request = indexedDB.deleteDatabase(DB_NAME); request.onsuccess = () => resolve(); diff --git a/shine-UI/tests/registration-header-bootstrap.test.mjs b/shine-UI/tests/registration-header-bootstrap.test.mjs index ff22db49..bd590854 100644 --- a/shine-UI/tests/registration-header-bootstrap.test.mjs +++ b/shine-UI/tests/registration-header-bootstrap.test.mjs @@ -38,6 +38,14 @@ test('после CreateAuthSession регистрация не запускае assert.doesNotMatch(finish, /await authService\.resumeSession\(/); }); +test('локальное хранилище ключей имеет fallback при сбое IndexedDB', () => { + const vault = fs.readFileSync(new URL('../js/services/key-vault.js', import.meta.url), 'utf8'); + assert.match(vault, /memorySecrets\.set\(normalizedLogin, row\)/); + assert.match(vault, /writeFallbackRow\(FALLBACK_SECRETS_KEY, normalizedLogin, row\)/); + assert.match(vault, /memorySessions\.set\(normalizedLogin, row\)/); + assert.match(vault, /writeFallbackRow\(FALLBACK_SESSIONS_KEY, normalizedLogin, row\)/); +}); + // Проверяем выполнение настоящей функции с изолированными зависимостями: // ошибка HEADER не должна прерывать завершение регистрации. async function simulateCompletion({ headerFails = false } = {}) {