Page MenuHomePhabricator
Differential D13646

[comm-lib][blob] Add tags support to remove holders request payload
ClosedPublic
Actions

Authored by bartek on Oct 9 2024, 1:20 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 24, 4:07 AM
Unknown Object (File)
Tue, Apr 22, 1:44 PM
Unknown Object (File)
Tue, Apr 22, 1:13 AM
Unknown Object (File)
Mon, Apr 21, 11:37 PM
Unknown Object (File)
Mon, Apr 21, 6:06 AM
Unknown Object (File)
Thu, Apr 17, 10:53 AM
Unknown Object (File)
Wed, Apr 16, 2:29 AM
Unknown Object (File)
Tue, Apr 1, 6:18 PM
View All 90 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
varun
will
Commits
rCOMM6c8640428254: [comm-lib][blob] Add tags support to remove holders request payload
Summary

Expanded RemoveHoldersRequest to support either current payload format, or the new one that
removes holders that matches given tags. The new format is not supported yet, so added HTTP 501 Unimplemented response server side.

Depends on D13645

Test Plan

Unit tests for serialize/deserialize to make sure that existing request format is untouched.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
services/
blob/
src/
http/
handlers/
9 lines
shared/
comm-lib/
src/
blob/
2 lines
90 lines

Diff 44996

View Options

services/blob/src/http/handlers/holders.rs

Show All 20 Lines
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function SecondaryDeviceQRCodeScanner(props: Props): React.Node { function SecondaryDeviceQRCodeScanner(props: Props): React.Node {
const [hasPermission, setHasPermission] = React.useState<?boolean>(null); const [hasPermission, setHasPermission] = React.useState<?boolean>(null);
const [scanned, setScanned] = React.useState(false); const [scanned, setScanned] = React.useState(false);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const navigation = useNavigation(); const navigation = useNavigation();
const tunnelbrokerContext = useTunnelbroker();
const identityContext = React.useContext(IdentityClientContext);
const addDeviceToList = React.useCallback(
async (newDeviceID: string) => {
invariant(identityContext, 'identity context not set');
const { getDeviceListHistoryForUser, updateDeviceList } =
identityContext.identityClient;
invariant(
updateDeviceList,
'updateDeviceList() should be defined for primary device',
);
const authMetadata = await identityContext.getAuthMetadata();
if (!authMetadata?.userID) {
throw new Error('missing auth metadata');
}
const deviceLists = await getDeviceListHistoryForUser(
authMetadata.userID,
);
const lastSignedDeviceList = deviceLists[deviceLists.length - 1];
const deviceList: RawDeviceList = JSON.parse(
lastSignedDeviceList.rawDeviceList,
);
const { devices } = deviceList;
if (!devices.includes(newDeviceID)) {
const newDeviceList: RawDeviceList = {
devices: [...devices, newDeviceID],
timestamp: Date.now(),
};
await updateDeviceList({
rawDeviceList: JSON.stringify(newDeviceList),
});
return true;
} else {
return false;
}
},
[identityContext],
);
React.useEffect(() => { React.useEffect(() => {
void (async () => { void (async () => {
const { status } = await BarCodeScanner.requestPermissionsAsync(); const { status } = await BarCodeScanner.requestPermissionsAsync();
setHasPermission(status === 'granted'); setHasPermission(status === 'granted');
if (status !== 'granted') { if (status !== 'granted') {
Alert.alert( Alert.alert(
'No access to camera', 'No access to camera',
'Please allow Comm to access your camera in order to scan the QR code.', 'Please allow Comm to access your camera in order to scan the QR code.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
navigation.goBack(); navigation.goBack();
} }
})(); })();
}, [navigation]); }, [navigation]);
const onConnect = React.useCallback((barCodeEvent: BarCodeEvent) => { const onConnect = React.useCallback(
(barCodeEvent: BarCodeEvent) => {
const { data } = barCodeEvent; const { data } = barCodeEvent;
const parsedData = parseDataFromDeepLink(data); const parsedData = parseDataFromDeepLink(data);
const keysMatch = parsedData?.data?.keys; const keysMatch = parsedData?.data?.keys;
if (!parsedData || !keysMatch) { if (!parsedData || !keysMatch) {
Alert.alert( Alert.alert(
'Scan failed', 'Scan failed',
'QR code does not contain a valid pair of keys.', 'QR code does not contain a valid pair of keys.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
return; return;
} }
const keys = JSON.parse(decodeURIComponent(keysMatch)); const keys = JSON.parse(decodeURIComponent(keysMatch));
const { aes256, ed25519 } = keys;
void (async () => {
try {
invariant(identityContext, 'identity context not set');
const { deviceID: primaryDeviceID, userID } =
await identityContext.getAuthMetadata();
if (!primaryDeviceID || !userID) {
throw new Error('missing auth metadata');
}
await addDeviceToList(ed25519);
const message = createQRAuthTunnelbrokerMessage(aes256, {
type: qrCodeAuthMessageTypes.DEVICE_LIST_UPDATE_SUCCESS,
userID,
primaryDeviceID,
});
await tunnelbrokerContext.sendMessage({
deviceID: ed25519,
payload: JSON.stringify(message),
});
} catch (err) {
console.log('Primary device error:', err);
Alert.alert( Alert.alert(
'Scan successful', 'Adding device failed',
`QR code contains the following keys: ${JSON.stringify(keys)}`, 'Failed to update the device list',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
}, []); navigation.goBack();
}
})();
},
[
tunnelbrokerContext,
addDeviceToList,
identityContext,
navigation,
],
);
const onCancelScan = React.useCallback(() => setScanned(false), []); const onCancelScan = React.useCallback(() => setScanned(false), []);
const handleBarCodeScanned = React.useCallback( const handleBarCodeScanned = React.useCallback(
(barCodeEvent: BarCodeEvent) => { (barCodeEvent: BarCodeEvent) => {
setScanned(true); setScanned(true);
Alert.alert( Alert.alert(
'Connect with this device?', 'Connect with this device?',
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines
View Options

shared/comm-lib/src/blob/client.rs

Show All 20 Lines
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function SecondaryDeviceQRCodeScanner(props: Props): React.Node { function SecondaryDeviceQRCodeScanner(props: Props): React.Node {
const [hasPermission, setHasPermission] = React.useState<?boolean>(null); const [hasPermission, setHasPermission] = React.useState<?boolean>(null);
const [scanned, setScanned] = React.useState(false); const [scanned, setScanned] = React.useState(false);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const navigation = useNavigation(); const navigation = useNavigation();
const tunnelbrokerContext = useTunnelbroker();
const identityContext = React.useContext(IdentityClientContext);
const addDeviceToList = React.useCallback(
async (newDeviceID: string) => {
invariant(identityContext, 'identity context not set');
const { getDeviceListHistoryForUser, updateDeviceList } =
identityContext.identityClient;
invariant(
updateDeviceList,
'updateDeviceList() should be defined for primary device',
);
const authMetadata = await identityContext.getAuthMetadata();
if (!authMetadata?.userID) {
throw new Error('missing auth metadata');
}
const deviceLists = await getDeviceListHistoryForUser(
authMetadata.userID,
);
const lastSignedDeviceList = deviceLists[deviceLists.length - 1];
const deviceList: RawDeviceList = JSON.parse(
lastSignedDeviceList.rawDeviceList,
);
const { devices } = deviceList;
if (!devices.includes(newDeviceID)) {
const newDeviceList: RawDeviceList = {
devices: [...devices, newDeviceID],
timestamp: Date.now(),
};
await updateDeviceList({
rawDeviceList: JSON.stringify(newDeviceList),
});
return true;
} else {
return false;
}
},
[identityContext],
);
React.useEffect(() => { React.useEffect(() => {
void (async () => { void (async () => {
const { status } = await BarCodeScanner.requestPermissionsAsync(); const { status } = await BarCodeScanner.requestPermissionsAsync();
setHasPermission(status === 'granted'); setHasPermission(status === 'granted');
if (status !== 'granted') { if (status !== 'granted') {
Alert.alert( Alert.alert(
'No access to camera', 'No access to camera',
'Please allow Comm to access your camera in order to scan the QR code.', 'Please allow Comm to access your camera in order to scan the QR code.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
navigation.goBack(); navigation.goBack();
} }
})(); })();
}, [navigation]); }, [navigation]);
const onConnect = React.useCallback((barCodeEvent: BarCodeEvent) => { const onConnect = React.useCallback(
(barCodeEvent: BarCodeEvent) => {
const { data } = barCodeEvent; const { data } = barCodeEvent;
const parsedData = parseDataFromDeepLink(data); const parsedData = parseDataFromDeepLink(data);
const keysMatch = parsedData?.data?.keys; const keysMatch = parsedData?.data?.keys;
if (!parsedData || !keysMatch) { if (!parsedData || !keysMatch) {
Alert.alert( Alert.alert(
'Scan failed', 'Scan failed',
'QR code does not contain a valid pair of keys.', 'QR code does not contain a valid pair of keys.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
return; return;
} }
const keys = JSON.parse(decodeURIComponent(keysMatch)); const keys = JSON.parse(decodeURIComponent(keysMatch));
const { aes256, ed25519 } = keys;
void (async () => {
try {
invariant(identityContext, 'identity context not set');
const { deviceID: primaryDeviceID, userID } =
await identityContext.getAuthMetadata();
if (!primaryDeviceID || !userID) {
throw new Error('missing auth metadata');
}
await addDeviceToList(ed25519);
const message = createQRAuthTunnelbrokerMessage(aes256, {
type: qrCodeAuthMessageTypes.DEVICE_LIST_UPDATE_SUCCESS,
userID,
primaryDeviceID,
});
await tunnelbrokerContext.sendMessage({
deviceID: ed25519,
payload: JSON.stringify(message),
});
} catch (err) {
console.log('Primary device error:', err);
Alert.alert( Alert.alert(
'Scan successful', 'Adding device failed',
`QR code contains the following keys: ${JSON.stringify(keys)}`, 'Failed to update the device list',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
}, []); navigation.goBack();
}
})();
},
[
tunnelbrokerContext,
addDeviceToList,
identityContext,
navigation,
],
);
const onCancelScan = React.useCallback(() => setScanned(false), []); const onCancelScan = React.useCallback(() => setScanned(false), []);
const handleBarCodeScanned = React.useCallback( const handleBarCodeScanned = React.useCallback(
(barCodeEvent: BarCodeEvent) => { (barCodeEvent: BarCodeEvent) => {
setScanned(true); setScanned(true);
Alert.alert( Alert.alert(
'Connect with this device?', 'Connect with this device?',
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines
View Options

shared/comm-lib/src/blob/types.rs

Show All 20 Lines
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function SecondaryDeviceQRCodeScanner(props: Props): React.Node { function SecondaryDeviceQRCodeScanner(props: Props): React.Node {
const [hasPermission, setHasPermission] = React.useState<?boolean>(null); const [hasPermission, setHasPermission] = React.useState<?boolean>(null);
const [scanned, setScanned] = React.useState(false); const [scanned, setScanned] = React.useState(false);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const navigation = useNavigation(); const navigation = useNavigation();
const tunnelbrokerContext = useTunnelbroker();
const identityContext = React.useContext(IdentityClientContext);
const addDeviceToList = React.useCallback(
async (newDeviceID: string) => {
invariant(identityContext, 'identity context not set');
const { getDeviceListHistoryForUser, updateDeviceList } =
identityContext.identityClient;
invariant(
updateDeviceList,
'updateDeviceList() should be defined for primary device',
);
const authMetadata = await identityContext.getAuthMetadata();
if (!authMetadata?.userID) {
throw new Error('missing auth metadata');
}
const deviceLists = await getDeviceListHistoryForUser(
authMetadata.userID,
);
const lastSignedDeviceList = deviceLists[deviceLists.length - 1];
const deviceList: RawDeviceList = JSON.parse(
lastSignedDeviceList.rawDeviceList,
);
const { devices } = deviceList;
if (!devices.includes(newDeviceID)) {
const newDeviceList: RawDeviceList = {
devices: [...devices, newDeviceID],
timestamp: Date.now(),
};
await updateDeviceList({
rawDeviceList: JSON.stringify(newDeviceList),
});
return true;
} else {
return false;
}
},
[identityContext],
);
React.useEffect(() => { React.useEffect(() => {
void (async () => { void (async () => {
const { status } = await BarCodeScanner.requestPermissionsAsync(); const { status } = await BarCodeScanner.requestPermissionsAsync();
setHasPermission(status === 'granted'); setHasPermission(status === 'granted');
if (status !== 'granted') { if (status !== 'granted') {
Alert.alert( Alert.alert(
'No access to camera', 'No access to camera',
'Please allow Comm to access your camera in order to scan the QR code.', 'Please allow Comm to access your camera in order to scan the QR code.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
navigation.goBack(); navigation.goBack();
} }
})(); })();
}, [navigation]); }, [navigation]);
const onConnect = React.useCallback((barCodeEvent: BarCodeEvent) => { const onConnect = React.useCallback(
(barCodeEvent: BarCodeEvent) => {
const { data } = barCodeEvent; const { data } = barCodeEvent;
const parsedData = parseDataFromDeepLink(data); const parsedData = parseDataFromDeepLink(data);
const keysMatch = parsedData?.data?.keys; const keysMatch = parsedData?.data?.keys;
if (!parsedData || !keysMatch) { if (!parsedData || !keysMatch) {
Alert.alert( Alert.alert(
'Scan failed', 'Scan failed',
'QR code does not contain a valid pair of keys.', 'QR code does not contain a valid pair of keys.',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
return; return;
} }
const keys = JSON.parse(decodeURIComponent(keysMatch)); const keys = JSON.parse(decodeURIComponent(keysMatch));
const { aes256, ed25519 } = keys;
void (async () => {
try {
invariant(identityContext, 'identity context not set');
const { deviceID: primaryDeviceID, userID } =
await identityContext.getAuthMetadata();
if (!primaryDeviceID || !userID) {
throw new Error('missing auth metadata');
}
await addDeviceToList(ed25519);
const message = createQRAuthTunnelbrokerMessage(aes256, {
type: qrCodeAuthMessageTypes.DEVICE_LIST_UPDATE_SUCCESS,
userID,
primaryDeviceID,
});
await tunnelbrokerContext.sendMessage({
deviceID: ed25519,
payload: JSON.stringify(message),
});
} catch (err) {
console.log('Primary device error:', err);
Alert.alert( Alert.alert(
'Scan successful', 'Adding device failed',
`QR code contains the following keys: ${JSON.stringify(keys)}`, 'Failed to update the device list',
[{ text: 'OK' }], [{ text: 'OK' }],
); );
}, []); navigation.goBack();
}
})();
},
[
tunnelbrokerContext,
addDeviceToList,
identityContext,
navigation,
],
);
const onCancelScan = React.useCallback(() => setScanned(false), []); const onCancelScan = React.useCallback(() => setScanned(false), []);
const handleBarCodeScanned = React.useCallback( const handleBarCodeScanned = React.useCallback(
(barCodeEvent: BarCodeEvent) => { (barCodeEvent: BarCodeEvent) => {
setScanned(true); setScanned(true);
Alert.alert( Alert.alert(
'Connect with this device?', 'Connect with this device?',
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines