Page MenuHomePhabricator
Differential D4212

[keyserver] Add keyserver/.env to ignore files
ClosedPublic
Actions

Authored by ashoat on Jun 5 2022, 10:19 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 12:40 PM
Unknown Object (File)
Mon, Apr 14, 8:41 AM
Unknown Object (File)
Mon, Apr 14, 5:09 AM
Unknown Object (File)
Sun, Apr 13, 2:24 AM
Unknown Object (File)
Tue, Apr 8, 6:01 PM
Unknown Object (File)
Tue, Apr 8, 4:39 PM
Unknown Object (File)
Tue, Apr 8, 9:00 AM
Unknown Object (File)
Tue, Apr 8, 7:28 AM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
tomek
atul
Commits
rCOMM77ac9a8af53e: [keyserver] Add keyserver/.env to ignore files
Summary
  1. Adding to .gitignore since it should not be checked in and I want it to stop showing up when I run git status
  2. Adding to .dockerignore so it doesn't get copied into the container for security reasons

Depends on D4211

Test Plan

I created .env.swp and tmp.env test files and made sure they were excluded from the Docker image by loading a container with that image and exploring around

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
4 lines
10 lines

Diff 13358

View Options

.dockerignore

package app.comm.android; package app.comm.android;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.util.Log; import android.util.Log;
import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import expo.modules.securestore.SecureStoreModule;
import io.invertase.firebase.messaging.RNFirebaseMessagingService; import io.invertase.firebase.messaging.RNFirebaseMessagingService;
import java.io.File;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
/** /**
* We're extending RNFirebaseMessagingService here instead of * We're extending RNFirebaseMessagingService here instead of
* FirebaseMessagingService which is not ideal but let's us work around an * FirebaseMessagingService which is not ideal but let's us work around an
* Android limitation. If there are a couple of FirebaseMessagingServices * Android limitation. If there are a couple of FirebaseMessagingServices
* declared in manifest, only the first one would get all the notifications. * declared in manifest, only the first one would get all the notifications.
* So we need to find a way to have only one service that implements this. * So we need to find a way to have only one service that implements this.
Show All 17 Lines
* the easiest in terms of making it safe. * the easiest in terms of making it safe.
*/ */
public class CommNotificationsHandler extends RNFirebaseMessagingService { public class CommNotificationsHandler extends RNFirebaseMessagingService {
private static final String RESCIND_KEY = "rescind"; private static final String RESCIND_KEY = "rescind";
private static final String RESCIND_ID_KEY = "rescindID"; private static final String RESCIND_ID_KEY = "rescindID";
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String THREAD_ID_KEY = "threadID";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private NotificationManager notificationManager; private NotificationManager notificationManager;
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize(
() -> new SecureStoreModule(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
} }
@Override @Override
public void onMessageReceived(RemoteMessage message) { public void onMessageReceived(RemoteMessage message) {
String rescind = message.getData().get(RESCIND_KEY); String rescind = message.getData().get(RESCIND_KEY);
String rescindID = message.getData().get(RESCIND_ID_KEY);
if ("true".equals(rescind) && if ("true".equals(rescind) &&
android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
for (StatusBarNotification notification : handleNotificationRescind(message);
notificationManager.getActiveNotifications()) {
if (notification.getTag().equals(rescindID)) {
notificationManager.cancel(
notification.getTag(), notification.getId());
}
}
} }
String badge = message.getData().get(BADGE_KEY); String badge = message.getData().get(BADGE_KEY);
if (badge != null) { if (badge != null) {
try { try {
int badgeCount = Integer.parseInt(badge); int badgeCount = Integer.parseInt(badge);
if (badgeCount > 0) { if (badgeCount > 0) {
ShortcutBadger.applyCount(this, badgeCount); ShortcutBadger.applyCount(this, badgeCount);
Show All 14 Lines String backgroundNotifType =
message.getData().get(BACKGROUND_NOTIF_TYPE_KEY); message.getData().get(BACKGROUND_NOTIF_TYPE_KEY);
if ("PING".equals(backgroundNotifType)) { if ("PING".equals(backgroundNotifType)) {
NetworkModule.sendPong(); NetworkModule.sendPong();
return; return;
} }
super.onMessageReceived(message); super.onMessageReceived(message);
} }
private void handleNotificationRescind(RemoteMessage message) {
String setUnreadStatus = message.getData().get(SET_UNREAD_STATUS_KEY);
if ("true".equals(setUnreadStatus)) {
File sqliteFile =
this.getApplicationContext().getDatabasePath("comm.sqlite");
if (sqliteFile.exists()) {
String threadID = message.getData().get(THREAD_ID_KEY);
ThreadOperations.updateSQLiteUnreadStatus(
sqliteFile.getPath(), threadID, false);
} else {
Log.w(
"COMM",
"Database not existing yet. Skipping thread status update.");
}
}
String rescindID = message.getData().get(RESCIND_ID_KEY);
for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) {
if (notification.getTag().equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId());
}
}
}
} }
View Options

.gitignore

package app.comm.android; package app.comm.android;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.util.Log; import android.util.Log;
import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import expo.modules.securestore.SecureStoreModule;
import io.invertase.firebase.messaging.RNFirebaseMessagingService; import io.invertase.firebase.messaging.RNFirebaseMessagingService;
import java.io.File;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
/** /**
* We're extending RNFirebaseMessagingService here instead of * We're extending RNFirebaseMessagingService here instead of
* FirebaseMessagingService which is not ideal but let's us work around an * FirebaseMessagingService which is not ideal but let's us work around an
* Android limitation. If there are a couple of FirebaseMessagingServices * Android limitation. If there are a couple of FirebaseMessagingServices
* declared in manifest, only the first one would get all the notifications. * declared in manifest, only the first one would get all the notifications.
* So we need to find a way to have only one service that implements this. * So we need to find a way to have only one service that implements this.
Show All 17 Lines
* the easiest in terms of making it safe. * the easiest in terms of making it safe.
*/ */
public class CommNotificationsHandler extends RNFirebaseMessagingService { public class CommNotificationsHandler extends RNFirebaseMessagingService {
private static final String RESCIND_KEY = "rescind"; private static final String RESCIND_KEY = "rescind";
private static final String RESCIND_ID_KEY = "rescindID"; private static final String RESCIND_ID_KEY = "rescindID";
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String THREAD_ID_KEY = "threadID";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private NotificationManager notificationManager; private NotificationManager notificationManager;
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize(
() -> new SecureStoreModule(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
} }
@Override @Override
public void onMessageReceived(RemoteMessage message) { public void onMessageReceived(RemoteMessage message) {
String rescind = message.getData().get(RESCIND_KEY); String rescind = message.getData().get(RESCIND_KEY);
String rescindID = message.getData().get(RESCIND_ID_KEY);
if ("true".equals(rescind) && if ("true".equals(rescind) &&
android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
for (StatusBarNotification notification : handleNotificationRescind(message);
notificationManager.getActiveNotifications()) {
if (notification.getTag().equals(rescindID)) {
notificationManager.cancel(
notification.getTag(), notification.getId());
}
}
} }
String badge = message.getData().get(BADGE_KEY); String badge = message.getData().get(BADGE_KEY);
if (badge != null) { if (badge != null) {
try { try {
int badgeCount = Integer.parseInt(badge); int badgeCount = Integer.parseInt(badge);
if (badgeCount > 0) { if (badgeCount > 0) {
ShortcutBadger.applyCount(this, badgeCount); ShortcutBadger.applyCount(this, badgeCount);
Show All 14 Lines String backgroundNotifType =
message.getData().get(BACKGROUND_NOTIF_TYPE_KEY); message.getData().get(BACKGROUND_NOTIF_TYPE_KEY);
if ("PING".equals(backgroundNotifType)) { if ("PING".equals(backgroundNotifType)) {
NetworkModule.sendPong(); NetworkModule.sendPong();
return; return;
} }
super.onMessageReceived(message); super.onMessageReceived(message);
} }
private void handleNotificationRescind(RemoteMessage message) {
String setUnreadStatus = message.getData().get(SET_UNREAD_STATUS_KEY);
if ("true".equals(setUnreadStatus)) {
File sqliteFile =
this.getApplicationContext().getDatabasePath("comm.sqlite");
if (sqliteFile.exists()) {
String threadID = message.getData().get(THREAD_ID_KEY);
ThreadOperations.updateSQLiteUnreadStatus(
sqliteFile.getPath(), threadID, false);
} else {
Log.w(
"COMM",
"Database not existing yet. Skipping thread status update.");
}
}
String rescindID = message.getData().get(RESCIND_ID_KEY);
for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) {
if (notification.getTag().equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId());
}
}
}
} }