paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-21 15:09:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

push_notification: Drop notif if ANDROID_FCM_CREDENTIALS_PATH is unset.

Browse Source 
If `ANDROID_FCM_CREDENTIALS_PATH` is unset it results in fcm_app=None.
We should log error in this case and return, not doing so will result
in runtime error.

Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
This commit is contained in:
Prakhar Pratyush
2025-11-03 22:51:35 +05:30
committed by Tim Abbott
parent 06501ab208
commit d893496de1
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
zerver/tests/test_e2ee_push_notifications.py
View File

@@ -294,6 +294,46 @@ class SendPushNotificationTest(E2EEPushNotificationTestCase):
zerver_logger.output[2], zerver_logger.output[2],
) )
# `ANDROID_FCM_CREDENTIALS_PATH` is unset / fcm_app=None.
message_id = self.send_personal_message(
from_user=aaron, to_user=hamlet, skip_capture_on_commit_callbacks=True
)
missed_message = {
"message_id": message_id,
"trigger": NotificationTriggers.DIRECT_MESSAGE,
}
with (
mock.patch("zilencer.lib.push_notifications.fcm_app", new=None),
mock.patch(
"zilencer.lib.push_notifications.send_e2ee_push_notification_apple",
return_value=SentPushNotificationResult(
successfully_sent_count=1,
delete_device_ids=[],
),
),
self.assertLogs("zerver.lib.push_notifications", level="INFO") as zerver_logger,
self.assertLogs("zilencer.lib.push_notifications", level="ERROR") as zilencer_logger,
mock.patch("time.perf_counter", side_effect=[10.0, 12.0]),
):
handle_push_notification(hamlet.id, missed_message)
self.assertEqual(
"INFO:zerver.lib.push_notifications:"
f"Sending push notifications to mobile clients for user {hamlet.id}",
zerver_logger.output[0],
)
self.assertEqual(
"ERROR:zilencer.lib.push_notifications:"
"FCM: Dropping push notifications since ANDROID_FCM_CREDENTIALS_PATH is unset",
zilencer_logger.output[0],
)
self.assertEqual(
"INFO:zerver.lib.push_notifications:"
f"Sent E2EE mobile push notifications for user {hamlet.id}: 0 via FCM, 1 via APNs in 2.000s",
zerver_logger.output[2],
)
def test_early_return_if_expired_time_set(self) -> None: def test_early_return_if_expired_time_set(self) -> None:
aaron = self.example_user("aaron") aaron = self.example_user("aaron")
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")

7
zilencer/lib/push_notifications.py
View File

@@ -88,6 +88,13 @@ def send_e2ee_push_notification_android(
successfully_sent_count = 0 successfully_sent_count = 0
delete_device_ids: list[int] = [] delete_device_ids: list[int] = []
if fcm_app is None:
logger.error("FCM: Dropping push notifications since ANDROID_FCM_CREDENTIALS_PATH is unset")
return SentPushNotificationResult(
successfully_sent_count=successfully_sent_count,
delete_device_ids=delete_device_ids,
)
try: try:
batch_response = firebase_messaging.send_each(fcm_requests, app=fcm_app) batch_response = firebase_messaging.send_each(fcm_requests, app=fcm_app)
except firebase_exceptions.FirebaseError: except firebase_exceptions.FirebaseError: