Paths

Table of Contentst

-
services/tunnelbroker/src/
-
tunnelbroker/
-
src/
-
constants.rs
-
notifs/fcm/
-
fcm/
-
token.rs

[Tunnelbroker] implement FCM Access Token lifetime
ClosedPublic
Actions

Authored by kamil on Jul 16 2024, 1:21 AM.

Details

Reviewers

bartek
marcin

Commits

rCOMMcb4ca298599a: [Tunnelbroker] implement FCM Access Token lifetime

Summary

Implementing what is described in Google's OAuth 2.0 for Server to Server Applications.

Depends on D12765

Test Plan

Call get_auth_bearer and make sure it's regenerated when needed. Later in the stack I tested both sending notif with correct and incorrect access token

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kamil created this revision.Jul 16 2024, 1:21 AM

kamil held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 16 2024, 1:21 AM

kamil added a child revision: D12767: [Tunnelbroker] implement messages types to FCM service.Jul 16 2024, 1:23 AM

Harbormaster completed remote builds in B30361: Diff 42323.Jul 16 2024, 1:38 AM

kamil published this revision for review.Jul 16 2024, 2:38 AM

kamil edited the test plan for this revision. (Show Details)

kamil added inline comments.

services/tunnelbroker/src/notifs/fcm/token.rs
103–104 ↗	(On Diff #42323)	`FCM_ACCESS_TOKEN_GENERATION_THRESHOLD` is to handle time between this check and actual API call to send Firebase message

bartek mentioned this in D12754: [Tunnelbroker] implement OAuth 2.0 JWT token encoding.Jul 18 2024, 7:15 AM

bartek accepted this revision.Jul 18 2024, 7:19 AM

bartek added inline comments.

services/tunnelbroker/src/notifs/fcm/token.rs
98 ↗	(On Diff #42323)	IMO a bit more natural

This revision is now accepted and ready to land.Jul 18 2024, 7:19 AM

rename

Harbormaster completed remote builds in B30505: Diff 42518.Jul 19 2024, 2:34 AM

Closed by commit rCOMMcb4ca298599a: [Tunnelbroker] implement FCM Access Token lifetime (authored by kamil). · Explain WhyJul 19 2024, 5:05 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMMcb4ca298599a: [Tunnelbroker] implement FCM Access Token lifetime.

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

src/

constants.rs

1 line

notifs/

fcm/

token.rs

40 lines

Diff 42526

View Options

services/tunnelbroker/src/constants.rs

Show All 14 Lines
import type { MessageSentStatus } from '../types/tunnelbroker/message-to-device-request-status-types.js';		import type { MessageSentStatus } from '../types/tunnelbroker/message-to-device-request-status-types.js';
import type { MessageToDeviceRequest } from '../types/tunnelbroker/message-to-device-request-types.js';		import type { MessageToDeviceRequest } from '../types/tunnelbroker/message-to-device-request-types.js';
import type { MessageToTunnelbrokerRequest } from '../types/tunnelbroker/message-to-tunnelbroker-request-types.js';		import type { MessageToTunnelbrokerRequest } from '../types/tunnelbroker/message-to-tunnelbroker-request-types.js';
import {		import {
type TunnelbrokerMessage,		type TunnelbrokerMessage,
tunnelbrokerMessageTypes,		tunnelbrokerMessageTypes,
tunnelbrokerMessageValidator,		tunnelbrokerMessageValidator,
} from '../types/tunnelbroker/messages.js';		} from '../types/tunnelbroker/messages.js';
import type { TunnelbrokerAPNsNotif } from '../types/tunnelbroker/notif-types.js';		import type {
		TunnelbrokerAPNsNotif,
		TunnelbrokerFCMNotif,
		} from '../types/tunnelbroker/notif-types.js';
import type {		import type {
AnonymousInitializationMessage,		AnonymousInitializationMessage,
ConnectionInitializationMessage,		ConnectionInitializationMessage,
TunnelbrokerInitializationMessage,		TunnelbrokerInitializationMessage,
TunnelbrokerDeviceTypes,		TunnelbrokerDeviceTypes,
} from '../types/tunnelbroker/session-types.js';		} from '../types/tunnelbroker/session-types.js';
import type { Heartbeat } from '../types/websocket/heartbeat-types.js';		import type { Heartbeat } from '../types/websocket/heartbeat-types.js';
import { getConfig } from '../utils/config.js';		import { getConfig } from '../utils/config.js';
Show All 24 Lines	\| {
+connected: false,		+connected: false,
};		};

type TunnelbrokerContextType = {		type TunnelbrokerContextType = {
+sendMessage: (		+sendMessage: (
message: TunnelbrokerClientMessageToDevice,		message: TunnelbrokerClientMessageToDevice,
messageID: ?string,		messageID: ?string,
) => Promise<void>,		) => Promise<void>,
+sendNotif: (notif: TunnelbrokerAPNsNotif) => Promise<void>,		+sendNotif: (
		notif: TunnelbrokerAPNsNotif \| TunnelbrokerFCMNotif,
		) => Promise<void>,
+sendMessageToTunnelbroker: (payload: string) => Promise<void>,		+sendMessageToTunnelbroker: (payload: string) => Promise<void>,
+addListener: (listener: TunnelbrokerSocketListener) => void,		+addListener: (listener: TunnelbrokerSocketListener) => void,
+removeListener: (listener: TunnelbrokerSocketListener) => void,		+removeListener: (listener: TunnelbrokerSocketListener) => void,
+socketState: TunnelbrokerSocketState,		+socketState: TunnelbrokerSocketState,
+setUnauthorizedDeviceID: (unauthorizedDeviceID: ?string) => void,		+setUnauthorizedDeviceID: (unauthorizedDeviceID: ?string) => void,
};		};

const TunnelbrokerContext: React.Context<?TunnelbrokerContextType> =		const TunnelbrokerContext: React.Context<?TunnelbrokerContextType> =
▲ Show 20 Lines • Show All 238 Lines • ▼ Show 20 Lines	React.useEffect(() => {
createInitMessage,		createInitMessage,
socketState.connected,		socketState.connected,
]);		]);

const sendMessageToDeviceRequest: (		const sendMessageToDeviceRequest: (
request:		request:
\| MessageToDeviceRequest		\| MessageToDeviceRequest
\| MessageToTunnelbrokerRequest		\| MessageToTunnelbrokerRequest
\| TunnelbrokerAPNsNotif,		\| TunnelbrokerAPNsNotif
		\| TunnelbrokerFCMNotif,
) => Promise<void> = React.useCallback(		) => Promise<void> = React.useCallback(
request => {		request => {
return new Promise((resolve, reject) => {		return new Promise((resolve, reject) => {
const socketActive = socketState.connected && socket.current;		const socketActive = socketState.connected && socket.current;
if (!shouldBeClosed && !socketActive) {		if (!shouldBeClosed && !socketActive) {
throw new Error('Tunnelbroker not connected');		throw new Error('Tunnelbroker not connected');
}		}
promises.current[request.clientMessageID] = {		promises.current[request.clientMessageID] = {
▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines