Page MenuHomePhabricator
Differential D7808

[keyserver] Convert upload responders
ClosedPublic
Actions

Authored by michal on May 15 2023, 3:57 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 8:36 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)
Sat, Mar 8, 5:01 AM
Unknown Object (File)
Thu, Mar 6, 2:52 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
kamil
tomek
Commits
rCOMMc095237c8405: [keyserver] Convert upload responders
Summary

Adds validators for upload responders.

Depends on D7807

Test Plan

Try sending a photo and a video, check if there are any errors.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

michal created this revision.May 15 2023, 3:57 AM
Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 15 2023, 3:57 AM
Harbormaster completed remote builds in B19334: Diff 26448.May 15 2023, 4:15 AM
michal requested review of this revision.May 15 2023, 4:15 AM
tomek accepted this revision.May 16 2023, 3:32 AM
tomek added inline comments.
keyserver/src/uploads/uploads.js
223 ↗(On Diff #26448)

Why the original type was concrete instead of any / mixed? Do we have to replace it with mixed?

This revision is now accepted and ready to land.May 16 2023, 3:32 AM
michal added inline comments.May 16 2023, 9:47 AM
keyserver/src/uploads/uploads.js
223 ↗(On Diff #26448)

@tomek Not sure, I think it was just a mistake, I can't find any additional input validation for this responder in particular.
I also tested it just now and was able to send anything to this responder and it only tripped on the newly added validateInput.

michal added a child revision: D7848: [keyserver] Validate fetchPrimaryInviteLinksResponder output.May 17 2023, 2:31 AM
michal updated this revision to Diff 26592.May 17 2023, 3:42 AM

Rebase, validate uploadMediaMetadataResponder, fix bug with uploadDownloadResponder

michal requested review of this revision.May 17 2023, 3:50 AM
michal added inline comments.
keyserver/src/uploads/uploads.js
158 ↗(On Diff #26592)

These are not converted because they come from the upload URI. We could convert them here but then on the output side we would need to convert them by adding a new tURI and then have the conversion function parse the URL and convert only the id inside it but I don't think that's needed.
These URIs already have the Comm keyserver hardcoded, so it will require even more changes anyway when we are adding multi keyserver support. And if in the future all uploads will be handled by blob service, this endpoint won't be even needed.

Harbormaster completed remote builds in B19442: Diff 26592.May 17 2023, 4:12 AM
tomek accepted this revision.May 19 2023, 12:58 AM
This revision is now accepted and ready to land.May 19 2023, 12:58 AM
Closed by commit rCOMMc095237c8405: [keyserver] Convert upload responders (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMay 22 2023, 4:32 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMc095237c8405: [keyserver] Convert upload responders.

Revision Contents
Changeset List

PathSize
keyserver/
src/
uploads/
59 lines
lib/
types/
9 lines

Diff 26757

View Options

keyserver/src/uploads/uploads.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines
View Options

lib/types/media-types.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines