* [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location.
@ 2015-10-18 11:23 Stefan Schantl
2015-10-18 15:10 ` IT Superhack
2015-10-18 17:54 ` Michael Tremer
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Schantl @ 2015-10-18 11:23 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1755 bytes --]
The CGI offers the posibility to get more details for a certain locations
by clicking on a button.
This feature cannot be used for the category "unknown". To prevent users
from beeing confused about non show-able details, I added some code to hide
this button for this category.
Fixes #10726.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 29c0842..f998a62 100644
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++)
$color++;
print "<tr>";
- print "<td align='center' $col><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></td>";
+ print "<td align='center' $col>";
+
+ # Dont show details button for "unknown" location.
+ if ($key[$s] ne 'unknown') {
+ print"<form method='post' action='showrequestfromcountry.dat'>";
+ print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
+ print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
+ print"<input type='hidden' name='country' value='$key[$s]'>";
+ print"<input type='submit' value='details'></form>";
+ }
+
if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0') {
print "<td align='center' $col>$key[$s]</td>";
}
--
2.4.3
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location.
2015-10-18 11:23 [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location Stefan Schantl
@ 2015-10-18 15:10 ` IT Superhack
2015-10-18 17:54 ` Michael Tremer
1 sibling, 0 replies; 3+ messages in thread
From: IT Superhack @ 2015-10-18 15:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2326 bytes --]
Hello Stefan,
thanks for caring about this issue.
As far as I can tell, the patch looks good.
However, there is still one issue: Anonymous Proxies are located in the
section "A1", and firewall hits coming from internal networks show up in
"green0", "blue0" or something similar.
What causes the "unknown" firewall hits? The squid proxy? Pseudo traffic
coming from the loop device?
This is just one thing I am a bit confused about.
Best regards,
Timmothy Wilson
Stefan Schantl:
> The CGI offers the posibility to get more details for a certain locations
> by clicking on a button.
>
> This feature cannot be used for the category "unknown". To prevent users
> from beeing confused about non show-able details, I added some code to hide
> this button for this category.
>
> Fixes #10726.
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> index 29c0842..f998a62 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> @@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++)
> $color++;
> print "<tr>";
>
> - print "<td align='center' $col><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></td>";
> + print "<td align='center' $col>";
> +
> + # Dont show details button for "unknown" location.
> + if ($key[$s] ne 'unknown') {
> + print"<form method='post' action='showrequestfromcountry.dat'>";
> + print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
> + print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
> + print"<input type='hidden' name='country' value='$key[$s]'>";
> + print"<input type='submit' value='details'></form>";
> + }
> +
> if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0') {
> print "<td align='center' $col>$key[$s]</td>";
> }
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location.
2015-10-18 11:23 [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location Stefan Schantl
2015-10-18 15:10 ` IT Superhack
@ 2015-10-18 17:54 ` Michael Tremer
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2015-10-18 17:54 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1871 bytes --]
Merged.
On Sun, 2015-10-18 at 13:23 +0200, Stefan Schantl wrote:
> The CGI offers the posibility to get more details for a certain
> locations
> by clicking on a button.
>
> This feature cannot be used for the category "unknown". To prevent
> users
> from beeing confused about non show-able details, I added some code
> to hide
> this button for this category.
>
> Fixes #10726.
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi
> -bin/logs.cgi/firewalllogcountry.dat
> index 29c0842..f998a62 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> @@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++)
> $color++;
> print "<tr>";
>
> - print "<td align='center' $col><form method='post'
> action='showrequestfromcountry.dat'><input type='hidden' name='MONTH'
> value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY'
> value='$cgiparams{'DAY'}'> <input type='hidden' name='country'
> value='$key[$s]'> <input type='submit' value='details'></form></td>";
> + print "<td align='center' $col>";
> +
> + # Dont show details button for "unknown" location.
> + if ($key[$s] ne 'unknown') {
> + print"<form method='post'
> action='showrequestfromcountry.dat'>";
> + print"<input type='hidden' name='MONTH'
> value='$cgiparams{'MONTH'}'>";
> + print"<input type='hidden' name='DAY'
> value='$cgiparams{'DAY'}'>";
> + print"<input type='hidden' name='country'
> value='$key[$s]'>";
> + print"<input type='submit' value='details'></form>";
> + }
> +
> if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq
> 'orange0') {
> print "<td align='center' $col>$key[$s]</td>";
> }
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-18 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-18 11:23 [PATCH] firewalllogcountry.dat: Do not show 'Details' button for unkonw location Stefan Schantl
2015-10-18 15:10 ` IT Superhack
2015-10-18 17:54 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox