SHA256
Добавить fallback хранения ключей при сбое IndexedDB
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user