Skip to content

Commit

Permalink
Merge pull request #348 from seamuslee001/packages_php81_3
Browse files Browse the repository at this point in the history 
[REF][PHP8.1] Fix some further places where passing in NULL is deprec…
  • Loading branch information
@seamuslee001
seamuslee001 authored Jul 20, 2022
2 parents f73b4c1 + 27401fb commit 0aee74c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
32 changes: 16 additions & 16 deletions IDS/Converter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static function convertFromJSCharcode($value)
if (preg_match_all('/\d*[+-\/\* ]\d+/', $char, $matches)) {
$match = preg_split('/(\W?\d+)/',
(implode('', $matches[0])),
null,
-1,
PREG_SPLIT_DELIM_CAPTURE);

if (array_sum($match) >= 20 && array_sum($match) <= 127) {
Expand Down Expand Up @@ -235,7 +235,7 @@ public static function convertJSRegexModifiers($value)
*/
public static function convertEntities($value)
{
$converted = null;
$converted = '';

//deal with double encoded payload
$value = preg_replace('/&amp;/', '&', $value);
Expand Down Expand Up @@ -331,7 +331,7 @@ public static function convertFromSQLKeywords($value)
$value = preg_replace($pattern, '!', $value);
$value = preg_replace('/"\s+\d/', '"', $value);
$value = preg_replace('/(\W)div(\W)/ims', '$1 OR $2', $value);
$value = preg_replace('/\/(?:\d+|null)/', null, $value);
$value = preg_replace('/\/(?:\d+|null)/', '', $value);

return $value;
}
Expand All @@ -358,7 +358,7 @@ public static function convertFromControlChars($value)

//take care for malicious unicode characters
$value = urldecode(preg_replace('/(?:%E(?:2|3)%8(?:0|1)%(?:A|8|9)' .
'\w|%EF%BB%BF|%EF%BF%BD)|(?:&#(?:65|8)\d{3};?)/i', null,
'\w|%EF%BB%BF|%EF%BF%BD)|(?:&#(?:65|8)\d{3};?)/i', '',
urlencode($value)));
$value = urldecode(
preg_replace('/(?:%F0%80%BE)/i', '>', urlencode($value)));
Expand All @@ -371,12 +371,12 @@ public static function convertFromControlChars($value)

$value = preg_replace('/(?:%ff1c)/', '<', $value);
$value = preg_replace(
'/(?:&[#x]*(200|820|200|820|zwn?j|lrm|rlm)\w?;?)/i', null,$value
'/(?:&[#x]*(200|820|200|820|zwn?j|lrm|rlm)\w?;?)/i', '',$value
);
$value = preg_replace('/(?:&#(?:65|8)\d{3};?)|' .
'(?:&#(?:56|7)3\d{2};?)|' .
'(?:&#x(?:fe|20)\w{2};?)|' .
'(?:&#x(?:d[c-f])\w{2};?)/i', null,
'(?:&#x(?:d[c-f])\w{2};?)/i', '',
$value);

$value = str_replace(
Expand Down Expand Up @@ -573,7 +573,7 @@ public static function convertFromConcatenated($value)
'/(?:in\s+)/');

// strip out concatenations
$converted = preg_replace($pattern, null, $compare);
$converted = preg_replace($pattern, '', $compare);

//strip object traversal
$converted = preg_replace('/\w(\.\w\()/', "$1", $converted);
Expand Down Expand Up @@ -612,15 +612,15 @@ public static function convertFromProprietaryEncodings($value) {
$value = preg_replace('/^"([^"=\\!><~]+)"$/', '$1', $value);

//OpenID login tokens
$value = preg_replace('/{[\w-]{8,9}\}(?:\{[\w=]{8}\}){2}/', null, $value);
$value = preg_replace('/{[\w-]{8,9}\}(?:\{[\w=]{8}\}){2}/', '', $value);

//convert Content and \sdo\s to null
$value = preg_replace('/Content|\Wdo\s/', null, $value);
$value = preg_replace('/Content|\Wdo\s/', '', $value);

//strip emoticons
$value = preg_replace(
'/(?:\s[:;]-[)\/PD]+)|(?:\s;[)PD]+)|(?:\s:[)PD]+)|-\.-|\^\^/m',
null,
'',
$value
);

Expand Down Expand Up @@ -660,7 +660,7 @@ public static function runCentrifuge($value, IDS_Monitor $monitor = null)
if (strlen($value) > 25) {

//strip padding
$tmp_value = preg_replace('/\s{4}|==$/m', null, $value);
$tmp_value = preg_replace('/\s{4}|==$/m', '', $value);
$tmp_value = preg_replace(
'/\s{4}|[\p{L}\d\+\-=,.%()]{8,}/m',
'aaa',
Expand All @@ -669,13 +669,13 @@ public static function runCentrifuge($value, IDS_Monitor $monitor = null)

// Check for the attack char ratio
$tmp_value = preg_replace('/([*.!?+-])\1{1,}/m', '$1', $tmp_value);
$tmp_value = preg_replace('/"[\p{L}\d\s]+"/m', null, $tmp_value);
$tmp_value = preg_replace('/"[\p{L}\d\s]+"/m', '', $tmp_value);

$stripped_length = strlen(preg_replace('/[\d\s\p{L}\.:,%&\/><\-)!|]+/m',
null, $tmp_value));
'', $tmp_value));
$overall_length = strlen(
preg_replace('/([\d\s\p{L}:,\.]{3,})+/m', 'aaa',
preg_replace('/\s{2,}/m', null, $tmp_value))
preg_replace('/\s{2,}/m', '', $tmp_value))
);

if ($stripped_length != 0
Expand All @@ -692,7 +692,7 @@ public static function runCentrifuge($value, IDS_Monitor $monitor = null)

if (strlen($value) > 40) {
// Replace all non-special chars
$converted = preg_replace('/[\w\s\p{L},.:!]/', null, $value);
$converted = preg_replace('/[\w\s\p{L},.:!]/', '', $value);

// Split string into an array, unify and sort
$array = str_split($converted);
Expand Down Expand Up @@ -720,7 +720,7 @@ public static function runCentrifuge($value, IDS_Monitor $monitor = null)
$converted = preg_replace('/[+-]\s*\d+/', '+', $converted);
$converted = preg_replace('/[()[\]{}]/', '(', $converted);
$converted = preg_replace('/[!?:=]/', ':', $converted);
$converted = preg_replace('/[^:(+]/', null, stripslashes($converted));
$converted = preg_replace('/[^:(+]/', '', stripslashes($converted));

// Sort again and implode
$array = str_split($converted);
Expand Down
2 changes: 1 addition & 1 deletion Smarty/plugins/modifier.truncate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...',
if ($length == 0)
return '';

if (strlen($string) > $length) {
if (strlen($string ?? '') > $length) {
$length -= min($length, strlen($etc));
if (!$break_words && !$middle) {
$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
Expand Down

0 comments on commit 0aee74c

Please sign in to comment.