135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better approach to HTML entity encoding in custom report searchable fields

Browse Source
This commit is contained in:
Oliver Gorwits
2023-12-07 15:45:50 +00:00
parent 9128c0d50d
commit ccd2de0651
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/App/Netdisco/Web/GenericReport.pm
View File

@@ -82,7 +82,6 @@ foreach my $report (@{setting('reports')}) {
my $rev4 = RE_net_IPv4(-keep); my $rev4 = RE_net_IPv4(-keep);
my $rev6 = RE_net_IPv6(-keep); my $rev6 = RE_net_IPv6(-keep);
my $remac = RE_net_MAC(-keep); my $remac = RE_net_MAC(-keep);
#my $redom = RE_net_domain(-keep, -nospace, -rfc1101);
foreach my $row (@results) { foreach my $row (@results) {
foreach my $col (@column_order) { foreach my $col (@column_order) {
@@ -90,28 +89,23 @@ foreach my $report (@{setting('reports')}) {
my $fields = (ref $row->{$col} ? $row->{$col} : [$row->{$col}]); my $fields = (ref $row->{$col} ? $row->{$col} : [$row->{$col}]);
foreach my $f (@$fields) { foreach my $f (@$fields) {
# seems too sensitive match to be useful :-(
#$f =~ s!\b${redom}\b!'<a href="'. encode_entities($f);
# uri_for('/search', {q => $1 .($2 ? "/$2" : '')})->path_query
# .'">'. encode_entities($1 .($2 ? "/$2" : '')) .'</a>'!gex;
$f =~ s!\b${recidr4}\b!'<a href="'. $f =~ s!\b${recidr4}\b!'<a href="'.
uri_for('/search', {q => "$1/$2"})->path_query uri_for('/search', {q => "$1/$2"})->path_query
.'">'. encode_entities("$1/$2") .'</a>'!gex; .qq{">$1/$2</a>}!gex;
if (not $1 and not $2) { if (not $1 and not $2) {
$f =~ s!\b${rev4}\b!'<a href="'. $f =~ s!\b${rev4}\b!'<a href="'.
uri_for('/search', {q => $1})->path_query uri_for('/search', {q => $1})->path_query .qq{">$1</a>}!gex;
.'">'. encode_entities($1) .'</a>'!gex;
} }
$f =~ s!\b${rev6}\b!'<a href="'. $f =~ s!\b${rev6}\b!'<a href="'.
uri_for('/search', {q => $1})->path_query uri_for('/search', {q => $1})->path_query .qq{">$1</a>}!gex;
.'">'. encode_entities($1) .'</a>'!gex;
$f =~ s!\b${remac}\b!'<a href="'. $f =~ s!\b${remac}\b!'<a href="'.
uri_for('/search', {q => $1})->path_query uri_for('/search', {q => $1})->path_query .qq{">$1</a>}!gex;
.'">'. encode_entities($1) .'</a>'!gex;
$row->{$col} = $f if not ref $row->{$col}; $row->{$col} = $f if not ref $row->{$col};
} }