[PATCH] squid-graph 3.2: Proxy Graphs rebuilt

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 15143 bytes --]

This is Proxy Graphs 3.2, slightly tuned for better readability - as
a suggestion. I found by chance that the corresponding lang-strings still
existed, so I thought "Why not?"

I just had to create a - hopefully correct - 'sgraph.cgi', wrote a
- hopefully correct - lfs-file and some 'backgrounds' and there it was.

I changed the original CGI-font-colors to something better readable
and added some 'style=padding-left:5px' for cosmetics.

If somone likes it, here it is (again).

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/menu/20-status.menu          |   8 +++-
 config/rootfiles/common/squid-graph |   1 +
 html/cgi-bin/sgraph.cgi             |  72 ++++++++++++++++++++++++++++++++
 html/html/squid-graph/logo.png      | Bin 0 -> 3933 bytes
 lfs/squid-graph                     |  81 ++++++++++++++++++++++++++++++++++++
 make.sh                             |   1 +
 src/scripts/makegraphs              |   9 +++-
 7 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 config/rootfiles/common/squid-graph
 create mode 100644 html/cgi-bin/sgraph.cgi
 create mode 100644 html/html/squid-graph/logo.png
 create mode 100644 lfs/squid-graph

diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 2bcf0d5..a1511ec 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -58,7 +58,13 @@
 				'title' => "$Lang::tr{'hardware graphs'}",
 				'enabled' => 1,
 			  };
-    $substatus->{'61.entropy'} = {
+    $substatus->{'61.proxygraphs'} = {
+				'caption' => "$Lang::tr{'ssproxy graphs'}",
+				'uri' => '/cgi-bin/sgraph.cgi',
+				'title' => "$Lang::tr{'ssproxy graphs'}",
+				'enabled' => 1,
+			  };
+    $substatus->{'62.entropy'} = {
 				'caption' => "$Lang::tr{'entropy'}",
 				'uri' => '/cgi-bin/entropy.cgi',
 				'title' => "$Lang::tr{'entropy graphs'}",
diff --git a/config/rootfiles/common/squid-graph b/config/rootfiles/common/squid-graph
new file mode 100644
index 0000000..a2c9035
--- /dev/null
+++ b/config/rootfiles/common/squid-graph
@@ -0,0 +1 @@
+usr/bin/squid-graph
diff --git a/html/cgi-bin/sgraph.cgi b/html/cgi-bin/sgraph.cgi
new file mode 100644
index 0000000..f25dce0
--- /dev/null
+++ b/html/cgi-bin/sgraph.cgi
@@ -0,0 +1,72 @@
+#!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2016  IPFire Team  <info(a)ipfire.org>                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+use strict;
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+my @graphs = ();
+
+&Header::showhttpheaders();
+
+my $dir = "/srv/web/ipfire/html/squid-graph";
+my $sgraphdir = "/srv/web/ipfire/html/squid-graph";
+
+&Header::openpage($Lang::tr{'ssproxy graphs'}, 1, '');
+
+&Header::openbigbox('100%', 'left');
+
+&Header::openbox('100%', 'left', $Lang::tr{'proxy access graphs'} . ":" );
+
+if (open(IPACHTML, "$sgraphdir/index.html"))
+{
+	my $skip = 1;
+	while (<IPACHTML>)
+	{
+		$skip = 1 if /^<HR>$/;
+		if ($skip)
+		{
+			$skip = 0 if /<H1>/;
+			next;
+		}
+		s/<IMG SRC=([^"'>]+)>/<img src='\/squid-graph\/$1' alt='Graph' \/>/;
+		s/<HR>/<hr \/>/g;
+		s/<BR>/<br \/>/g;
+		s/<([^>]*)>/\L<$1>\E/g;
+		s/(size|align|border|color)=([^'"> ]+)/$1='$2'/g;
+		print;
+	}
+	close(IPACHTML);
+}
+else {
+	print $Lang::tr{'no information available'}; }
+
+&Header::closebox();
+
+&Header::closebigbox();
+
+&Header::closepage();
diff --git a/html/html/squid-graph/logo.png b/html/html/squid-graph/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2fe57b703e2662ec3fd9b70b6cfb6de4425aadf
GIT binary patch
literal 3933
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

literal 0
HcmV?d00001

diff --git a/lfs/squid-graph b/lfs/squid-graph
new file mode 100644
index 0000000..776aa79
--- /dev/null
+++ b/lfs/squid-graph
@@ -0,0 +1,81 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.2
+
+THISAPP    = squid-graph-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 89ac122a99dc2db67efbdcd2467b9939
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+	cp -f $(DIR_SRC)/squid-graph/squid-graph /usr/bin/squid-graph
+	chmod 755 /usr/bin/squid-graph
+
+	-mkdir -p /srv/web/ipfire/html/squid-graph
+	cp -f $(DIR_SRC)/squid-graph/logo.png /srv/web/ipfire/html/squid-graph
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 189f7d9..d2cc30d 100755
--- a/make.sh
+++ b/make.sh
@@ -618,6 +618,7 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
+  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 0b56b93..fbf0635 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -79,7 +79,7 @@ sub updatehdddata{
 		print "Error in RRD::create for hdd-".$array[$#array].": $ERROR\n" if $ERROR;
 		}
 
-	# Temperaturlesen w�rde die Platte aufwecken!!!
+	# Temperaturlesen würde die Platte aufwecken!!!
 	if (!$standby){
 		$temp = 0;
 		my $smart_output = '';
@@ -134,3 +134,10 @@ foreach (@disks){
 
 	updatehdddata($disk);
 }
+
+###
+### Squid Graphs
+###
+if ( -e "/var/log/squid/access.log") {
+	system ("/usr/bin/squid-graph --no-console-log --tcp-only --output-dir=/srv/web/ipfire/html/squid-graph < /var/log/squid/access.log >/dev/null 2>&1");
+}
-- 
2.7.1