Page MenuHomePhabricator
Differential D14088

[identity] Verify new flow migration device list update
ClosedPublic
Actions

Authored by bartek on Dec 6 2024, 1:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 13, 4:24 PM
Unknown Object (File)
Thu, Mar 13, 4:24 PM
Unknown Object (File)
Thu, Mar 13, 4:24 PM
Unknown Object (File)
Sun, Mar 9, 4:25 AM
Unknown Object (File)
Sun, Mar 9, 4:24 AM
Unknown Object (File)
Sat, Mar 8, 5:51 PM
Unknown Object (File)
Thu, Mar 6, 5:10 PM
Unknown Object (File)
Thu, Mar 6, 4:37 PM
View All 79 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
Commits
rCOMMefd40b9457f6: [identity] Verify new flow migration device list update
Summary

Address ENG-9694

  • For old flows: Should allow reordering primary device under the following conditions:
    • Previous device list was unsigned.
    • Reorder only makes the calling device primary (only one swap, no more changes).
  • Otherwise, if previous device list was signed, it should act as before

Depends on D14087

Test Plan
  • Commtest
  • Manual testing during development of device list migration handler

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Dec 6 2024, 1:35 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptDec 6 2024, 1:35 AM
Harbormaster failed remote builds in B32943: Diff 46227!Dec 6 2024, 2:00 AM
bartek updated this revision to Diff 46457.Dec 15 2024, 10:32 PM

Rebase

Harbormaster failed remote builds in B33116: Diff 46457!Dec 15 2024, 10:57 PM
bartek updated this revision to Diff 46459.Dec 16 2024, 3:56 AM

Fix missing test

Harbormaster completed remote builds in B33118: Diff 46459.Dec 16 2024, 4:13 AM
bartek published this revision for review.Dec 16 2024, 4:24 AM
bartek added inline comments.
services/commtest/tests/identity_device_list_tests.rs
202–209 ↗(On Diff #46459)

Now all updates after migration need to be signed

bartek edited the test plan for this revision. (Show Details)Dec 16 2024, 6:04 AM
kamil accepted this revision.Dec 16 2024, 8:33 AM
This revision is now accepted and ready to land.Dec 16 2024, 8:33 AM
Closed by commit rCOMMefd40b9457f6: [identity] Verify new flow migration device list update (authored by bartek). · Explain WhyDec 19 2024, 1:55 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMefd40b9457f6: [identity] Verify new flow migration device list update.

Revision Contents
Changeset List

PathSize
services/
commtest/
tests/
59 lines
identity/
src/
16 lines
grpc_services/
51 lines

Diff 46574

View Options

services/commtest/tests/identity_device_list_tests.rs

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

services/identity/src/device_list.rs

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

services/identity/src/grpc_services/authenticated.rs

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };