Skip to content

Commit

Permalink
Fallback to plain text search when regex is invalid (#2530, #2521, @I…
Browse files Browse the repository at this point in the history 
…T-VBFK)

Co-authored-by: IT-VBFK <it@voecklabrucker-freikriche.at>
Co-authored-by: Jens Maus <mail@jens-maus.de>
  • Loading branch information
@IT-VBFK @jens-maus
3 people authored Nov 26, 2023
1 parent a1905a0 commit c735122
Show file tree
Hide file tree
Showing 2 changed files with 184 additions and 39 deletions.
124 changes: 100 additions & 24 deletions buildroot-external/patches/occu/0170-WebUI-RegexSearchInDeviceLists.patch
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,152 @@
--- occu/WebUI/www/webui/webui.js.orig
+++ occu/WebUI/www/webui/webui.js
@@ -7882,11 +7882,8 @@
@@ -7871,6 +7871,19 @@
}
};

+ const isValidRegex = function(possiblyValidRegex)
+ {
+ try
+ {
+ const r = new RegExp(possiblyValidRegex);
+ }
+ catch(err)
+ {
+ return false;
+ }
+
+ return true;
+ }
/**
* Prüft, ob der Filter auf einen Text zutrifft
**/
@@ -7882,12 +7895,23 @@
//var patternList = m_value.split("|");
text = text.toLowerCase();

- for (var i = 0, len = patternList.length; i < len; i++)
- {
+ let searchString = m_value.toLowerCase();
+ if(isValidRegex(searchString))
{
- if (0 <= text.indexOf(patternList[i])) { return true; }
- }
+ var r = new RegExp(searchString);
+ if (r.test(text) === true) { return true; }
+
+ return false;
+ }
+ else
+ {
+ for (var i = 0, len = patternList.length; i < len; i++)
+ {
+ if (0 <= text.indexOf(patternList[i])) { return true; }
+ }
+
+ return false;
}
-
+ var r = new RegExp(m_value.toLowerCase());
+ if (r.test(text) === true) {return true; }
return false;
- return false;
};

@@ -32410,7 +32407,8 @@
/**
@@ -32410,7 +32434,15 @@
{
if (typeof obj['type'] != 'undefined') {
if (obj['type'] === "") { return false; }
- if (obj['type'].toLowerCase().indexOf(this.filType) == -1) { return false; }
+ var r = new RegExp(this.filType);
+ if (r.test(obj['type'].toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filType))
+ {
+ var r = new RegExp(this.filType);
+ if (r.test(obj['type'].toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (obj['type'].toLowerCase().indexOf(this.filType) == -1) { return false; }
+ }
}
}
if (this.filDesc !== "")
@@ -32420,7 +32418,8 @@
@@ -32420,7 +32452,15 @@
{
//conInfo( "iseFilter: desc="+obj['desc'] );
if (obj['desc'] === "") { return false; }
- if (obj['desc'].toLowerCase().indexOf(this.filDesc) == -1) { return false; }
+ var r = new RegExp(this.filDesc);
+ if (r.test(obj['desc'].toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filDesc))
+ {
+ var r = new RegExp(this.filDesc);
+ if (r.test(obj['desc'].toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (obj['desc'].toLowerCase().indexOf(this.filDesc) == -1) { return false; }
+ }
}
}
if (this.filName !== "")
@@ -32429,7 +32428,8 @@
@@ -32429,7 +32469,15 @@
{
if (obj['name'] === "") { return false; }
var transName = translateString(obj['name']);
- if (transName.toLowerCase().indexOf(this.filName) == -1) { return false; }
+ var r = new RegExp(this.filName);
+ if (r.test(transName.toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filName))
+ {
+ var r = new RegExp(this.filName);
+ if (r.test(transName.toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (transName.toLowerCase().indexOf(this.filName) == -1) { return false; }
+ }
}
}
if (this.filSn !== "")
@@ -32437,7 +32437,8 @@
@@ -32437,7 +32485,15 @@
if (typeof obj['sn'] != 'undefined')
{
if (obj['sn'] === "") { return false; }
- if (obj['sn'].toLowerCase().indexOf(this.filSn) == -1) { return false; }
+ var r = new RegExp(this.filSn);
+ if (r.test(obj['sn'].toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filSn))
+ {
+ var r = new RegExp(this.filSn);
+ if (r.test(obj['sn'].toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (obj['desc'].toLowerCase().indexOf(this.filSn) == -1) { return false; }
+ }
}
}
if (this.filUnit !== "")
@@ -32445,7 +32446,8 @@
@@ -32445,7 +32501,15 @@
if (typeof obj['unit'] != 'undefined')
{
if (obj['unit'] === "") { return false; }
- if (obj['unit'].toLowerCase().indexOf(this.filUnit) == -1) { return false; }
+ var r = new RegExp(this.filUnit);
+ if (r.test(obj['unit'].toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filUnit))
+ {
+ var r = new RegExp(this.filUnit);
+ if (r.test(obj['unit'].toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (obj['unit'].toLowerCase().indexOf(this.filUnit) == -1) { return false; }
+ }
}
}

@@ -32469,7 +32471,8 @@
@@ -32469,7 +32533,15 @@
if (this.filChnLink !== "")
{
if (obj['chn'] === "") { return false; }
- if (obj['chn'].toLowerCase().indexOf(this.filChnLink) == -1) { return false; }
+ var r = new RegExp(this.filChnLink);
+ if (r.test(obj['chn'].toLowerCase()) === false) {return false; }
+ if (isValidRegex(this.filChnLink))
+ {
+ var r = new RegExp(this.filChnLink);
+ if (r.test(obj['chn'].toLowerCase()) === false) { return false; }
+ }
+ else
+ {
+ if (obj['chn'].toLowerCase().indexOf(this.filChnLink) == -1) { return false; }
+ }
}
/*
if (this.filVarTypes !== "")
99 changes: 84 additions & 15 deletions ...t-external/patches/occu/0170-WebUI-RegexSearchInDeviceLists/occu/WebUI/www/webui/webui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7871,6 +7871,19 @@ StringFilter = function(name, callback)
}
};

const isValidRegex = function(possiblyValidRegex)
{
try
{
const r = new RegExp(possiblyValidRegex);
}
catch(err)
{
return false;
}

return true;
}
/**
* Pr�ft, ob der Filter auf einen Text zutrifft
**/
Expand All @@ -7882,9 +7895,23 @@ StringFilter = function(name, callback)
//var patternList = m_value.split("|");
text = text.toLowerCase();

var r = new RegExp(m_value.toLowerCase());
if (r.test(text) === true) {return true; }
return false;
let searchString = m_value.toLowerCase();
if(isValidRegex(searchString))
{
var r = new RegExp(searchString);
if (r.test(text) === true) { return true; }

return false;
}
else
{
for (var i = 0, len = patternList.length; i < len; i++)
{
if (0 <= text.indexOf(patternList[i])) { return true; }
}

return false;
}
};

/**
Expand Down Expand Up @@ -32407,8 +32434,15 @@ iseFilter.prototype = {
{
if (typeof obj['type'] != 'undefined') {
if (obj['type'] === "") { return false; }
var r = new RegExp(this.filType);
if (r.test(obj['type'].toLowerCase()) === false) {return false; }
if (isValidRegex(this.filType))
{
var r = new RegExp(this.filType);
if (r.test(obj['type'].toLowerCase()) === false) { return false; }
}
else
{
if (obj['type'].toLowerCase().indexOf(this.filType) == -1) { return false; }
}
}
}
if (this.filDesc !== "")
Expand All @@ -32418,8 +32452,15 @@ iseFilter.prototype = {
{
//conInfo( "iseFilter: desc="+obj['desc'] );
if (obj['desc'] === "") { return false; }
var r = new RegExp(this.filDesc);
if (r.test(obj['desc'].toLowerCase()) === false) {return false; }
if (isValidRegex(this.filDesc))
{
var r = new RegExp(this.filDesc);
if (r.test(obj['desc'].toLowerCase()) === false) { return false; }
}
else
{
if (obj['desc'].toLowerCase().indexOf(this.filDesc) == -1) { return false; }
}
}
}
if (this.filName !== "")
Expand All @@ -32428,26 +32469,47 @@ iseFilter.prototype = {
{
if (obj['name'] === "") { return false; }
var transName = translateString(obj['name']);
var r = new RegExp(this.filName);
if (r.test(transName.toLowerCase()) === false) {return false; }
if (isValidRegex(this.filName))
{
var r = new RegExp(this.filName);
if (r.test(transName.toLowerCase()) === false) { return false; }
}
else
{
if (transName.toLowerCase().indexOf(this.filName) == -1) { return false; }
}
}
}
if (this.filSn !== "")
{
if (typeof obj['sn'] != 'undefined')
{
if (obj['sn'] === "") { return false; }
var r = new RegExp(this.filSn);
if (r.test(obj['sn'].toLowerCase()) === false) {return false; }
if (isValidRegex(this.filSn))
{
var r = new RegExp(this.filSn);
if (r.test(obj['sn'].toLowerCase()) === false) { return false; }
}
else
{
if (obj['desc'].toLowerCase().indexOf(this.filSn) == -1) { return false; }
}
}
}
if (this.filUnit !== "")
{
if (typeof obj['unit'] != 'undefined')
{
if (obj['unit'] === "") { return false; }
var r = new RegExp(this.filUnit);
if (r.test(obj['unit'].toLowerCase()) === false) {return false; }
if (isValidRegex(this.filUnit))
{
var r = new RegExp(this.filUnit);
if (r.test(obj['unit'].toLowerCase()) === false) { return false; }
}
else
{
if (obj['unit'].toLowerCase().indexOf(this.filUnit) == -1) { return false; }
}
}
}

Expand All @@ -32471,8 +32533,15 @@ iseFilter.prototype = {
if (this.filChnLink !== "")
{
if (obj['chn'] === "") { return false; }
var r = new RegExp(this.filChnLink);
if (r.test(obj['chn'].toLowerCase()) === false) {return false; }
if (isValidRegex(this.filChnLink))
{
var r = new RegExp(this.filChnLink);
if (r.test(obj['chn'].toLowerCase()) === false) { return false; }
}
else
{
if (obj['chn'].toLowerCase().indexOf(this.filChnLink) == -1) { return false; }
}
}
/*
if (this.filVarTypes !== "")
Expand Down

0 comments on commit c735122

Please sign in to comment.