Page MenuHomePhabricator
Differential D12946

[Tunnelbroker] invalidate bad Web Push tokens
ClosedPublic
Actions

Authored by kamil on Jul 30 2024, 6:06 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 12:38 AM
Unknown Object (File)
Tue, Mar 11, 10:41 AM
Unknown Object (File)
Tue, Mar 4, 6:47 PM
Unknown Object (File)
Sun, Mar 2, 10:47 PM
Unknown Object (File)
Sat, Mar 1, 11:37 PM
Unknown Object (File)
Wed, Feb 26, 8:13 AM
Unknown Object (File)
Sun, Feb 23, 11:32 PM
Unknown Object (File)
Fri, Feb 21, 8:28 PM
View All 86 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
marcin
Commits
rCOMM2960f788547e: [Tunnelbroker] invalidate bad Web Push tokens
Summary

ENG-8498.

Based on keyserver error codes.
Here is library mapping of status to errors used in this diff.

Depends on D12911

Test Plan

Manually malform device token for web device in DDB (url in JSON), try sending notif to this device and verify that flag was flipped and the message was sent to the device (both online and offline device).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jul 30 2024, 6:06 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 30 2024, 6:06 AM
kamil published this revision for review.Jul 30 2024, 6:18 AM
Harbormaster completed remote builds in B30816: Diff 42969.Jul 30 2024, 7:15 AM
bartek accepted this revision.Jul 30 2024, 7:53 AM
bartek added inline comments.
services/tunnelbroker/src/websockets/session.rs
519–537 ↗(On Diff #42969)

maybe doing sth like

use notifs::web_push::error::Error as NotifError;
use web_push::WebPushError;

locally here in this function, it could make these lines shorter

This revision is now accepted and ready to land.Jul 30 2024, 7:53 AM
kamil added a child revision: D12951: [Tunnelbroker] invalidate bad FCM tokens.Jul 31 2024, 2:49 AM
kamil updated this revision to Diff 42996.Jul 31 2024, 6:40 AM

address review

Harbormaster completed remote builds in B30838: Diff 42996.Jul 31 2024, 7:02 AM
Closed by commit rCOMM2960f788547e: [Tunnelbroker] invalidate bad Web Push tokens (authored by kamil). · Explain WhyJul 31 2024, 7:14 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM2960f788547e: [Tunnelbroker] invalidate bad Web Push tokens.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
notifs/
web_push/
2 lines
websockets/
37 lines

Diff 43001

View Options

services/tunnelbroker/src/notifs/web_push/mod.rs

use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use web_push::{ use web_push::{
ContentEncoding, HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, ContentEncoding, HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder,
WebPushMessageBuilder, WebPushMessageBuilder,
}; };
use web_push::{PartialVapidSignatureBuilder, WebPushClient as _}; use web_push::{PartialVapidSignatureBuilder, WebPushClient as _};
use crate::notifs::web_push::config::WebPushConfig; use crate::notifs::web_push::config::WebPushConfig;
pub mod config; pub mod config;
mod error; pub mod error;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct WebPushNotif { pub struct WebPushNotif {
/// Device token for web is a JSON-encoded [`SubscriptionInfo`]. /// Device token for web is a JSON-encoded [`SubscriptionInfo`].
pub device_token: String, pub device_token: String,
pub payload: String, pub payload: String,
} }
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/src/websockets/session.rs

Show All 24 Linesuse tunnelbroker_messages::{
message_to_device_request_status::MessageSentStatus, session::DeviceTypes, message_to_device_request_status::MessageSentStatus, session::DeviceTypes,
DeviceToTunnelbrokerMessage, Heartbeat, MessageToDevice, DeviceToTunnelbrokerMessage, Heartbeat, MessageToDevice,
MessageToDeviceRequest, MessageToTunnelbroker, MessageToDeviceRequest, MessageToTunnelbroker,
}; };
use crate::notifs::apns::response::ErrorReason; use crate::notifs::apns::response::ErrorReason;
use crate::database::{self, DatabaseClient, MessageToDeviceExt}; use crate::database::{self, DatabaseClient, MessageToDeviceExt};
use crate::identity;
use crate::notifs::apns::error::Error;
use crate::notifs::apns::headers::NotificationHeaders; use crate::notifs::apns::headers::NotificationHeaders;
use crate::notifs::apns::APNsNotif; use crate::notifs::apns::APNsNotif;
use crate::notifs::fcm::firebase_message::{ use crate::notifs::fcm::firebase_message::{
AndroidConfig, AndroidMessagePriority, FCMMessage, AndroidConfig, AndroidMessagePriority, FCMMessage,
}; };
use crate::notifs::web_push::WebPushNotif; use crate::notifs::web_push::WebPushNotif;
use crate::notifs::{NotifClient, NotifClientType}; use crate::notifs::{apns, NotifClient, NotifClientType};
use crate::{identity, notifs};
pub struct DeviceInfo { pub struct DeviceInfo {
pub device_id: String, pub device_id: String,
pub notify_token: Option<String>, pub notify_token: Option<String>,
pub device_type: DeviceTypes, pub device_type: DeviceTypes,
pub device_app_version: Option<String>, pub device_app_version: Option<String>,
pub device_os: Option<String>, pub device_os: Option<String>,
pub is_authenticated: bool, pub is_authenticated: bool,
▲ Show 20 Lines • Show All 368 Lines • ▼ Show 20 Lines match serialized_message {
let apns_notif = APNsNotif { let apns_notif = APNsNotif {
device_token: device_token.clone(), device_token: device_token.clone(),
headers, headers,
payload: notif.payload, payload: notif.payload,
}; };
if let Some(apns) = self.notif_client.apns.clone() { if let Some(apns) = self.notif_client.apns.clone() {
let response = apns.send(apns_notif).await; let response = apns.send(apns_notif).await;
if let Err(Error::ResponseError(body)) = &response { if let Err(apns::error::Error::ResponseError(body)) = &response {
if matches!( if matches!(
body.reason, body.reason,
ErrorReason::BadDeviceToken ErrorReason::BadDeviceToken
| ErrorReason::Unregistered | ErrorReason::Unregistered
| ErrorReason::ExpiredToken | ErrorReason::ExpiredToken
) { ) {
if let Err(e) = self if let Err(e) = self
.invalidate_device_token(notif.device_id, device_token) .invalidate_device_token(notif.device_id, device_token.clone())
.await .await
{ {
error!("Error invalidating device token: {:?}", e); error!(
"Error invalidating device token {}: {:?}",
device_token, e
);
}; };
} }
} }
return Some( return Some(
self self
.get_message_to_device_status(&notif.client_message_id, response), .get_message_to_device_status(&notif.client_message_id, response),
); );
} }
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines match serialized_message {
let Some(web_push_client) = self.notif_client.web_push.clone() else { let Some(web_push_client) = self.notif_client.web_push.clone() else {
return Some(self.get_message_to_device_status( return Some(self.get_message_to_device_status(
&notif.client_message_id, &notif.client_message_id,
Err(SessionError::MissingWebPushClient), Err(SessionError::MissingWebPushClient),
)); ));
}; };
let device_token = match self let device_token = match self
.get_device_token(notif.device_id, NotifClientType::WebPush) .get_device_token(notif.device_id.clone(), NotifClientType::WebPush)
.await .await
{ {
Ok(token) => token, Ok(token) => token,
Err(e) => { Err(e) => {
return Some( return Some(
self self
.get_message_to_device_status(&notif.client_message_id, Err(e)), .get_message_to_device_status(&notif.client_message_id, Err(e)),
) )
} }
}; };
let web_push_notif = WebPushNotif { let web_push_notif = WebPushNotif {
device_token, device_token: device_token.clone(),
payload: notif.payload, payload: notif.payload,
}; };
let result = web_push_client.send(web_push_notif).await; let result = web_push_client.send(web_push_notif).await;
if let Err(notifs::web_push::error::Error::WebPush(web_push_error)) =
&result
{
if matches!(
web_push_error,
web_push::WebPushError::EndpointNotValid
| web_push::WebPushError::EndpointNotFound
) {
if let Err(e) = self
.invalidate_device_token(notif.device_id, device_token.clone())
.await
{
error!(
"Error invalidating device token {}: {:?}",
device_token, e
);
};
}
}
Some( Some(
self.get_message_to_device_status(&notif.client_message_id, result), self.get_message_to_device_status(&notif.client_message_id, result),
) )
} }
_ => { _ => {
error!("Client sent invalid message type"); error!("Client sent invalid message type");
Some(MessageSentStatus::InvalidRequest) Some(MessageSentStatus::InvalidRequest)
} }
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines