Page MenuHomePhabricator
Differential D12810

[keyserver] run webapp, landing, and keyserver conditionally
ClosedPublic
Actions

Authored by will on Jul 19 2024, 3:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 12:37 PM
Unknown Object (File)
Sat, Apr 5, 6:58 AM
Unknown Object (File)
Sat, Apr 5, 4:58 AM
Unknown Object (File)
Sat, Apr 5, 1:17 AM
Unknown Object (File)
Fri, Apr 4, 10:04 PM
Unknown Object (File)
Fri, Apr 4, 6:30 AM
Unknown Object (File)
Mar 7 2025, 1:59 AM
Unknown Object (File)
Mar 5 2025, 3:21 PM
View All Files
Subscribers
tomek

Details

Reviewers
ashoat
Commits
rCOMM083b66c6c741: [keyserver] run webapp, landing, and keyserver conditionally
Summary

We plan to decouple running the keyserver, webapp, and landing for the purposes of running them on AWS

This adds a configuration option RunServerConfig which can be used to specify which of the three will be run

Depends on D12808

Test Plan

flow check. Will test more thoroughly by running them on aws in isolated containers and connect them

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

will created this revision.Jul 19 2024, 3:07 PM
Herald added a subscriber: tomek. · View Herald TranscriptJul 19 2024, 3:07 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 19 2024, 3:24 PM
Harbormaster failed remote builds in B30524: Diff 42559!
will updated this revision to Diff 42560.Jul 19 2024, 4:01 PM

missing await

Harbormaster completed remote builds in B30525: Diff 42560.Jul 19 2024, 4:17 PM
will requested review of this revision.Jul 19 2024, 4:17 PM
ashoat accepted this revision.Jul 19 2024, 8:32 PM
ashoat added inline comments.
keyserver/src/utils/server-utils.js
1 ↗(On Diff #42560)

Add newline below this before landing please

This revision is now accepted and ready to land.Jul 19 2024, 8:32 PM
will added a child revision: D12813: [terraform] add webapp, landing domains and rename keyserver domain variables.Jul 19 2024, 8:32 PM
will updated this revision to Diff 42571.Jul 19 2024, 8:48 PM

newline

This revision was landed with ongoing or failed builds.Jul 19 2024, 8:49 PM
Closed by commit rCOMM083b66c6c741: [keyserver] run webapp, landing, and keyserver conditionally (authored by will). · Explain Why
This revision was automatically updated to reflect the committed changes.
will added a commit: rCOMM083b66c6c741: [keyserver] run webapp, landing, and keyserver conditionally.
Harbormaster completed remote builds in B30533: Diff 42571.Jul 19 2024, 9:04 PM

Revision Contents
Changeset List

PathSize
keyserver/
src/
9 lines
utils/
25 lines

Diff 42571

View Options

keyserver/src/keyserver.js

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils; import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

keyserver/src/utils/server-utils.js

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils; import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines