Page MenuHomePhabricator
Differential D9968

[keyserver] Fetch invite link blob holder
ClosedPublic
Actions

Authored by tomek on Nov 24 2023, 8:14 AM.
Tags
None
Referenced Files
F5926861: D9968.id37081.diff
Fri, Apr 18, 12:33 AM
F5925698: D9968.diff
Fri, Apr 18, 12:10 AM
F5916545: D9968.id33592.diff
Thu, Apr 17, 9:09 PM
F5909870: D9968.diff
Thu, Apr 17, 3:37 PM
Unknown Object (File)
Wed, Apr 16, 4:19 PM
Unknown Object (File)
Wed, Apr 9, 1:00 AM
Unknown Object (File)
Tue, Apr 8, 10:27 PM
Unknown Object (File)
Tue, Apr 8, 9:41 PM
View All Files
Subscribers
ashoat

Details

Reviewers
michal
bartek
rohan
Commits
rCOMMf2fb42fd31c9: [keyserver] Fetch invite link blob holder
Summary

Update the logic where we fetch invite links to also get the holder. We don't need to show this to a client and we're filtering this field out for them.

Depends on D9966

Test Plan

Manually add a holder to a link and check if it is fetched correctly.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
7 lines
responders/
5 lines
6 lines
lib/
types/
5 lines

Diff 37081

View Options

keyserver/src/fetchers/link-fetchers.js

// @flow // @flow
import type { ResponseFailure } from '@parse/node-apn'; import type { ResponseFailure } from '@parse/node-apn';
import type { FirebaseApp, FirebaseError } from 'firebase-admin'; import type { FirebaseApp, FirebaseError } from 'firebase-admin';
import invariant from 'invariant'; import invariant from 'invariant';
import nodeFetch from 'node-fetch'; import nodeFetch from 'node-fetch';
import type { Response } from 'node-fetch'; import type { Response } from 'node-fetch';
import uuid from 'uuid';
import webpush from 'web-push'; import webpush from 'web-push';
import type { PlatformDetails } from 'lib/types/device-types.js'; import type { PlatformDetails } from 'lib/types/device-types.js';
import { threadSubscriptions } from 'lib/types/subscription-types.js'; import { threadSubscriptions } from 'lib/types/subscription-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { encryptBlobPayload } from './crypto.js';
import { import {
getAPNPushProfileForCodeVersion, getAPNPushProfileForCodeVersion,
getFCMPushProfileForCodeVersion, getFCMPushProfileForCodeVersion,
getAPNProvider, getAPNProvider,
getFCMProvider, getFCMProvider,
ensureWebPushInitialized, ensureWebPushInitialized,
getWNSToken, getWNSToken,
} from './providers.js'; } from './providers.js';
▲ Show 20 Lines • Show All 362 Lines • ▼ Show 20 Lines
async function blobServiceUpload(payload: string): Promise< async function blobServiceUpload(payload: string): Promise<
| { | {
+blobHash: string, +blobHash: string,
+encryptionKey: string, +encryptionKey: string,
} }
| { +blobUploadError: string }, | { +blobUploadError: string },
> { > {
return upload(payload); const blobHolder = uuid.v4();
try {
const { encryptionKey, encryptedPayload, encryptedPayloadHash } =
await encryptBlobPayload(payload);
await upload(encryptedPayload, encryptedPayloadHash, blobHolder);
return {
blobHash: encryptedPayloadHash,
encryptionKey,
};
} catch (e) {
return {
blobUploadError: e.message,
};
}
} }
export { export {
apnPush, apnPush,
blobServiceUpload, blobServiceUpload,
fcmPush, fcmPush,
webPush, webPush,
wnsPush, wnsPush,
getUnreadCounts, getUnreadCounts,
apnMaxNotificationPayloadByteSize, apnMaxNotificationPayloadByteSize,
fcmMaxNotificationPayloadByteSize, fcmMaxNotificationPayloadByteSize,
wnsMaxNotificationPayloadByteSize, wnsMaxNotificationPayloadByteSize,
}; };
View Options

keyserver/src/responders/link-responders.js

// @flow // @flow
import type { ResponseFailure } from '@parse/node-apn'; import type { ResponseFailure } from '@parse/node-apn';
import type { FirebaseApp, FirebaseError } from 'firebase-admin'; import type { FirebaseApp, FirebaseError } from 'firebase-admin';
import invariant from 'invariant'; import invariant from 'invariant';
import nodeFetch from 'node-fetch'; import nodeFetch from 'node-fetch';
import type { Response } from 'node-fetch'; import type { Response } from 'node-fetch';
import uuid from 'uuid';
import webpush from 'web-push'; import webpush from 'web-push';
import type { PlatformDetails } from 'lib/types/device-types.js'; import type { PlatformDetails } from 'lib/types/device-types.js';
import { threadSubscriptions } from 'lib/types/subscription-types.js'; import { threadSubscriptions } from 'lib/types/subscription-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { encryptBlobPayload } from './crypto.js';
import { import {
getAPNPushProfileForCodeVersion, getAPNPushProfileForCodeVersion,
getFCMPushProfileForCodeVersion, getFCMPushProfileForCodeVersion,
getAPNProvider, getAPNProvider,
getFCMProvider, getFCMProvider,
ensureWebPushInitialized, ensureWebPushInitialized,
getWNSToken, getWNSToken,
} from './providers.js'; } from './providers.js';
▲ Show 20 Lines • Show All 362 Lines • ▼ Show 20 Lines
async function blobServiceUpload(payload: string): Promise< async function blobServiceUpload(payload: string): Promise<
| { | {
+blobHash: string, +blobHash: string,
+encryptionKey: string, +encryptionKey: string,
} }
| { +blobUploadError: string }, | { +blobUploadError: string },
> { > {
return upload(payload); const blobHolder = uuid.v4();
try {
const { encryptionKey, encryptedPayload, encryptedPayloadHash } =
await encryptBlobPayload(payload);
await upload(encryptedPayload, encryptedPayloadHash, blobHolder);
return {
blobHash: encryptedPayloadHash,
encryptionKey,
};
} catch (e) {
return {
blobUploadError: e.message,
};
}
} }
export { export {
apnPush, apnPush,
blobServiceUpload, blobServiceUpload,
fcmPush, fcmPush,
webPush, webPush,
wnsPush, wnsPush,
getUnreadCounts, getUnreadCounts,
apnMaxNotificationPayloadByteSize, apnMaxNotificationPayloadByteSize,
fcmMaxNotificationPayloadByteSize, fcmMaxNotificationPayloadByteSize,
wnsMaxNotificationPayloadByteSize, wnsMaxNotificationPayloadByteSize,
}; };
View Options

keyserver/src/responders/redux-state-responders.js

// @flow // @flow
import type { ResponseFailure } from '@parse/node-apn'; import type { ResponseFailure } from '@parse/node-apn';
import type { FirebaseApp, FirebaseError } from 'firebase-admin'; import type { FirebaseApp, FirebaseError } from 'firebase-admin';
import invariant from 'invariant'; import invariant from 'invariant';
import nodeFetch from 'node-fetch'; import nodeFetch from 'node-fetch';
import type { Response } from 'node-fetch'; import type { Response } from 'node-fetch';
import uuid from 'uuid';
import webpush from 'web-push'; import webpush from 'web-push';
import type { PlatformDetails } from 'lib/types/device-types.js'; import type { PlatformDetails } from 'lib/types/device-types.js';
import { threadSubscriptions } from 'lib/types/subscription-types.js'; import { threadSubscriptions } from 'lib/types/subscription-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { encryptBlobPayload } from './crypto.js';
import { import {
getAPNPushProfileForCodeVersion, getAPNPushProfileForCodeVersion,
getFCMPushProfileForCodeVersion, getFCMPushProfileForCodeVersion,
getAPNProvider, getAPNProvider,
getFCMProvider, getFCMProvider,
ensureWebPushInitialized, ensureWebPushInitialized,
getWNSToken, getWNSToken,
} from './providers.js'; } from './providers.js';
▲ Show 20 Lines • Show All 362 Lines • ▼ Show 20 Lines
async function blobServiceUpload(payload: string): Promise< async function blobServiceUpload(payload: string): Promise<
| { | {
+blobHash: string, +blobHash: string,
+encryptionKey: string, +encryptionKey: string,
} }
| { +blobUploadError: string }, | { +blobUploadError: string },
> { > {
return upload(payload); const blobHolder = uuid.v4();
try {
const { encryptionKey, encryptedPayload, encryptedPayloadHash } =
await encryptBlobPayload(payload);
await upload(encryptedPayload, encryptedPayloadHash, blobHolder);
return {
blobHash: encryptedPayloadHash,
encryptionKey,
};
} catch (e) {
return {
blobUploadError: e.message,
};
}
} }
export { export {
apnPush, apnPush,
blobServiceUpload, blobServiceUpload,
fcmPush, fcmPush,
webPush, webPush,
wnsPush, wnsPush,
getUnreadCounts, getUnreadCounts,
apnMaxNotificationPayloadByteSize, apnMaxNotificationPayloadByteSize,
fcmMaxNotificationPayloadByteSize, fcmMaxNotificationPayloadByteSize,
wnsMaxNotificationPayloadByteSize, wnsMaxNotificationPayloadByteSize,
}; };
View Options

lib/types/link-types.js

// @flow // @flow
import type { ResponseFailure } from '@parse/node-apn'; import type { ResponseFailure } from '@parse/node-apn';
import type { FirebaseApp, FirebaseError } from 'firebase-admin'; import type { FirebaseApp, FirebaseError } from 'firebase-admin';
import invariant from 'invariant'; import invariant from 'invariant';
import nodeFetch from 'node-fetch'; import nodeFetch from 'node-fetch';
import type { Response } from 'node-fetch'; import type { Response } from 'node-fetch';
import uuid from 'uuid';
import webpush from 'web-push'; import webpush from 'web-push';
import type { PlatformDetails } from 'lib/types/device-types.js'; import type { PlatformDetails } from 'lib/types/device-types.js';
import { threadSubscriptions } from 'lib/types/subscription-types.js'; import { threadSubscriptions } from 'lib/types/subscription-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { encryptBlobPayload } from './crypto.js';
import { import {
getAPNPushProfileForCodeVersion, getAPNPushProfileForCodeVersion,
getFCMPushProfileForCodeVersion, getFCMPushProfileForCodeVersion,
getAPNProvider, getAPNProvider,
getFCMProvider, getFCMProvider,
ensureWebPushInitialized, ensureWebPushInitialized,
getWNSToken, getWNSToken,
} from './providers.js'; } from './providers.js';
▲ Show 20 Lines • Show All 362 Lines • ▼ Show 20 Lines
async function blobServiceUpload(payload: string): Promise< async function blobServiceUpload(payload: string): Promise<
| { | {
+blobHash: string, +blobHash: string,
+encryptionKey: string, +encryptionKey: string,
} }
| { +blobUploadError: string }, | { +blobUploadError: string },
> { > {
return upload(payload); const blobHolder = uuid.v4();
try {
const { encryptionKey, encryptedPayload, encryptedPayloadHash } =
await encryptBlobPayload(payload);
await upload(encryptedPayload, encryptedPayloadHash, blobHolder);
return {
blobHash: encryptedPayloadHash,
encryptionKey,
};
} catch (e) {
return {
blobUploadError: e.message,
};
}
} }
export { export {
apnPush, apnPush,
blobServiceUpload, blobServiceUpload,
fcmPush, fcmPush,
webPush, webPush,
wnsPush, wnsPush,
getUnreadCounts, getUnreadCounts,
apnMaxNotificationPayloadByteSize, apnMaxNotificationPayloadByteSize,
fcmMaxNotificationPayloadByteSize, fcmMaxNotificationPayloadByteSize,
wnsMaxNotificationPayloadByteSize, wnsMaxNotificationPayloadByteSize,
}; };