Page MenuHomePhabricator
Differential D8885

[client-backup] implement Rust function for computing `BackupKey`
ClosedPublic
Actions

Authored by kamil on Aug 21 2023, 4:47 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 11:47 PM
Unknown Object (File)
Sun, Mar 16, 11:47 PM
Unknown Object (File)
Sun, Mar 16, 11:46 PM
Unknown Object (File)
Wed, Mar 12, 3:16 PM
Unknown Object (File)
Fri, Mar 7, 9:52 AM
Unknown Object (File)
Fri, Mar 7, 9:49 AM
Unknown Object (File)
Wed, Feb 26, 11:09 AM
Unknown Object (File)
Tue, Feb 25, 12:56 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
marcin
Commits
rCOMM0064989dafdd: [client-backup] implement Rust function for computing `BackupKey`
Summary

ENG-4512.

Docs.

Function to compute (KDF) for hashing a password with BackupID.

Depends on D8884

Test Plan

cargo test in native_rust_library

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Aug 21 2023, 4:47 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 21 2023, 4:47 AM
kamil added a child revision: D8886: [client-backup] implement C++ function for computing `BackupKey`.Aug 21 2023, 4:57 AM
Harbormaster completed remote builds in B21941: Diff 30133.Aug 21 2023, 5:04 AM
kamil published this revision for review.Aug 21 2023, 6:35 AM
marcin accepted this revision.Aug 22 2023, 1:43 AM

Accepting but I am not Rust expert so try to get @michal acceptance before landing.

This revision is now accepted and ready to land.Aug 22 2023, 1:43 AM
michal accepted this revision.Aug 22 2023, 2:37 AM

LGTM on the rust side

kamil mentioned this in D8998: [client-backup] add JS function to compute BackupKey based on user credentials.Aug 29 2023, 2:34 AM
kamil updated this revision to Diff 30585.Aug 30 2023, 10:35 AM

lint

Harbormaster completed remote builds in B22276: Diff 30585.Aug 30 2023, 10:52 AM
Closed by commit rCOMM0064989dafdd: [client-backup] implement Rust function for computing `BackupKey` (authored by kamil). · Explain WhyAug 30 2023, 10:54 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM0064989dafdd: [client-backup] implement Rust function for computing `BackupKey`.
kamil mentioned this in rCOMM9fe2e32bfdc4: [client-backup] add JS function to compute BackupKey based on user credentials.Aug 31 2023, 1:53 PM

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
src/
65 lines
6 lines

Diff 30587

View Options

native/native_rust_library/src/argon2_tools.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines
View Options

native/native_rust_library/src/lib.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines