From d8ef6a9537537ed43d7766ced22d3500b965ed1a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@link38.eu>
Date: Mon, 7 May 2018 17:23:52 +0200
Subject: [PATCH] display country data for remote IPs on ovpnmain.cgi
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This makes debugging easier, especially when it comes to
GeoIP related firewall rules and database related issues
such as #11482.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/121/filelists/files |  1 +
 html/cgi-bin/ovpnmain.cgi                 | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files
index 7b7aa4fd92..fc07ad7e9f 100644
--- a/config/rootfiles/core/121/filelists/files
+++ b/config/rootfiles/core/121/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
 etc/ssl/certs/ca-bundle.crt
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/remote.cgi
 var/ipfire/langs
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 94e723ba2c..eac962e6c7 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -35,6 +35,7 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/countries.pl";
+require "${General::swroot}/geoip-functions.pl";
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -2991,6 +2992,7 @@ END
     <tr>
 	<th><b>$Lang::tr{'common name'}</b></th>
 	<th><b>$Lang::tr{'real address'}</b></th>
+	<th><b>$Lang::tr{'country'}</b></th>
 	<th><b>$Lang::tr{'virtual address'}</b></th>
 	<th><b>$Lang::tr{'loged in at'}</b></th>
 	<th><b>$Lang::tr{'bytes sent'}</b></th>
@@ -3030,6 +3032,11 @@ END
 		    $users[$uid]{'BytesSent'} = &sizeformat($match[4]);
 		    $users[$uid]{'Since'} = $match[5];
 		    $users[$uid]{'Proto'} = $proto;
+
+		    # get country code for "RealAddress"...
+		    my $ccode = &GeoIP::lookup((split ':', $users[$uid]{'RealAddress'})[0]);
+		    my $flag_icon = &GeoIP::get_flag_icon($ccode);
+		    $users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>";
 		    $uid++;
 		}    
 	    }
@@ -3056,7 +3063,8 @@ END
 						}
 						print "<td align='left' $col>$users[$idx-1]{'CommonName'}</td>";
 						print "<td align='left' $col>$users[$idx-1]{'RealAddress'}</td>";
-						print "<td align='left' $col>$users[$idx-1]{'VirtualAddress'}</td>";
+						print "<td align='center' $col>$users[$idx-1]{'Country'}</td>";
+						print "<td align='center' $col>$users[$idx-1]{'VirtualAddress'}</td>";
 						print "<td align='left' $col>$users[$idx-1]{'Since'}</td>";
 						print "<td align='left' $col>$users[$idx-1]{'BytesSent'}</td>";
 						print "<td align='left' $col>$users[$idx-1]{'BytesReceived'}</td>";
-- 
2.39.2