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

update for XSS restrictions #586

Merged
merged 6 commits into from
Feb 27, 2023
Merged

update for XSS restrictions #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cad5ef
https://github.com/Sakura-501/Opencats-0.9.7-Vulnerabilities/blob/d08…
RussH Feb 15, 2023
158c530
Opencats-0.9.7-Reflected XSS in onChangeTag
RussH Feb 15, 2023
1c560ed
Opencats-0.9.7-Stored XSS in Calendar-Add-Event.md
RussH Feb 15, 2023
81c6a64
Update CalendarUI.php
RussH Feb 15, 2023
7739034
Updated internal module(UI).php elements to restrict XSS
RussH Feb 24, 2023
72c9c6f
updated Calendar XSS fix to use function, incremented version.
RussH Feb 27, 2023
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
2 changes: 1 addition & 1 deletion ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CATS
* AJAX Delegation Module
*
* CATS Version: 0.9.6
* CATS Version: 0.9.7.1
*
* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion careers/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CATS
* Careers Page Display Module
*
* CATS Version: 0.9.6
* CATS Version: 0.9.7.1
*
* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion constants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

/* CATS Version */

define('CATS_VERSION', '0.9.6');
define('CATS_VERSION', '0.9.7.1');


/* Copyright information at bottom of pages. */
Expand Down
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CATS
* Index (Delegation Module)
*
* CATS Version: 0.9.6
* CATS Version: 0.9.7.1
*
* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/UserInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ protected function getSanitisedInput($key, $request)
{
if (isset($request[$key]))
{
return trim(htmlspecialchars($request[$key], ENT_QUOTES));
return trim(htmlspecialchars($request[$key], ENT_QUOTES, FALSE));
}
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion modules/activity/dataGrids.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CATS
* Contacts Datagrid
*
* CATS Version: 0.9.6
* CATS Version: 0.9.7.1
*
* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
*
Expand Down
15 changes: 7 additions & 8 deletions modules/calendar/CalendarUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,10 @@ private function onAddEvent()

$publicEntry = $this->isChecked('publicEntry', $_POST);
$reminderEnabled = $this->isChecked('reminderToggle', $_POST);

$description = $this->getTrimmedInput('description', $_POST);
$title = $this->getTrimmedInput('title', $_POST);
$reminderEmail = $this->getTrimmedInput('sendEmail', $_POST);
$reminderTime = $this->getTrimmedInput('reminderTime', $_POST);
$description = $this->getSanitisedInput('description', $_POST);
$title = $this->getSanitisedInput('title', $_POST);
$reminderEmail = $this->getSanitisedInput('sendEmail', $_POST);
$reminderTime = $this->getSanitisedInput('reminderTime', $_POST);

// FIXME: Reminder time must be an integer!

Expand Down Expand Up @@ -583,9 +582,9 @@ private function onEditEvent()
$publicEntry = $this->isChecked('publicEntry', $_POST);
$reminderEnabled = $this->isChecked('reminderToggle', $_POST);

$description = $this->getTrimmedInput('description', $_POST);
$title = $this->getTrimmedInput('title', $_POST);
$reminderEmail = $this->getTrimmedInput('sendEmail', $_POST);
$description = $this->getSanitisedInput('description', $_POST);
$title = $this->getSanitisedInput('title', $_POST);
$reminderEmail = $this->getSanitisedInput('sendEmail', $_POST);
$reminderTime = $this->getTrimmedInput('reminderTime', $_POST);

// FIXME: Reminder time must be an integer!
Expand Down
88 changes: 44 additions & 44 deletions modules/candidates/CandidatesUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,27 +899,27 @@ public function checkParsingFunctions()

// Retain all field data since this isn't done over AJAX (yet)
$fields = array(
'firstName' => $this->getTrimmedInput('firstName', $_POST),
'middleName' => $this->getTrimmedInput('middleName', $_POST),
'lastName' => $this->getTrimmedInput('lastName', $_POST),
'email1' => $this->getTrimmedInput('email1', $_POST),
'email2' => $this->getTrimmedInput('email2', $_POST),
'phoneHome' => $this->getTrimmedInput('phoneHome', $_POST),
'phoneCell' => $this->getTrimmedInput('phoneCell', $_POST),
'phoneWork' => $this->getTrimmedInput('phoneWork', $_POST),
'address' => $this->getTrimmedInput('address', $_POST),
'city' => $this->getTrimmedInput('city', $_POST),
'state' => $this->getTrimmedInput('state', $_POST),
'zip' => $this->getTrimmedInput('zip', $_POST),
'firstName' => $this->getSanitisedInput('firstName', $_POST),
'middleName' => $this->getSanitisedInput('middleName', $_POST),
'lastName' => $this->getSanitisedInput('lastName', $_POST),
'email1' => $this->getSanitisedInput('email1', $_POST),
'email2' => $this->getSanitisedInput('email2', $_POST),
'phoneHome' => $this->getSanitisedInput('phoneHome', $_POST),
'phoneCell' => $this->getSanitisedInput('phoneCell', $_POST),
'phoneWork' => $this->getSanitisedInput('phoneWork', $_POST),
'address' => $this->getSanitisedInput('address', $_POST),
'city' => $this->getSanitisedInput('city', $_POST),
'state' => $this->getSanitisedInput('state', $_POST),
'zip' => $this->getSanitisedInput('zip', $_POST),
'source' => $this->getTrimmedInput('source', $_POST),
'keySkills' => $this->getTrimmedInput('keySkills', $_POST),
'currentEmployer' => $this->getTrimmedInput('currentEmployer', $_POST),
'currentPay' => $this->getTrimmedInput('currentPay', $_POST),
'desiredPay' => $this->getTrimmedInput('desiredPay', $_POST),
'notes' => $this->getTrimmedInput('notes', $_POST),
'canRelocate' => $this->getTrimmedInput('canRelocate', $_POST),
'webSite' => $this->getTrimmedInput('webSite', $_POST),
'bestTimeToCall' => $this->getTrimmedInput('bestTimeToCall', $_POST),
'keySkills' => $this->getSanitisedInput('keySkills', $_POST),
'currentEmployer' => $this->getSanitisedInput('currentEmployer', $_POST),
'currentPay' => $this->getSanitisedInput('currentPay', $_POST),
'desiredPay' => $this->getSanitisedInput('desiredPay', $_POST),
'notes' => $this->getSanitisedInput('notes', $_POST),
'canRelocate' => $this->getSanitisedInput('canRelocate', $_POST),
'webSite' => $this->getSanitisedInput('webSite', $_POST),
'bestTimeToCall' => $this->getSanitisedInput('bestTimeToCall', $_POST),
'gender' => $this->getTrimmedInput('gender', $_POST),
'race' => $this->getTrimmedInput('race', $_POST),
'veteran' => $this->getTrimmedInput('veteran', $_POST),
Expand Down Expand Up @@ -1205,39 +1205,39 @@ private function onEdit()
}

$formattedPhoneHome = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phoneHome', $_POST)
$this->getSanitisedInput('phoneHome', $_POST)
);
if (!empty($formattedPhoneHome))
{
$phoneHome = $formattedPhoneHome;
}
else
{
$phoneHome = $this->getTrimmedInput('phoneHome', $_POST);
$phoneHome = $this->getSanitisedInput('phoneHome', $_POST);
}

$formattedPhoneCell = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phoneCell', $_POST)
$this->getSanitisedInput('phoneCell', $_POST)
);
if (!empty($formattedPhoneCell))
{
$phoneCell = $formattedPhoneCell;
}
else
{
$phoneCell = $this->getTrimmedInput('phoneCell', $_POST);
$phoneCell = $this->getSanitisedInput('phoneCell', $_POST);
}

$formattedPhoneWork = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phoneWork', $_POST)
$this->getSanitisedInput('phoneWork', $_POST)
);
if (!empty($formattedPhoneWork))
{
$phoneWork = $formattedPhoneWork;
}
else
{
$phoneWork = $this->getTrimmedInput('phoneWork', $_POST);
$phoneWork = $this->getSanitisedInput('phoneWork', $_POST);
}

$candidateID = $_POST['candidateID'];
Expand Down Expand Up @@ -1310,22 +1310,22 @@ private function onEdit()
}

$isActive = $this->isChecked('isActive', $_POST);
$firstName = $this->getTrimmedInput('firstName', $_POST);
$middleName = $this->getTrimmedInput('middleName', $_POST);
$lastName = $this->getTrimmedInput('lastName', $_POST);
$email1 = $this->getTrimmedInput('email1', $_POST);
$email2 = $this->getTrimmedInput('email2', $_POST);
$address = $this->getTrimmedInput('address', $_POST);
$city = $this->getTrimmedInput('city', $_POST);
$state = $this->getTrimmedInput('state', $_POST);
$zip = $this->getTrimmedInput('zip', $_POST);
$source = $this->getTrimmedInput('source', $_POST);
$keySkills = $this->getTrimmedInput('keySkills', $_POST);
$currentEmployer = $this->getTrimmedInput('currentEmployer', $_POST);
$currentPay = $this->getTrimmedInput('currentPay', $_POST);
$desiredPay = $this->getTrimmedInput('desiredPay', $_POST);
$notes = $this->getTrimmedInput('notes', $_POST);
$webSite = $this->getTrimmedInput('webSite', $_POST);
$firstName = $this->getSanitisedInput('firstName', $_POST);
$middleName = $this->getSanitisedInput('middleName', $_POST);
$lastName = $this->getSanitisedInput('lastName', $_POST);
$email1 = $this->getSanitisedInput('email1', $_POST);
$email2 = $this->getSanitisedInput('email2', $_POST);
$address = $this->getSanitisedInput('address', $_POST);
$city = $this->getSanitisedInput('city', $_POST);
$state = $this->getSanitisedInput('state', $_POST);
$zip = $this->getSanitisedInput('zip', $_POST);
$source = $this->getSanitisedInput('source', $_POST);
$keySkills = $this->getSanitisedInput('keySkills', $_POST);
$currentEmployer = $this->getSanitisedInput('currentEmployer', $_POST);
$currentPay = $this->getSanitisedInput('currentPay', $_POST);
$desiredPay = $this->getSanitisedInput('desiredPay', $_POST);
$notes = $this->getSanitisedInput('notes', $_POST);
$webSite = $this->getSanitisedInput('webSite', $_POST);
$bestTimeToCall = $this->getTrimmedInput('bestTimeToCall', $_POST);
$gender = $this->getTrimmedInput('gender', $_POST);
$race = $this->getTrimmedInput('race', $_POST);
Expand Down Expand Up @@ -3426,8 +3426,8 @@ private function findDuplicateCandidateSearch()
{
$duplicateCandidateID = $_POST['candidateID'];
}
$query = $this->getTrimmedInput('wildCardString', $_POST);
$mode = $this->getTrimmedInput('mode', $_POST);
$query = $this->getSanitisedInput('wildCardString', $_POST);
$mode = $this->getSanitisedInput('mode', $_POST);

/* Execute the search. */
$search = new SearchCandidates($this->_siteID);
Expand Down
58 changes: 29 additions & 29 deletions modules/companies/CompaniesUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,42 +489,42 @@ private function add()
private function onAdd()
{
$formattedPhone1 = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phone1', $_POST)
$this->getSanitisedInput('phone1', $_POST)
);
if (!empty($formattedPhone1))
{
$phone1 = $formattedPhone1;
}
else
{
$phone1 = $this->getTrimmedInput('phone1', $_POST);
$phone1 = $this->getSanitisedInput('phone1', $_POST);
}

$formattedPhone2 = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phone2', $_POST)
$this->getSanitisedInput('phone2', $_POST)
);
if (!empty($formattedPhone2))
{
$phone2 = $formattedPhone2;
}
else
{
$phone2 = $this->getTrimmedInput('phone2', $_POST);
$phone2 = $this->getSanitisedInput('phone2', $_POST);
}

$formattedFaxNumber = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('faxNumber', $_POST)
$this->getSanitisedInput('faxNumber', $_POST)
);
if (!empty($formattedFaxNumber))
{
$faxNumber = $formattedFaxNumber;
}
else
{
$faxNumber = $this->getTrimmedInput('faxNumber', $_POST);
$faxNumber = $this->getSanitisedInput('faxNumber', $_POST);
}

$url = $this->getTrimmedInput('url', $_POST);
$url = $this->getSanitisedInput('url', $_POST);
if (!empty($url))
{
$formattedURL = StringUtility::extractURL($url);
Expand All @@ -538,13 +538,13 @@ private function onAdd()
/* Hot company? */
$isHot = $this->isChecked('isHot', $_POST);

$name = $this->getTrimmedInput('name', $_POST);
$address = $this->getTrimmedInput('address', $_POST);
$city = $this->getTrimmedInput('city', $_POST);
$state = $this->getTrimmedInput('state', $_POST);
$zip = $this->getTrimmedInput('zip', $_POST);
$keyTechnologies = $this->getTrimmedInput('keyTechnologies', $_POST);
$notes = $this->getTrimmedInput('notes', $_POST);
$name = $this->getSanitisedInput('name', $_POST);
$address = $this->getSanitisedInput('address', $_POST);
$city = $this->getSanitisedInput('city', $_POST);
$state = $this->getSanitisedInput('state', $_POST);
$zip = $this->getSanitisedInput('zip', $_POST);
$keyTechnologies = $this->getSanitisedInput('keyTechnologies', $_POST);
$notes = $this->getSanitisedInput('notes', $_POST);

/* Departments list editor. */
$departmentsCSV = $this->getTrimmedInput('departmentsCSV', $_POST);
Expand Down Expand Up @@ -697,42 +697,42 @@ private function onEdit()
}

$formattedPhone1 = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phone1', $_POST)
$this->getSanitisedInput('phone1', $_POST)
);
if (!empty($formattedPhone1))
{
$phone1 = $formattedPhone1;
}
else
{
$phone1 = $this->getTrimmedInput('phone1', $_POST);
$phone1 = $this->getSanitisedInput('phone1', $_POST);
}

$formattedPhone2 = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('phone2', $_POST)
$this->getSanitisedInput('phone2', $_POST)
);
if (!empty($formattedPhone2))
{
$phone2 = $formattedPhone2;
}
else
{
$phone2 = $this->getTrimmedInput('phone2', $_POST);
$phone2 = $this->getSanitisedInput('phone2', $_POST);
}

$formattedFaxNumber = StringUtility::extractPhoneNumber(
$this->getTrimmedInput('faxNumber', $_POST)
$this->getSanitisedInput('faxNumber', $_POST)
);
if (!empty($formattedFaxNumber))
{
$faxNumber = $formattedFaxNumber;
}
else
{
$faxNumber = $this->getTrimmedInput('faxNumber', $_POST);
$faxNumber = $this->getSanitisedInput('faxNumber', $_POST);
}

$url = $this->getTrimmedInput('url', $_POST);
$url = $this->getSanitisedInput('url', $_POST);
if (!empty($url))
{
$formattedURL = StringUtility::extractURL($url);
Expand Down Expand Up @@ -809,13 +809,13 @@ private function onEdit()
$emailAddress = '';
}

$name = $this->getTrimmedInput('name', $_POST);
$address = $this->getTrimmedInput('address', $_POST);
$city = $this->getTrimmedInput('city', $_POST);
$state = $this->getTrimmedInput('state', $_POST);
$zip = $this->getTrimmedInput('zip', $_POST);
$keyTechnologies = $this->getTrimmedInput('keyTechnologies', $_POST);
$notes = $this->getTrimmedInput('notes', $_POST);
$name = $this->getSanitisedInput('name', $_POST);
$address = $this->getSanitisedInput('address', $_POST);
$city = $this->getSanitisedInput('city', $_POST);
$state = $this->getSanitisedInput('state', $_POST);
$zip = $this->getSanitisedInput('zip', $_POST);
$keyTechnologies = $this->getSanitisedInput('keyTechnologies', $_POST);
$notes = $this->getSanitisedInput('notes', $_POST);

/* Departments list editor. */
$departmentsCSV = $this->getTrimmedInput('departmentsCSV', $_POST);
Expand Down Expand Up @@ -986,7 +986,7 @@ private function onSearch()
if (!eval(Hooks::get('CLIENTS_ON_SEARCH_PRE'))) return;

/* Get our current searching mode. */
$mode = $this->getTrimmedInput('mode', $_GET);
$mode = $this->getSanitisedInput('mode', $_GET);

/* Execute the search. */
$search = new SearchCompanies($this->_siteID);
Expand Down
2 changes: 1 addition & 1 deletion modules/companies/dataGrids.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* CATS
* Companies Datagrid
*
* CATS Version: 0.9.6
* CATS Version: 0.9.7.1
*
* Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
*
Expand Down
Loading