Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/proud-rabbits-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': major
---

Removes unsafe selector parameter from livechat autocomplete endpoints
9 changes: 2 additions & 7 deletions apps/meteor/server/api/v1/omnichannel/departments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
findArchivedDepartments,
} from './lib/departments';
import { hasPermissionAsync } from '../../../lib/authorization/hasPermission';
import { apiDeprecationLogger } from '../../../lib/deprecationWarningLogger';
import {
saveDepartment,
archiveDepartment,
Expand Down Expand Up @@ -255,16 +254,12 @@ API.v1.addRoute(
return API.v1.failure("The 'selector' param is required");
}

const parsedSelector = JSON.parse(selector);

if (parsedSelector.conditions && Object.keys(parsedSelector.conditions).length > 0) {
apiDeprecationLogger.parameter(this.route, 'conditions', '9.0.0', this.response);
}
const { term, exceptions } = JSON.parse(selector);

return API.v1.success(
await findDepartmentsToAutocomplete({
uid: this.userId,
selector: parsedSelector,
selector: { term, exceptions },
onlyMyDepartments: onlyMyDepartments === 'true',
showArchived: showArchived === 'true',
}),
Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/server/api/v1/omnichannel/lib/departments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ type FindDepartmentByIdParams = {
type FindDepartmentToAutocompleteParams = {
uid: string;
selector: {
exceptions: string[];
conditions: Filter<ILivechatDepartment>;
exceptions?: string[];
term: string;
};
onlyMyDepartments?: boolean;
Expand Down Expand Up @@ -143,7 +142,7 @@ export async function findDepartmentsToAutocomplete({
showArchived = false,
}: FindDepartmentToAutocompleteParams): Promise<{ items: Pick<ILivechatDepartment, '_id' | 'name'>[] }> {
const { exceptions = [] } = selector;
let { conditions = {} } = selector;
let conditions: Filter<ILivechatDepartment> = {};

if (onlyMyDepartments) {
conditions = await applyDepartmentRestrictions(conditions, uid);
Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/server/api/v1/omnichannel/lib/visitors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,10 @@ export async function findVisitorsToAutocomplete({
}: {
selector: {
exceptions?: ILivechatVisitor['_id'][];
conditions?: Record<string, unknown>;
term: string;
};
}) {
const { exceptions = [], conditions = {} } = selector;
const { exceptions = [] } = selector;

const options: FindOptions<ILivechatVisitor> = {
projection: {
Expand All @@ -167,7 +166,7 @@ export async function findVisitorsToAutocomplete({
},
};

const items = await LivechatVisitors.findByNameRegexWithExceptionsAndConditions(selector.term, exceptions, conditions, options).toArray();
const items = await LivechatVisitors.findByNameRegexWithExceptionsAndConditions(selector.term, exceptions, {}, options).toArray();
return {
items,
};
Expand Down
9 changes: 2 additions & 7 deletions apps/meteor/server/api/v1/omnichannel/visitors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
findVisitorsByEmailOrPhoneOrNameOrUsernameOrCustomField,
} from './lib/visitors';
import { canAccessRoomAsync } from '../../../lib/authorization';
import { apiDeprecationLogger } from '../../../lib/deprecationWarningLogger';
import { normalizeMessagesForUser } from '../../../lib/utils/lib/normalizeMessagesForUser';
import { getPaginationItems } from '../../lib/getPaginationItems';

Expand Down Expand Up @@ -121,15 +120,11 @@ API.v1.addRoute(
{
async get() {
const { selector } = this.queryParams;
const parsedSelector = JSON.parse(selector);

if (parsedSelector.conditions && Object.keys(parsedSelector.conditions).length > 0) {
apiDeprecationLogger.parameter(this.route, 'conditions', '9.0.0', this.response);
}
const { term, exceptions } = JSON.parse(selector);

return API.v1.success(
await findVisitorsToAutocomplete({
selector: parsedSelector,
selector: { term, exceptions },
}),
);
},
Expand Down
Loading