Page MenuHomePhabricator
Differential D7480

[Tunnelbroker] Create session creation and key messages
ClosedPublic
Actions

Authored by • jon on Apr 17 2023, 6:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 27, 1:46 AM
Unknown Object (File)
Mon, Mar 24, 2:39 PM
Unknown Object (File)
Wed, Mar 12, 3:22 AM
Unknown Object (File)
Tue, Mar 11, 5:43 PM
Unknown Object (File)
Wed, Mar 5, 4:59 PM
Unknown Object (File)
Wed, Mar 5, 2:12 PM
Unknown Object (File)
Wed, Mar 5, 2:58 AM
Unknown Object (File)
Tue, Mar 4, 11:42 PM
View All Files
Subscribers
atul
tomek

Details

Reviewers
varun
bartek
• max
ashoat
Commits
rCOMMbb6772194b9a: [Tunnelbroker] Create session creation and key messages
Summary

Remove "legacy" tunnelbroker api messages, and replace with
websocket messages.

Part of https://linear.app/comm/issue/ENG-3676

Depends on D7431

Test Plan

This is more intended to be a design diff. However, deserialization is tested

cd shared/tunnelbroker_messages
cargo test

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Apr 17 2023, 6:35 PM
Herald added subscribers: atul, tomek. · View Herald TranscriptApr 17 2023, 6:35 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Apr 17 2023, 6:38 PM
Harbormaster failed remote builds in B18432: Diff 25247!
• jon updated this revision to Diff 25250.Apr 17 2023, 6:49 PM

Rebase on changes

Harbormaster returned this revision to the author for changes because remote builds failed.Apr 17 2023, 6:54 PM
Harbormaster failed remote builds in B18435: Diff 25250!
• jon updated this revision to Diff 25266.Apr 18 2023, 7:59 AM

Rebase on fixes

Harbormaster completed remote builds in B18449: Diff 25266.Apr 18 2023, 8:16 AM
• jon requested review of this revision.Apr 18 2023, 8:16 AM
ashoat resigned from this revision.Apr 18 2023, 9:20 AM

New libraries look good!! Resigning so that somebody else on the team looks at the Rust code

bartek accepted this revision.Apr 18 2023, 11:46 AM

Rust looks good

This revision is now accepted and ready to land.Apr 18 2023, 11:46 AM
Closed by commit rCOMMbb6772194b9a: [Tunnelbroker] Create session creation and key messages (authored by • jon). · Explain WhyApr 19 2023, 10:25 AM
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMMbb6772194b9a: [Tunnelbroker] Create session creation and key messages.
kamil mentioned this in D8752: [Keyserver] Upload new onetime keys to identity service when requested.Sep 13 2023, 6:10 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
websockets/
2 lines
shared/
tunnelbroker_messages/
1 line
10 lines
src/
3 lines
messages/
28 lines
6 lines
68 lines

Diff 25364

View Options

services/tunnelbroker/src/websockets/messages.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

services/tunnelbroker/src/websockets/mod.rs

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

shared/tunnelbroker_messages/.gitignore

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

shared/tunnelbroker_messages/Cargo.lock

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

shared/tunnelbroker_messages/Cargo.toml

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

shared/tunnelbroker_messages/src/lib.rs

Loading...
View Options

shared/tunnelbroker_messages/src/messages/keys.rs

Loading...
View Options

shared/tunnelbroker_messages/src/messages/mod.rs

Loading...
View Options

shared/tunnelbroker_messages/src/messages/session.rs

Loading...