Page MenuHomePhabricator
Differential D9969

[native] Compute backup key for u8 slice
ClosedPublic
Actions

Authored by michal on Nov 24 2023, 8:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 11:26 AM
Unknown Object (File)
Feb 27 2025, 4:19 PM
Unknown Object (File)
Feb 14 2025, 2:02 PM
Unknown Object (File)
Feb 14 2025, 1:56 PM
Unknown Object (File)
Feb 14 2025, 11:12 AM
Unknown Object (File)
Jan 31 2025, 2:08 PM
Unknown Object (File)
Jan 31 2025, 2:08 PM
Unknown Object (File)
Jan 31 2025, 2:02 PM
View All 61 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
kamil
Commits
rCOMMe76d33b8a73b: [native] Compute backup key for u8 slice
Summary

ENG-5344

The current backup key generation function using argon2 library expects &str, as the data is passed from javascript. This diffs adds an additional variant that uses u8 slices as Rust code operates on bytes. Additionally I added std feature to argon2 in this diff so it's errors implement std::error::Error. This means we can use ? operator with Box<dyn Error> in later diffs.

Test Plan

Run the provided tests.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
6 lines
src/
23 lines
8 lines

Diff 33593

View Options

native/native_rust_library/Cargo.toml

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

native/native_rust_library/src/argon2_tools.rs

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

native/native_rust_library/src/lib.rs

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines