Page MenuHomePhabricator
Differential D12751

[terraform] add FCM secrets config
ClosedPublic
Actions

Authored by kamil on Jul 15 2024, 9:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 10, 8:49 AM
Unknown Object (File)
Thu, Apr 10, 8:34 AM
Unknown Object (File)
Thu, Apr 10, 6:47 AM
Unknown Object (File)
Wed, Apr 9, 1:10 AM
Unknown Object (File)
Tue, Apr 8, 4:46 AM
Unknown Object (File)
Mar 6 2025, 5:57 AM
Unknown Object (File)
Feb 28 2025, 12:41 PM
Unknown Object (File)
Feb 28 2025, 12:40 PM
View All 70 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
marcin
Commits
rCOMM8cebb5402ed4: [terraform] add FCM secrets config
Summary

This will be added to AWS KMS secret manager as JSON and is exposed as an environment variable in the container.

Test Plan

yarn init-local-cloud - the exact I'll test exact functionality on staging after entire stack will be accepted.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
services/
terraform/
remote/
9 lines
tunnelbroker/
src/
1 line

Diff 42293

View Options

services/terraform/remote/service_tunnelbroker.tf

Show All 12 Lines
import { import {
createAsyncMigrate, createAsyncMigrate,
type StorageMigrationFunction, type StorageMigrationFunction,
} from 'lib/shared/create-async-migrate.js'; } from 'lib/shared/create-async-migrate.js';
import type { import type {
KeyserverInfo, KeyserverInfo,
KeyserverStore, KeyserverStore,
} from 'lib/types/keyserver-types.js'; } from 'lib/types/keyserver-types.js';
import { cookieTypes } from 'lib/types/session-types.js';
import { import {
defaultConnectionInfo, defaultConnectionInfo,
type ConnectionInfo, type ConnectionInfo,
} from 'lib/types/socket-types.js'; } from 'lib/types/socket-types.js';
import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { ashoatKeyserverID } from 'lib/utils/validation-utils.js'; import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines [5]: async state => {
await databaseModule.schedule({ await databaseModule.schedule({
type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS, type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS,
storeOperations: { draftStoreOperations }, storeOperations: { draftStoreOperations },
}); });
return state; return state;
}, },
[6]: async (state: AppState): Promise<AppState> => {
const params = parseCookies(document.cookie);
let cookie = null;
if (params[cookieTypes.USER]) {
cookie = `${cookieTypes.USER}=${params[cookieTypes.USER]}`;
} else if (params[cookieTypes.ANONYMOUS]) {
cookie = `${cookieTypes.ANONYMOUS}=${params[cookieTypes.ANONYMOUS]}`;
}
return {
...state,
keyserverStore: {
...state.keyserverStore,
keyserverInfos: {
...state.keyserverStore.keyserverInfos,
[ashoatKeyserverID]: {
...state.keyserverStore.keyserverInfos[ashoatKeyserverID],
cookie,
},
},
},
};
},
}; };
const persistWhitelist = [ const persistWhitelist = [
'enabledApps', 'enabledApps',
'deviceID', 'deviceID',
'cryptoStore', 'cryptoStore',
'notifPermissionAlertInfo', 'notifPermissionAlertInfo',
'commServicesAccessToken', 'commServicesAccessToken',
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Linesconst persistConfig: PersistConfig = {
whitelist: isSQLiteSupported() whitelist: isSQLiteSupported()
? persistWhitelist ? persistWhitelist
: [...persistWhitelist, 'draftStore'], : [...persistWhitelist, 'draftStore'],
migrate: (createAsyncMigrate( migrate: (createAsyncMigrate(
migrations, migrations,
{ debug: isDev }, { debug: isDev },
migrateStorageToSQLite, migrateStorageToSQLite,
): any), ): any),
version: 5, version: 6,
transforms: [keyserverStoreTransform], transforms: [keyserverStoreTransform],
}; };
export { persistConfig }; export { persistConfig };
View Options

services/tunnelbroker/src/constants.rs

Show All 12 Lines
import { import {
createAsyncMigrate, createAsyncMigrate,
type StorageMigrationFunction, type StorageMigrationFunction,
} from 'lib/shared/create-async-migrate.js'; } from 'lib/shared/create-async-migrate.js';
import type { import type {
KeyserverInfo, KeyserverInfo,
KeyserverStore, KeyserverStore,
} from 'lib/types/keyserver-types.js'; } from 'lib/types/keyserver-types.js';
import { cookieTypes } from 'lib/types/session-types.js';
import { import {
defaultConnectionInfo, defaultConnectionInfo,
type ConnectionInfo, type ConnectionInfo,
} from 'lib/types/socket-types.js'; } from 'lib/types/socket-types.js';
import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { ashoatKeyserverID } from 'lib/utils/validation-utils.js'; import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines [5]: async state => {
await databaseModule.schedule({ await databaseModule.schedule({
type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS, type: workerRequestMessageTypes.PROCESS_STORE_OPERATIONS,
storeOperations: { draftStoreOperations }, storeOperations: { draftStoreOperations },
}); });
return state; return state;
}, },
[6]: async (state: AppState): Promise<AppState> => {
const params = parseCookies(document.cookie);
let cookie = null;
if (params[cookieTypes.USER]) {
cookie = `${cookieTypes.USER}=${params[cookieTypes.USER]}`;
} else if (params[cookieTypes.ANONYMOUS]) {
cookie = `${cookieTypes.ANONYMOUS}=${params[cookieTypes.ANONYMOUS]}`;
}
return {
...state,
keyserverStore: {
...state.keyserverStore,
keyserverInfos: {
...state.keyserverStore.keyserverInfos,
[ashoatKeyserverID]: {
...state.keyserverStore.keyserverInfos[ashoatKeyserverID],
cookie,
},
},
},
};
},
}; };
const persistWhitelist = [ const persistWhitelist = [
'enabledApps', 'enabledApps',
'deviceID', 'deviceID',
'cryptoStore', 'cryptoStore',
'notifPermissionAlertInfo', 'notifPermissionAlertInfo',
'commServicesAccessToken', 'commServicesAccessToken',
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Linesconst persistConfig: PersistConfig = {
whitelist: isSQLiteSupported() whitelist: isSQLiteSupported()
? persistWhitelist ? persistWhitelist
: [...persistWhitelist, 'draftStore'], : [...persistWhitelist, 'draftStore'],
migrate: (createAsyncMigrate( migrate: (createAsyncMigrate(
migrations, migrations,
{ debug: isDev }, { debug: isDev },
migrateStorageToSQLite, migrateStorageToSQLite,
): any), ): any),
version: 5, version: 6,
transforms: [keyserverStoreTransform], transforms: [keyserverStoreTransform],
}; };
export { persistConfig }; export { persistConfig };