Page MenuHomePhabricator
Differential D7749

[keyserver] Validate websocket output
ClosedPublic
Actions

Authored by michal on May 9 2023, 1:36 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 28, 8:55 AM
Unknown Object (File)
Mon, Mar 17, 12:55 PM
Unknown Object (File)
Mon, Mar 17, 12:55 PM
Unknown Object (File)
Mon, Mar 17, 12:55 PM
Unknown Object (File)
Mon, Mar 17, 12:54 PM
Unknown Object (File)
Mon, Mar 17, 12:39 PM
Unknown Object (File)
Tue, Mar 11, 7:41 PM
Unknown Object (File)
Tue, Mar 11, 3:32 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
kamil
tomek
Commits
rCOMM018eff6c2ed6: [keyserver] Validate websocket output
Summary

Adds validators for server socket messages with tests, and enables output validation in the socket implementation.

Depends on D7714

Test Plan

Check if web and ios app work fine, and there aren't any errors.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

michal created this revision.May 9 2023, 1:36 AM
Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 9 2023, 1:37 AM
michal added inline comments.May 9 2023, 1:40 AM
keyserver/src/socket/socket.js
380–392 ↗(On Diff #26241)

If there's no viewer we can't be sure if we want to convert the ids (could be an old client). But this should happen only in case of an error, and none of the error payloads contain ids.

lib/types/socket-types.js
407 ↗(On Diff #26241)

The payload from the responders will be converted already.

michal mentioned this in D7750: [keyserver] Convert websocket input.May 9 2023, 1:43 AM
Harbormaster completed remote builds in B19160: Diff 26241.May 9 2023, 1:54 AM
michal requested review of this revision.May 9 2023, 1:54 AM
tomek accepted this revision.May 10 2023, 1:02 AM
tomek added inline comments.
keyserver/src/socket/socket.js
380–392 ↗(On Diff #26241)

I guess we can still validate the response. There's nothing wrong in doing that.

This revision is now accepted and ready to land.May 10 2023, 1:02 AM
michal added a child revision: D7750: [keyserver] Convert websocket input.May 10 2023, 6:54 AM
michal added a child revision: D7783: [lib] Split thread-types.May 10 2023, 9:49 AM
michal removed a child revision: D7783: [lib] Split thread-types.May 11 2023, 2:14 AM
michal updated this revision to Diff 26443.May 15 2023, 3:42 AM
  • Validate also when viewer is null (when error socket message is sent)
  • APIResponseServerSocketMessage can have no payload (for example when calling deviceTokenUpdateResponder which returns void). Updated the socket type and the validator to match this
michal added a child revision: D7783: [lib] Split thread-types.May 15 2023, 3:45 AM
Harbormaster completed remote builds in B19329: Diff 26443.May 15 2023, 4:00 AM
Closed by commit rCOMM018eff6c2ed6: [keyserver] Validate websocket output (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMay 15 2023, 5:00 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMM018eff6c2ed6: [keyserver] Validate websocket output.
Michal Gniadek <michal.gniadek@swmansion.com> mentioned this in rCOMMd5d2636c589e: [keyserver] Convert websocket input.

Revision Contents
Changeset List

PathSize
keyserver/
src/
socket/
10 lines
utils/
6 lines
lib/
types/
10 lines
74 lines
173 lines
11 lines
11 lines
261 lines

Diff 26454

View Options

keyserver/src/socket/socket.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

keyserver/src/utils/validation-utils.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

lib/types/message-types.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

lib/types/request-types.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

lib/types/socket-types.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

lib/types/update-types.js

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines const changeThreadSettingsAction = React.useCallback(async () => {
try { try {
setErrorMessage(''); setErrorMessage('');
return await callChangeThreadSettings({ return await callChangeThreadSettings({
threadID: threadInfo.id, threadID: threadInfo.id,
changes: queuedChanges, changes: queuedChanges,
}); });
} catch (e) { } catch (e) {
setErrorMessage('unknown_error'); setErrorMessage('unknown_error');
setQueuedChanges(Object.freeze({}));
throw e; throw e;
} finally {
setQueuedChanges(Object.freeze({}));
} }
}, [ }, [
callChangeThreadSettings, callChangeThreadSettings,
queuedChanges, queuedChanges,
setErrorMessage, setErrorMessage,
setQueuedChanges, setQueuedChanges,
threadInfo.id, threadInfo.id,
]); ]);
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines
View Options

lib/types/user-types.js

Loading...
View Options

lib/types/validation.test.js

Loading...