Page MenuHomePhabricator
Differential D12770

[Tunnelbroker][lib] add FCM notif message type
ClosedPublic
Actions

Authored by kamil on Jul 16 2024, 1:51 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 6:01 AM
Unknown Object (File)
Mar 5 2025, 12:42 AM
Unknown Object (File)
Mar 5 2025, 12:42 AM
Unknown Object (File)
Mar 5 2025, 12:42 AM
Unknown Object (File)
Mar 5 2025, 12:42 AM
Unknown Object (File)
Mar 5 2025, 12:42 AM
Unknown Object (File)
Jan 15 2025, 11:02 AM
Unknown Object (File)
Jan 5 2025, 6:08 PM
View All 66 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
marcin
Commits
rCOMMf614a5cf3713: [Tunnelbroker][lib] add FCM notif message type
Summary

Message send from client to send notif using FCM service.

Depends on D12769

Test Plan

Tested in D12772.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jul 16 2024, 1:51 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 16 2024, 1:51 AM
kamil added a child revision: D12771: [Tunnelbroker] implement sending FCM notifs by client.Jul 16 2024, 1:53 AM
Harbormaster completed remote builds in B30365: Diff 42327.Jul 16 2024, 2:07 AM
kamil published this revision for review.Jul 16 2024, 2:45 AM
kamil added inline comments.
lib/types/tunnelbroker/notif-types.js
16

This could take only HIGH and NORMAL values but wanted to make it in-sync with Rust types

kamil edited the test plan for this revision. (Show Details)Jul 16 2024, 2:48 AM
ashoat added inline comments.Jul 16 2024, 6:42 AM
lib/types/tunnelbroker/notif-types.js
16

I'd rather make it more specific in JS, if Rust doesn't support the specificity

bartek added inline comments.Jul 18 2024, 7:25 AM
lib/types/tunnelbroker/notif-types.js
16

In Rust it's technically a string, but parsing will fail (or at least ignore, in D12767 it's set to None) if it's not one of the above, so I'd use +priority: 'NORMAL' | 'HIGH'. here

kamil added inline comments.Jul 18 2024, 8:18 AM
lib/types/tunnelbroker/notif-types.js
16

makes sense, I'll update this to +priority: 'NORMAL' | 'HIGH'. before landing

kamil updated this revision to Diff 42530.Jul 19 2024, 5:32 AM

improve type

bartek accepted this revision.Jul 19 2024, 5:38 AM
This revision is now accepted and ready to land.Jul 19 2024, 5:38 AM
marcin accepted this revision.Jul 19 2024, 5:40 AM
This revision was landed with ongoing or failed builds.Jul 19 2024, 5:44 AM
Closed by commit rCOMMf614a5cf3713: [Tunnelbroker][lib] add FCM notif message type (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMf614a5cf3713: [Tunnelbroker][lib] add FCM notif message type.
Harbormaster completed remote builds in B30508: Diff 42530.Jul 19 2024, 5:48 AM

Revision Contents
Changeset List

PathSize
lib/
types/
tunnelbroker/
8 lines
shared/
tunnelbroker_messages/
src/
messages/
1 line
15 lines

Diff 42327

View Options

lib/types/tunnelbroker/notif-types.js

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js'; import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityKeysBlob, type IdentityKeysBlob,
identityKeysBlobValidator, identityKeysBlobValidator,
type OneTimeKeysResultValues, type OneTimeKeysResultValues,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import { import {
type SignedDeviceList, type SignedDeviceList,
signedDeviceListHistoryValidator, signedDeviceListHistoryValidator,
type SignedMessage,
type DeviceOlmOutboundKeys, type DeviceOlmOutboundKeys,
deviceOlmOutboundKeysValidator, deviceOlmOutboundKeysValidator,
type IdentityServiceClient, type IdentityServiceClient,
type UserDevicesOlmOutboundKeys, type UserDevicesOlmOutboundKeys,
type UserAuthMetadata, type UserAuthMetadata,
ONE_TIME_KEYS_NUMBER, ONE_TIME_KEYS_NUMBER,
identityAuthResultValidator, identityAuthResultValidator,
type DeviceOlmInboundKeys, type DeviceOlmInboundKeys,
▲ Show 20 Lines • Show All 422 Lines • ▼ Show 20 Lines () => ({
await commCoreModule.setCommServicesAuthMetadata( await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID, validatedResult.userID,
primaryIdentityPublicKeys.ed25519, primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken, validatedResult.accessToken,
); );
return validatedResult; return validatedResult;
}, },
uploadKeysForRegisteredDeviceAndLogIn: async (
userID: string,
nonceChallengeResponse: SignedMessage,
) => {
await commCoreModule.initializeCryptoAccount();
const [
{ blobPayload, signature, primaryIdentityPublicKeys },
{ contentOneTimeKeys, notificationsOneTimeKeys },
prekeys,
] = await Promise.all([
commCoreModule.getUserPublicKey(),
commCoreModule.getOneTimeKeys(ONE_TIME_KEYS_NUMBER),
commCoreModule.validateAndGetPrekeys(),
]);
const challengeResponse = JSON.stringify(nonceChallengeResponse);
const registrationResult =
await commRustModule.uploadSecondaryDeviceKeysAndLogIn(
userID,
challengeResponse,
blobPayload,
signature,
prekeys.contentPrekey,
prekeys.contentPrekeySignature,
prekeys.notifPrekey,
prekeys.notifPrekeySignature,
getOneTimeKeyValues(contentOneTimeKeys),
getOneTimeKeyValues(notificationsOneTimeKeys),
);
const { accessToken: token } = JSON.parse(registrationResult);
const identityAuthResult = { accessToken: token, userID, username: '' };
const validatedResult = assertWithValidator(
identityAuthResult,
identityAuthResultValidator,
);
await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID,
primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken,
);
return validatedResult;
},
generateNonce: commRustModule.generateNonce, generateNonce: commRustModule.generateNonce,
getDeviceListHistoryForUser: async ( getDeviceListHistoryForUser: async (
userID: string, userID: string,
sinceTimestamp?: number, sinceTimestamp?: number,
) => { ) => {
const { const {
deviceID: authDeviceID, deviceID: authDeviceID,
userID: authUserID, userID: authUserID,
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/src/messages/mod.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js'; import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityKeysBlob, type IdentityKeysBlob,
identityKeysBlobValidator, identityKeysBlobValidator,
type OneTimeKeysResultValues, type OneTimeKeysResultValues,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import { import {
type SignedDeviceList, type SignedDeviceList,
signedDeviceListHistoryValidator, signedDeviceListHistoryValidator,
type SignedMessage,
type DeviceOlmOutboundKeys, type DeviceOlmOutboundKeys,
deviceOlmOutboundKeysValidator, deviceOlmOutboundKeysValidator,
type IdentityServiceClient, type IdentityServiceClient,
type UserDevicesOlmOutboundKeys, type UserDevicesOlmOutboundKeys,
type UserAuthMetadata, type UserAuthMetadata,
ONE_TIME_KEYS_NUMBER, ONE_TIME_KEYS_NUMBER,
identityAuthResultValidator, identityAuthResultValidator,
type DeviceOlmInboundKeys, type DeviceOlmInboundKeys,
▲ Show 20 Lines • Show All 422 Lines • ▼ Show 20 Lines () => ({
await commCoreModule.setCommServicesAuthMetadata( await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID, validatedResult.userID,
primaryIdentityPublicKeys.ed25519, primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken, validatedResult.accessToken,
); );
return validatedResult; return validatedResult;
}, },
uploadKeysForRegisteredDeviceAndLogIn: async (
userID: string,
nonceChallengeResponse: SignedMessage,
) => {
await commCoreModule.initializeCryptoAccount();
const [
{ blobPayload, signature, primaryIdentityPublicKeys },
{ contentOneTimeKeys, notificationsOneTimeKeys },
prekeys,
] = await Promise.all([
commCoreModule.getUserPublicKey(),
commCoreModule.getOneTimeKeys(ONE_TIME_KEYS_NUMBER),
commCoreModule.validateAndGetPrekeys(),
]);
const challengeResponse = JSON.stringify(nonceChallengeResponse);
const registrationResult =
await commRustModule.uploadSecondaryDeviceKeysAndLogIn(
userID,
challengeResponse,
blobPayload,
signature,
prekeys.contentPrekey,
prekeys.contentPrekeySignature,
prekeys.notifPrekey,
prekeys.notifPrekeySignature,
getOneTimeKeyValues(contentOneTimeKeys),
getOneTimeKeyValues(notificationsOneTimeKeys),
);
const { accessToken: token } = JSON.parse(registrationResult);
const identityAuthResult = { accessToken: token, userID, username: '' };
const validatedResult = assertWithValidator(
identityAuthResult,
identityAuthResultValidator,
);
await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID,
primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken,
);
return validatedResult;
},
generateNonce: commRustModule.generateNonce, generateNonce: commRustModule.generateNonce,
getDeviceListHistoryForUser: async ( getDeviceListHistoryForUser: async (
userID: string, userID: string,
sinceTimestamp?: number, sinceTimestamp?: number,
) => { ) => {
const { const {
deviceID: authDeviceID, deviceID: authDeviceID,
userID: authUserID, userID: authUserID,
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/src/messages/notif.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js'; import { getOneTimeKeyValues } from 'lib/shared/crypto-utils.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { import {
type IdentityKeysBlob, type IdentityKeysBlob,
identityKeysBlobValidator, identityKeysBlobValidator,
type OneTimeKeysResultValues, type OneTimeKeysResultValues,
} from 'lib/types/crypto-types.js'; } from 'lib/types/crypto-types.js';
import { import {
type SignedDeviceList, type SignedDeviceList,
signedDeviceListHistoryValidator, signedDeviceListHistoryValidator,
type SignedMessage,
type DeviceOlmOutboundKeys, type DeviceOlmOutboundKeys,
deviceOlmOutboundKeysValidator, deviceOlmOutboundKeysValidator,
type IdentityServiceClient, type IdentityServiceClient,
type UserDevicesOlmOutboundKeys, type UserDevicesOlmOutboundKeys,
type UserAuthMetadata, type UserAuthMetadata,
ONE_TIME_KEYS_NUMBER, ONE_TIME_KEYS_NUMBER,
identityAuthResultValidator, identityAuthResultValidator,
type DeviceOlmInboundKeys, type DeviceOlmInboundKeys,
▲ Show 20 Lines • Show All 422 Lines • ▼ Show 20 Lines () => ({
await commCoreModule.setCommServicesAuthMetadata( await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID, validatedResult.userID,
primaryIdentityPublicKeys.ed25519, primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken, validatedResult.accessToken,
); );
return validatedResult; return validatedResult;
}, },
uploadKeysForRegisteredDeviceAndLogIn: async (
userID: string,
nonceChallengeResponse: SignedMessage,
) => {
await commCoreModule.initializeCryptoAccount();
const [
{ blobPayload, signature, primaryIdentityPublicKeys },
{ contentOneTimeKeys, notificationsOneTimeKeys },
prekeys,
] = await Promise.all([
commCoreModule.getUserPublicKey(),
commCoreModule.getOneTimeKeys(ONE_TIME_KEYS_NUMBER),
commCoreModule.validateAndGetPrekeys(),
]);
const challengeResponse = JSON.stringify(nonceChallengeResponse);
const registrationResult =
await commRustModule.uploadSecondaryDeviceKeysAndLogIn(
userID,
challengeResponse,
blobPayload,
signature,
prekeys.contentPrekey,
prekeys.contentPrekeySignature,
prekeys.notifPrekey,
prekeys.notifPrekeySignature,
getOneTimeKeyValues(contentOneTimeKeys),
getOneTimeKeyValues(notificationsOneTimeKeys),
);
const { accessToken: token } = JSON.parse(registrationResult);
const identityAuthResult = { accessToken: token, userID, username: '' };
const validatedResult = assertWithValidator(
identityAuthResult,
identityAuthResultValidator,
);
await commCoreModule.setCommServicesAuthMetadata(
validatedResult.userID,
primaryIdentityPublicKeys.ed25519,
validatedResult.accessToken,
);
return validatedResult;
},
generateNonce: commRustModule.generateNonce, generateNonce: commRustModule.generateNonce,
getDeviceListHistoryForUser: async ( getDeviceListHistoryForUser: async (
userID: string, userID: string,
sinceTimestamp?: number, sinceTimestamp?: number,
) => { ) => {
const { const {
deviceID: authDeviceID, deviceID: authDeviceID,
userID: authUserID, userID: authUserID,
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines