Skip to content

[FIX] Agent's custom fields being leaked through the Livechat configuration endpoint #17640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renatobecker merged 2 commits into from
May 19, 2020
Merged

[FIX] Agent's custom fields being leaked through the Livechat configuration endpoint #17640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bc626f
Fix the leak of agent's custom fields.
renatobecker May 13, 2020
c007dfc
Merge branch 'develop' into omnichannel/fix-leaking-custom-fields
renatobecker May 19, 2020
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
35 changes: 34 additions & 1 deletion app/livechat/server/lib/Helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,45 @@ export const removeAgentFromSubscription = (rid, { _id, username }) => {
Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.IPostLivechatAgentUnassigned, { room, user });
};

export const parseAgentCustomFields = (customFields) => {
if (!customFields) {
return;
}

const externalCustomFields = () => {
const accountCustomFields = settings.get('Accounts_CustomFields');
if (!accountCustomFields || accountCustomFields.trim() === '') {
return [];
}

try {
const parseCustomFields = JSON.parse(accountCustomFields);
return Object.keys(parseCustomFields)
.filter((customFieldKey) => parseCustomFields[customFieldKey].sendToIntegrations === true);
} catch (error) {
console.error(error);
return [];
}
};

const externalCF = externalCustomFields();
return Object.keys(customFields).reduce((newObj, key) => (externalCF.includes(key) ? { ...newObj, [key]: customFields[key] } : newObj), null);
};

export const normalizeAgent = (agentId) => {
if (!agentId) {
return;
}

return settings.get('Livechat_show_agent_info') ? Users.getAgentInfo(agentId) : { hiddenInfo: true };
if (!settings.get('Livechat_show_agent_info')) {
return { hiddenInfo: true };
}

const agent = Users.getAgentInfo(agentId);
const { customFields: agentCustomFields, ...extraData } = agent;
const customFields = parseAgentCustomFields(agentCustomFields);

return Object.assign(extraData, { ...customFields && { customFields } });
};

export const dispatchAgentDelegated = (rid, agentId) => {
Expand Down
16 changes: 2 additions & 14 deletions app/livechat/server/lib/Livechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { sendMessage } from '../../../lib/server/functions/sendMessage';
import { updateMessage } from '../../../lib/server/functions/updateMessage';
import { deleteMessage } from '../../../lib/server/functions/deleteMessage';
import { FileUpload } from '../../../file-upload/server';
import { normalizeTransferredByData } from './Helper';
import { normalizeTransferredByData, parseAgentCustomFields } from './Helper';
import { Apps } from '../../../apps/server';

export const Livechat = {
Expand Down Expand Up @@ -649,16 +649,6 @@ export const Livechat = {
const visitor = LivechatVisitors.findOneById(room.v._id);
const agent = Users.findOneById(room.servedBy && room.servedBy._id);

const externalCustomFields = () => {
try {
const customFields = JSON.parse(settings.get('Accounts_CustomFields'));
return Object.keys(customFields)
.filter((customFieldKey) => customFields[customFieldKey].sendToIntegrations === true);
} catch (error) {
return [];
}
};

const ua = new UAParser();
ua.setUA(visitor.userAgent);

Expand Down Expand Up @@ -686,9 +676,7 @@ export const Livechat = {
};

if (agent) {
const { customFields: agentCustomFields = {} } = agent;
const externalCF = externalCustomFields();
const customFields = Object.keys(agentCustomFields).reduce((newObj, key) => (externalCF.includes(key) ? { ...newObj, [key]: agentCustomFields[key] } : newObj), null);
const customFields = parseAgentCustomFields(agent.customFields);

postData.agent = {
_id: agent._id,
Expand Down