Page MenuHomePhabricator
Differential D11077

[web/native] Clear device specific data after restoration
AbandonedPublic
Actions

Authored by michal on Feb 14 2024, 7:30 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 3:11 AM
Unknown Object (File)
Sun, Apr 20, 2:43 PM
Unknown Object (File)
Sat, Apr 19, 11:31 AM
Unknown Object (File)
Thu, Apr 17, 9:11 PM
Unknown Object (File)
Mon, Apr 14, 12:46 PM
Unknown Object (File)
Wed, Apr 9, 12:44 AM
Unknown Object (File)
Tue, Apr 8, 9:00 PM
Unknown Object (File)
Sat, Mar 29, 4:47 AM
View All 66 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
bartek
kamil
Summary

After restoration we should clear device specific data from the KeyserverStore. It should be filled in by the new device during primary device restoration/ secondary device login.

Depends on D11074

Test Plan

On web and mobile:

  • Restore from backup
  • Restart/ reload the app
  • Check the testing alert introduced in D10787, see if the data from the database has data removed

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Feb 14 2024, 7:30 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 14 2024, 7:31 AM
Harbormaster completed remote builds in B26835: Diff 37078.Feb 14 2024, 7:46 AM
michal requested review of this revision.Feb 14 2024, 7:46 AM
ashoat added a comment.Feb 14 2024, 11:11 AM

Let me know if I'm missing something, but if there's some data we don't need in the backup, shouldn't we prevent it from being included, instead of clearing it after restoration?

marcin added a comment.EditedFeb 15 2024, 3:15 AM
In D11077#319547, @ashoat wrote:

Let me know if I'm missing something, but if there's some data we don't need in the backup, shouldn't we prevent it from being included, instead of clearing it after restoration?

The reason for that is probably due to my concerns that I outlined in D10780. I think that you are right - we should avoid backing those data up instead of removing them after restoration. The problem is that those data are "invisible" in C++ since for KeyserverStore we don't have a C++ db entity like for MessageStore but we just store a JSON string under some id key instead. We could do parsing with folly but it is inefficient, buggy and shows weakness of db design.
The best solution is to migrate db and have a C++ struct for KeyserverStore matching the JS type. With this we would be able remove device specific data from backup with simple SQL query. But the fastest solution to ship is to remove such data in JS after restoration.

marcin added a comment.Feb 15 2024, 3:18 AM

Is there a codepath that will lead to populating data that we remove here with accurate data?

ashoat added a comment.Feb 15 2024, 7:24 AM

I'm not entirely opposed to parsing the JSON in C++ via Folly. Seems better than storing the data only to throw it away

michal abandoned this revision.Feb 16 2024, 4:13 AM

In that case, I will abandon this diff as we will go with a different approach.

Revision Contents
Changeset List

PathSize
lib/
ops/
25 lines
native/
backup/
6 lines
web/
database/
worker/
7 lines
6 lines

Diff 37078

View Options

lib/ops/keyserver-store-ops.js

Show All 13 Lines
import type { ClientReportCreationRequest } from './report-types.js'; import type { ClientReportCreationRequest } from './report-types.js';
import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js'; import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js';
import type { UserInfos } from './user-types.js'; import type { UserInfos } from './user-types.js';
import type { import type {
ClientDBCommunityInfo, ClientDBCommunityInfo,
ClientDBCommunityStoreOperation, ClientDBCommunityStoreOperation,
CommunityStoreOperation, CommunityStoreOperation,
} from '../ops/community-store-ops.js'; } from '../ops/community-store-ops.js';
import type { ClientDBIntegrityThreadHash } from '../ops/integrity-store-ops.js'; import type {
ClientDBIntegrityThreadHash,
ClientDBIntegrityStoreOperation,
} from '../ops/integrity-store-ops.js';
import type { import type {
ClientDBKeyserverInfo, ClientDBKeyserverInfo,
ClientDBKeyserverStoreOperation, ClientDBKeyserverStoreOperation,
KeyserverStoreOperation, KeyserverStoreOperation,
} from '../ops/keyserver-store-ops.js'; } from '../ops/keyserver-store-ops.js';
import type { import type {
ClientDBMessageStoreOperation, ClientDBMessageStoreOperation,
MessageStoreOperation, MessageStoreOperation,
Show All 24 Lines
export type ClientDBStoreOperations = { export type ClientDBStoreOperations = {
+draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>, +draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>,
+threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>, +threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>,
+messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>, +messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>,
+reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>, +reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>,
+keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>, +keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>,
+communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>, +communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>,
+integrityStoreOperations?: $ReadOnlyArray<ClientDBIntegrityStoreOperation>,
}; };
export type ClientDBStore = { export type ClientDBStore = {
+messages: $ReadOnlyArray<ClientDBMessageInfo>, +messages: $ReadOnlyArray<ClientDBMessageInfo>,
+drafts: $ReadOnlyArray<ClientDBDraftInfo>, +drafts: $ReadOnlyArray<ClientDBDraftInfo>,
+threads: $ReadOnlyArray<ClientDBThreadInfo>, +threads: $ReadOnlyArray<ClientDBThreadInfo>,
+messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>, +messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>,
+reports: $ReadOnlyArray<ClientDBReport>, +reports: $ReadOnlyArray<ClientDBReport>,
Show All 17 Lines
View Options

native/backup/use-client-backup.js

Show All 13 Lines
import type { ClientReportCreationRequest } from './report-types.js'; import type { ClientReportCreationRequest } from './report-types.js';
import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js'; import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js';
import type { UserInfos } from './user-types.js'; import type { UserInfos } from './user-types.js';
import type { import type {
ClientDBCommunityInfo, ClientDBCommunityInfo,
ClientDBCommunityStoreOperation, ClientDBCommunityStoreOperation,
CommunityStoreOperation, CommunityStoreOperation,
} from '../ops/community-store-ops.js'; } from '../ops/community-store-ops.js';
import type { ClientDBIntegrityThreadHash } from '../ops/integrity-store-ops.js'; import type {
ClientDBIntegrityThreadHash,
ClientDBIntegrityStoreOperation,
} from '../ops/integrity-store-ops.js';
import type { import type {
ClientDBKeyserverInfo, ClientDBKeyserverInfo,
ClientDBKeyserverStoreOperation, ClientDBKeyserverStoreOperation,
KeyserverStoreOperation, KeyserverStoreOperation,
} from '../ops/keyserver-store-ops.js'; } from '../ops/keyserver-store-ops.js';
import type { import type {
ClientDBMessageStoreOperation, ClientDBMessageStoreOperation,
MessageStoreOperation, MessageStoreOperation,
Show All 24 Lines
export type ClientDBStoreOperations = { export type ClientDBStoreOperations = {
+draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>, +draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>,
+threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>, +threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>,
+messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>, +messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>,
+reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>, +reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>,
+keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>, +keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>,
+communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>, +communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>,
+integrityStoreOperations?: $ReadOnlyArray<ClientDBIntegrityStoreOperation>,
}; };
export type ClientDBStore = { export type ClientDBStore = {
+messages: $ReadOnlyArray<ClientDBMessageInfo>, +messages: $ReadOnlyArray<ClientDBMessageInfo>,
+drafts: $ReadOnlyArray<ClientDBDraftInfo>, +drafts: $ReadOnlyArray<ClientDBDraftInfo>,
+threads: $ReadOnlyArray<ClientDBThreadInfo>, +threads: $ReadOnlyArray<ClientDBThreadInfo>,
+messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>, +messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>,
+reports: $ReadOnlyArray<ClientDBReport>, +reports: $ReadOnlyArray<ClientDBReport>,
Show All 17 Lines
View Options

web/database/worker/backup.js

Show All 13 Lines
import type { ClientReportCreationRequest } from './report-types.js'; import type { ClientReportCreationRequest } from './report-types.js';
import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js'; import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js';
import type { UserInfos } from './user-types.js'; import type { UserInfos } from './user-types.js';
import type { import type {
ClientDBCommunityInfo, ClientDBCommunityInfo,
ClientDBCommunityStoreOperation, ClientDBCommunityStoreOperation,
CommunityStoreOperation, CommunityStoreOperation,
} from '../ops/community-store-ops.js'; } from '../ops/community-store-ops.js';
import type { ClientDBIntegrityThreadHash } from '../ops/integrity-store-ops.js'; import type {
ClientDBIntegrityThreadHash,
ClientDBIntegrityStoreOperation,
} from '../ops/integrity-store-ops.js';
import type { import type {
ClientDBKeyserverInfo, ClientDBKeyserverInfo,
ClientDBKeyserverStoreOperation, ClientDBKeyserverStoreOperation,
KeyserverStoreOperation, KeyserverStoreOperation,
} from '../ops/keyserver-store-ops.js'; } from '../ops/keyserver-store-ops.js';
import type { import type {
ClientDBMessageStoreOperation, ClientDBMessageStoreOperation,
MessageStoreOperation, MessageStoreOperation,
Show All 24 Lines
export type ClientDBStoreOperations = { export type ClientDBStoreOperations = {
+draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>, +draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>,
+threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>, +threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>,
+messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>, +messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>,
+reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>, +reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>,
+keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>, +keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>,
+communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>, +communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>,
+integrityStoreOperations?: $ReadOnlyArray<ClientDBIntegrityStoreOperation>,
}; };
export type ClientDBStore = { export type ClientDBStore = {
+messages: $ReadOnlyArray<ClientDBMessageInfo>, +messages: $ReadOnlyArray<ClientDBMessageInfo>,
+drafts: $ReadOnlyArray<ClientDBDraftInfo>, +drafts: $ReadOnlyArray<ClientDBDraftInfo>,
+threads: $ReadOnlyArray<ClientDBThreadInfo>, +threads: $ReadOnlyArray<ClientDBThreadInfo>,
+messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>, +messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>,
+reports: $ReadOnlyArray<ClientDBReport>, +reports: $ReadOnlyArray<ClientDBReport>,
Show All 17 Lines
View Options

web/database/worker/process-operations.js

Show All 13 Lines
import type { ClientReportCreationRequest } from './report-types.js'; import type { ClientReportCreationRequest } from './report-types.js';
import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js'; import type { ClientDBThreadInfo, ThreadStore } from './thread-types.js';
import type { UserInfos } from './user-types.js'; import type { UserInfos } from './user-types.js';
import type { import type {
ClientDBCommunityInfo, ClientDBCommunityInfo,
ClientDBCommunityStoreOperation, ClientDBCommunityStoreOperation,
CommunityStoreOperation, CommunityStoreOperation,
} from '../ops/community-store-ops.js'; } from '../ops/community-store-ops.js';
import type { ClientDBIntegrityThreadHash } from '../ops/integrity-store-ops.js'; import type {
ClientDBIntegrityThreadHash,
ClientDBIntegrityStoreOperation,
} from '../ops/integrity-store-ops.js';
import type { import type {
ClientDBKeyserverInfo, ClientDBKeyserverInfo,
ClientDBKeyserverStoreOperation, ClientDBKeyserverStoreOperation,
KeyserverStoreOperation, KeyserverStoreOperation,
} from '../ops/keyserver-store-ops.js'; } from '../ops/keyserver-store-ops.js';
import type { import type {
ClientDBMessageStoreOperation, ClientDBMessageStoreOperation,
MessageStoreOperation, MessageStoreOperation,
Show All 24 Lines
export type ClientDBStoreOperations = { export type ClientDBStoreOperations = {
+draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>, +draftStoreOperations?: $ReadOnlyArray<ClientDBDraftStoreOperation>,
+threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>, +threadStoreOperations?: $ReadOnlyArray<ClientDBThreadStoreOperation>,
+messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>, +messageStoreOperations?: $ReadOnlyArray<ClientDBMessageStoreOperation>,
+reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>, +reportStoreOperations?: $ReadOnlyArray<ClientDBReportStoreOperation>,
+keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>, +keyserverStoreOperations?: $ReadOnlyArray<ClientDBKeyserverStoreOperation>,
+communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>, +communityStoreOperations?: $ReadOnlyArray<ClientDBCommunityStoreOperation>,
+integrityStoreOperations?: $ReadOnlyArray<ClientDBIntegrityStoreOperation>,
}; };
export type ClientDBStore = { export type ClientDBStore = {
+messages: $ReadOnlyArray<ClientDBMessageInfo>, +messages: $ReadOnlyArray<ClientDBMessageInfo>,
+drafts: $ReadOnlyArray<ClientDBDraftInfo>, +drafts: $ReadOnlyArray<ClientDBDraftInfo>,
+threads: $ReadOnlyArray<ClientDBThreadInfo>, +threads: $ReadOnlyArray<ClientDBThreadInfo>,
+messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>, +messageStoreThreads: $ReadOnlyArray<ClientDBThreadMessageInfo>,
+reports: $ReadOnlyArray<ClientDBReport>, +reports: $ReadOnlyArray<ClientDBReport>,
Show All 17 Lines