mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Erase storage service state on key change

Browse source
This commit is contained in:
Fedor Indutny 2022-02-02 13:15:39 -08:00 • committed by GitHub
parent 4de30786ec
commit bbe56e0811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/background.ts
View file

@ -3539,9 +3539,21 @@ export async function startApp(): Promise<void> {
} }
if (storageServiceKey) { if (storageServiceKey) {
log.info('onKeysSync: received keys');
const storageServiceKeyBase64 = Bytes.toBase64(storageServiceKey); const storageServiceKeyBase64 = Bytes.toBase64(storageServiceKey);
window.storage.put('storageKey', storageServiceKeyBase64); if (window.storage.get('storageKey') === storageServiceKeyBase64) {
log.info(
"onKeysSync: storage service key didn't change, " +
'fetching manifest anyway'
);
} else {
log.info(
'onKeysSync: updated storage service key, erasing state and fetching'
);
await window.storage.put('storageKey', storageServiceKeyBase64);
await window.Signal.Services.eraseAllStorageServiceState({
keepUnknownFields: true,
});
}
await window.Signal.Services.runStorageServiceSyncJob(); await window.Signal.Services.runStorageServiceSyncJob();
} }

8
ts/services/storage.ts
View file

@ -1195,11 +1195,15 @@ export function enableStorageService(): void {
// Note: this function is meant to be called before ConversationController is hydrated. // Note: this function is meant to be called before ConversationController is hydrated.
// It goes directly to the database, so in-memory conversations will be out of date. // It goes directly to the database, so in-memory conversations will be out of date.
export async function eraseAllStorageServiceState(): Promise<void> { export async function eraseAllStorageServiceState({
keepUnknownFields = false,
}: { keepUnknownFields?: boolean } = {}): Promise<void> {
log.info('storageService.eraseAllStorageServiceState: starting...'); log.info('storageService.eraseAllStorageServiceState: starting...');
await Promise.all([ await Promise.all([
window.storage.remove('manifestVersion'), window.storage.remove('manifestVersion'),
window.storage.remove('storage-service-unknown-records'), keepUnknownFields
? Promise.resolve()
: window.storage.remove('storage-service-unknown-records'),
window.storage.remove('storageCredentials'), window.storage.remove('storageCredentials'),
]); ]);
await eraseStorageServiceStateFromConversations(); await eraseStorageServiceStateFromConversations();

4
ts/window.d.ts vendored
View file

@ -285,7 +285,9 @@ declare global {
Services: { Services: {
calling: CallingClass; calling: CallingClass;
enableStorageService: () => boolean; enableStorageService: () => boolean;
eraseAllStorageServiceState: () => Promise<void>; eraseAllStorageServiceState: (options?: {
keepUnknownFields?: boolean;
}) => Promise<void>;
initializeGroupCredentialFetcher: () => void; initializeGroupCredentialFetcher: () => void;
initializeNetworkObserver: (network: ReduxActions['network']) => void; initializeNetworkObserver: (network: ReduxActions['network']) => void;
initializeUpdateListener: (updates: ReduxActions['updates']) => void; initializeUpdateListener: (updates: ReduxActions['updates']) => void;