coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Search/Fixup

Browse source 
* improve handling of invalid unicode sequences in urls (%xx).
   Page no longer breaks entirely, just misses the search term as the faulty string gets silently dropped.
 * don't perform searches if you don't have valid terms to search for
This commit is contained in:
Sarjuuk 2025-12-10 22:51:32 +01:00
parent f5d987a864
commit eb70065e0f
4 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
endpoints/search/search.php
View file

@ -62,19 +62,23 @@ class SearchBaseResponse extends TemplateResponse implements ICache
$canRedirect = true;
$redirectTo = '';
foreach ($this->searchObj->perform() as $lvData)
if ($this->searchObj->canPerform())
{
if ($lvData[1] == 'npc' || $lvData[1] == 'object')
$this->addDataLoader('zones');
foreach ($this->searchObj->perform() as $lvData)
{
if ($lvData[1] == 'npc' || $lvData[1] == 'object')
$this->addDataLoader('zones');
$this->lvTabs->addListviewTab(new Listview(...$lvData));
$this->lvTabs->addListviewTab(new Listview(...$lvData));
// we already have a target > can't have more targets > no redirects
if (($canRedirect && $redirectTo) || count($lvData[0]['data']) > 1)
$canRedirect = false;
// we already have a target > can't have more targets > no redirects
if (($canRedirect && $redirectTo) || count($lvData[0]['data']) > 1)
$canRedirect = false;
if ($canRedirect) // note - we are very lucky that in case of searches $template is identical to the typeString
$redirectTo = '?'.$lvData[1].'='.key($lvData[0]['data']);
if ($canRedirect) // note - we are very lucky that in case of searches $template is identical to the typeString
$redirectTo = '?'.$lvData[1].'='.key($lvData[0]['data']);
}
}
$this->extendGlobalData($this->searchObj->getJSGlobals());

2
includes/components/pagetemplate.class.php
View file

@ -216,7 +216,7 @@ class PageTemplate
if (is_string($var) && $this->$var)
$var = $this->$var;
return preg_replace('/script\s*\>/i', 'scr"+"ipt>', Util::toJSON($var, $jsonFlags));
return preg_replace('/script\s*\>/i', 'scr"+"ipt>', Util::toJSON($var, $jsonFlags) ?: "{}");
}
private function escHTML(string $var) : string|array

6
includes/components/response/baseresponse.class.php
View file

@ -456,8 +456,8 @@ trait TrProfilerList
abstract class BaseResponse
{
protected const PATTERN_TEXT_LINE = '/[\p{Cc}\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui';
protected const PATTERN_TEXT_BLOB = '/[\x00-\x09\x0B-\x1F\p{Cf}\p{Co}\p{Cs}\p{Cn}]/ui';
protected const PATTERN_TEXT_LINE = '/[\p{Cc}\p{Cf}\p{Co}\p{Cs}\p{Cn}]/i';
protected const PATTERN_TEXT_BLOB = '/[\x00-\x09\x0B-\x1F\p{Cf}\p{Co}\p{Cs}\p{Cn}]/i';
protected static array $sql = []; // debug: sql stats container
@ -638,7 +638,7 @@ abstract class BaseResponse
protected static function checkTextLine(string $val) : string
{
// trim non-printable chars
return preg_replace(self::PATTERN_TEXT_LINE, '', trim(urldecode($val)));
return preg_replace(self::PATTERN_TEXT_LINE, '', trim($val));
}
protected static function checkTextBlob(string $val) : string

6
static/js/basic.js
View file

@ -981,7 +981,11 @@ $WH.g_getQueryString = function() {
};
$WH.g_parseQueryString = function(str) {
str = decodeURIComponent(str);
// aowow - set to catch invalid unicode escapes (%ff)
// str = decodeURIComponent(str);
try { str = decodeURIComponent(str); }
catch (e) { return {}; }
var words = str.split('&');
var params = {};