Skip to content
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

Fix code scanning alert no. 569: Client-side cross-site scripting #901

Closed
wants to merge 7 commits into from
Closed

Fix code scanning alert no. 569: Client-side cross-site scripting #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34e797b
Fix code scanning alert no. 569: Client-side cross-site scripting
bitpredator Nov 27, 2024
382baee
Merge branch 'main' into alert-autofix-569
bitpredator Nov 27, 2024
bf16aa9
Merge branch 'main' into alert-autofix-569
bitpredator Nov 29, 2024
b003e7c
Merge branch 'main' into alert-autofix-569
bitpredator Dec 8, 2024
665f5a2
Merge branch 'main' into alert-autofix-569
bitpredator Dec 10, 2024
6c8b409
Merge branch 'main' into alert-autofix-569
bitpredator Dec 16, 2024
bd7ba56
Merge branch 'main' into alert-autofix-569
bitpredator Dec 18, 2024
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
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"devDependencies": {
"eslint": "^9.17.0"
},
"dependencies": {
"dompurify": "^3.2.1"
}
}
29 changes: 19 additions & 10 deletions server-data/resources/[esx_addons]/ps-dispatch/ui/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import DOMPurify from 'dompurify';

$(document).ready(() => {
window.addEventListener('message', function (event) {
let data = event.data;
Expand Down Expand Up @@ -82,10 +84,13 @@ function timeAgo(dateParam) {
function addNewCall(callID, timer, info, isPolice) {
const prio = info['priority'];
let DispatchItem;
const sanitizedCallID = DOMPurify.sanitize(callID);
const sanitizedDispatchCode = DOMPurify.sanitize(info.dispatchCode);
const sanitizedDispatchMessage = DOMPurify.sanitize(info.dispatchMessage);
if (info['isDead']) {
DispatchItem = `<div class="dispatch-item ${callID} dispatch-item-${info['isDead']} animate__animated"><div class="top-info-holder"><div class="call-id">#${callID}</div><div class="call-code priority-${prio}">${info.dispatchCode}</div><div class="call-name">${info.dispatchMessage}</div></div><div class="bottom-info-holder">`;
DispatchItem = `<div class="dispatch-item ${sanitizedCallID} dispatch-item-${info['isDead']} animate__animated"><div class="top-info-holder"><div class="call-id">#${sanitizedCallID}</div><div class="call-code priority-${prio}">${sanitizedDispatchCode}</div><div class="call-name">${sanitizedDispatchMessage}</div></div><div class="bottom-info-holder">`;
} else {
DispatchItem = `<div class="dispatch-item ${callID} dispatch-item-${isPolice} animate__animated"><div class="top-info-holder"><div class="call-id">#${callID}</div><div class="call-code priority-${prio}">${info.dispatchCode}</div><div class="call-name">${info.dispatchMessage}</div></div><div class="bottom-info-holder">`;
DispatchItem = `<div class="dispatch-item ${sanitizedCallID} dispatch-item-${isPolice} animate__animated"><div class="top-info-holder"><div class="call-id">#${sanitizedCallID}</div><div class="call-code priority-${prio}">${sanitizedDispatchCode}</div><div class="call-name">${sanitizedDispatchMessage}</div></div><div class="bottom-info-holder">`;
}

// Above we are defining a default dispatch item and then we will append the data we have been sent.
Expand Down Expand Up @@ -139,16 +144,20 @@ function addNewCall(callID, timer, info, isPolice) {
DispatchItem += `<div class="call-bottom-info"><span class="fab fa-blackberry"></span>Automatic Gunfire</div>`;
}

if (info['name'] && info['number']) {
DispatchItem += `<div class="call-bottom-info"><span class="far fa-id-badge"></span>${info['name']}<span class="fas fa-mobile-alt" style="margin-left: 2vh;"></span>${info['number']}</div>`;
} else if (info['number']) {
DispatchItem += `<div class="call-bottom-info"><span class="fas fa-mobile-alt"></span>${info['number']}</div>`;
} else if (info['name']) {
DispatchItem += `<div class="call-bottom-info"><span class="far fa-id-badge"></span>${info['name']}</div>`;
const sanitizedName = DOMPurify.sanitize(info['name']);
const sanitizedNumber = DOMPurify.sanitize(info['number']);
const sanitizedInformation = DOMPurify.sanitize(info['information']);

if (sanitizedName && sanitizedNumber) {
DispatchItem += `<div class="call-bottom-info"><span class="far fa-id-badge"></span>${sanitizedName}<span class="fas fa-mobile-alt" style="margin-left: 2vh;"></span>${sanitizedNumber}</div>`;
} else if (sanitizedNumber) {
DispatchItem += `<div class="call-bottom-info"><span class="fas fa-mobile-alt"></span>${sanitizedNumber}</div>`;
} else if (sanitizedName) {
DispatchItem += `<div class="call-bottom-info"><span class="far fa-id-badge"></span>${sanitizedName}</div>`;
}

if (info['information']) {
DispatchItem += `<div class="line"></div><div class="call-bottom-info call-bottom-information"><span class="far fa-question-circle"></span>${info['information']}</div>`;
if (sanitizedInformation) {
DispatchItem += `<div class="line"></div><div class="call-bottom-info call-bottom-information"><span class="far fa-question-circle"></span>${sanitizedInformation}</div>`;
}

DispatchItem += `</div></div>`;
Expand Down
Loading