Paths

Table of Contentst

-
keyserver/src/
-
src/
-
push/
-
crypto.js
-
utils.js
-
services/
-
blob.js

[keyserver] Split blob encryption and upload into separate functions
ClosedPublic
Actions

Authored by tomek on Nov 21 2023, 5:55 AM.

Details

Reviewers

kamil
marcin

Commits

rCOMM9213ad529af3: [keyserver] Split blob encryption and upload into separate functions

Summary

A caller of the Blob API should be able to choose what needs to be uploaded, e.g. if the payload should be encrypted. This diff allows more flexibility while the old behavior isn't changed.

Depends on D9937

Test Plan

Flow.

Check if calling the new function has the same result as the old one (using some console logs, with the same initialization vectors).

Also tested if throwing exceptions while uploading produces the correct result.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

tomek created this revision.Nov 21 2023, 5:55 AM

Herald added a subscriber: ashoat. · View Herald TranscriptNov 21 2023, 5:55 AM

tomek edited the test plan for this revision. (Show Details)Nov 21 2023, 6:03 AM

Harbormaster completed remote builds in B24304: Diff 33456.Nov 21 2023, 6:15 AM

tomek requested review of this revision.Nov 21 2023, 6:15 AM

tomek added a child revision: D9941: [keyserver] Split uploading blob and assigning holders.Nov 21 2023, 6:55 AM

marcin added inline comments.Nov 22 2023, 6:47 AM

keyserver/src/push/utils.js
391 ↗	(On Diff #33456)	What if encryption step throws? I have an intuition that we should put it inside `try{} catch{}` statement.

tomek added inline comments.Nov 23 2023, 3:17 AM

keyserver/src/push/utils.js
391 ↗	(On Diff #33456)	In the original code, it was outside the try-catch block, but I guess it won't hurt to put it inside.

Move encrypting inside try-catch block

Harbormaster completed remote builds in B24369: Diff 33549.Nov 23 2023, 5:03 AM

marcin accepted this revision.Nov 23 2023, 6:51 AM

This revision is now accepted and ready to land.Nov 23 2023, 6:51 AM

Rebase

Harbormaster completed remote builds in B24384: Diff 33577.Nov 24 2023, 4:38 AM

Closed by commit rCOMM9213ad529af3: [keyserver] Split blob encryption and upload into separate functions (authored by tomek). · Explain WhyNov 24 2023, 4:51 AM

This revision was automatically updated to reflect the committed changes.

tomek added a commit: rCOMM9213ad529af3: [keyserver] Split blob encryption and upload into separate functions.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

push/

crypto.js

30 lines

utils.js

17 lines

services/

blob.js

76 lines

Diff 33580

View Options

keyserver/src/push/crypto.js

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines	const light = Object.freeze({
drawerItemLabelLevel0: '#0A0A0A',		drawerItemLabelLevel0: '#0A0A0A',
drawerItemLabelLevel1: '#0A0A0A',		drawerItemLabelLevel1: '#0A0A0A',
drawerItemLabelLevel2: '#1F1F1F',		drawerItemLabelLevel2: '#1F1F1F',
drawerOpenCommunityBackground: '#F5F5F5',		drawerOpenCommunityBackground: '#F5F5F5',
drawerBackground: '#FFFFFF',		drawerBackground: '#FFFFFF',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#EBEBEB',		subthreadsModalBackground: '#EBEBEB',
subthreadsModalSearch: '#00000008',		subthreadsModalSearch: '#00000008',
		messageLabel: '#0A0A0A',
});		});
export type Colors = $Exact<typeof light>;		export type Colors = $Exact<typeof light>;

const dark: Colors = Object.freeze({		const dark: Colors = Object.freeze({
blockQuoteBackground: '#A9A9A9',		blockQuoteBackground: '#A9A9A9',
blockQuoteBorder: '#808080',		blockQuoteBorder: '#808080',
codeBackground: '#0A0A0A',		codeBackground: '#0A0A0A',
disabledButton: '#404040',		disabledButton: '#404040',
▲ Show 20 Lines • Show All 71 Lines • ▼ Show 20 Lines	const dark: Colors = Object.freeze({
drawerOpenCommunityBackground: '#191919',		drawerOpenCommunityBackground: '#191919',
drawerBackground: '#1F1F1F',		drawerBackground: '#1F1F1F',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#1F1F1F',		subthreadsModalBackground: '#1F1F1F',
subthreadsModalSearch: '#FFFFFF04',		subthreadsModalSearch: '#FFFFFF04',
typeaheadTooltipBackground: '#1F1F1f',		typeaheadTooltipBackground: '#1F1F1f',
typeaheadTooltipBorder: '#404040',		typeaheadTooltipBorder: '#404040',
typeaheadTooltipText: 'white',		typeaheadTooltipText: 'white',
		messageLabel: '#CCCCCC',
});		});
const colors = { light, dark };		const colors = { light, dark };

const colorsSelector: (state: AppState) => Colors = createSelector(		const colorsSelector: (state: AppState) => Colors = createSelector(
(state: AppState) => state.globalThemeInfo.activeTheme,		(state: AppState) => state.globalThemeInfo.activeTheme,
(theme: ?GlobalTheme) => {		(theme: ?GlobalTheme) => {
const explicitTheme = theme ? theme : 'light';		const explicitTheme = theme ? theme : 'light';
return colors[explicitTheme];		return colors[explicitTheme];
▲ Show 20 Lines • Show All 127 Lines • Show Last 20 Lines

View Options

keyserver/src/push/utils.js

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines	const light = Object.freeze({
drawerItemLabelLevel0: '#0A0A0A',		drawerItemLabelLevel0: '#0A0A0A',
drawerItemLabelLevel1: '#0A0A0A',		drawerItemLabelLevel1: '#0A0A0A',
drawerItemLabelLevel2: '#1F1F1F',		drawerItemLabelLevel2: '#1F1F1F',
drawerOpenCommunityBackground: '#F5F5F5',		drawerOpenCommunityBackground: '#F5F5F5',
drawerBackground: '#FFFFFF',		drawerBackground: '#FFFFFF',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#EBEBEB',		subthreadsModalBackground: '#EBEBEB',
subthreadsModalSearch: '#00000008',		subthreadsModalSearch: '#00000008',
		messageLabel: '#0A0A0A',
});		});
export type Colors = $Exact<typeof light>;		export type Colors = $Exact<typeof light>;

const dark: Colors = Object.freeze({		const dark: Colors = Object.freeze({
blockQuoteBackground: '#A9A9A9',		blockQuoteBackground: '#A9A9A9',
blockQuoteBorder: '#808080',		blockQuoteBorder: '#808080',
codeBackground: '#0A0A0A',		codeBackground: '#0A0A0A',
disabledButton: '#404040',		disabledButton: '#404040',
▲ Show 20 Lines • Show All 71 Lines • ▼ Show 20 Lines	const dark: Colors = Object.freeze({
drawerOpenCommunityBackground: '#191919',		drawerOpenCommunityBackground: '#191919',
drawerBackground: '#1F1F1F',		drawerBackground: '#1F1F1F',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#1F1F1F',		subthreadsModalBackground: '#1F1F1F',
subthreadsModalSearch: '#FFFFFF04',		subthreadsModalSearch: '#FFFFFF04',
typeaheadTooltipBackground: '#1F1F1f',		typeaheadTooltipBackground: '#1F1F1f',
typeaheadTooltipBorder: '#404040',		typeaheadTooltipBorder: '#404040',
typeaheadTooltipText: 'white',		typeaheadTooltipText: 'white',
		messageLabel: '#CCCCCC',
});		});
const colors = { light, dark };		const colors = { light, dark };

const colorsSelector: (state: AppState) => Colors = createSelector(		const colorsSelector: (state: AppState) => Colors = createSelector(
(state: AppState) => state.globalThemeInfo.activeTheme,		(state: AppState) => state.globalThemeInfo.activeTheme,
(theme: ?GlobalTheme) => {		(theme: ?GlobalTheme) => {
const explicitTheme = theme ? theme : 'light';		const explicitTheme = theme ? theme : 'light';
return colors[explicitTheme];		return colors[explicitTheme];
▲ Show 20 Lines • Show All 127 Lines • Show Last 20 Lines

View Options

keyserver/src/services/blob.js

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Lines	const light = Object.freeze({
drawerItemLabelLevel0: '#0A0A0A',		drawerItemLabelLevel0: '#0A0A0A',
drawerItemLabelLevel1: '#0A0A0A',		drawerItemLabelLevel1: '#0A0A0A',
drawerItemLabelLevel2: '#1F1F1F',		drawerItemLabelLevel2: '#1F1F1F',
drawerOpenCommunityBackground: '#F5F5F5',		drawerOpenCommunityBackground: '#F5F5F5',
drawerBackground: '#FFFFFF',		drawerBackground: '#FFFFFF',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#EBEBEB',		subthreadsModalBackground: '#EBEBEB',
subthreadsModalSearch: '#00000008',		subthreadsModalSearch: '#00000008',
		messageLabel: '#0A0A0A',
});		});
export type Colors = $Exact<typeof light>;		export type Colors = $Exact<typeof light>;

const dark: Colors = Object.freeze({		const dark: Colors = Object.freeze({
blockQuoteBackground: '#A9A9A9',		blockQuoteBackground: '#A9A9A9',
blockQuoteBorder: '#808080',		blockQuoteBorder: '#808080',
codeBackground: '#0A0A0A',		codeBackground: '#0A0A0A',
disabledButton: '#404040',		disabledButton: '#404040',
▲ Show 20 Lines • Show All 71 Lines • ▼ Show 20 Lines	const dark: Colors = Object.freeze({
drawerOpenCommunityBackground: '#191919',		drawerOpenCommunityBackground: '#191919',
drawerBackground: '#1F1F1F',		drawerBackground: '#1F1F1F',
subthreadsModalClose: '#808080',		subthreadsModalClose: '#808080',
subthreadsModalBackground: '#1F1F1F',		subthreadsModalBackground: '#1F1F1F',
subthreadsModalSearch: '#FFFFFF04',		subthreadsModalSearch: '#FFFFFF04',
typeaheadTooltipBackground: '#1F1F1f',		typeaheadTooltipBackground: '#1F1F1f',
typeaheadTooltipBorder: '#404040',		typeaheadTooltipBorder: '#404040',
typeaheadTooltipText: 'white',		typeaheadTooltipText: 'white',
		messageLabel: '#CCCCCC',
});		});
const colors = { light, dark };		const colors = { light, dark };

const colorsSelector: (state: AppState) => Colors = createSelector(		const colorsSelector: (state: AppState) => Colors = createSelector(
(state: AppState) => state.globalThemeInfo.activeTheme,		(state: AppState) => state.globalThemeInfo.activeTheme,
(theme: ?GlobalTheme) => {		(theme: ?GlobalTheme) => {
const explicitTheme = theme ? theme : 'light';		const explicitTheme = theme ? theme : 'light';
return colors[explicitTheme];		return colors[explicitTheme];
▲ Show 20 Lines • Show All 127 Lines • Show Last 20 Lines

[keyserver] Split blob encryption and upload into separate functionsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 33580

keyserver/src/push/crypto.js

keyserver/src/push/utils.js

keyserver/src/services/blob.js

[keyserver] Split blob encryption and upload into separate functions
ClosedPublic
Actions

Revision Contents
Changeset List