From: Peter Müller <peter.mueller@link38.eu>
Date: Mon, 29 Oct 2018 17:49:49 +0000 (+0100)
Subject: fix downloading Snort rules if behind upstream proxy
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c451a4a3262d564e298a13a252fd59e573da3a5;p=people%2Fms%2Fipfire-2.x.git

fix downloading Snort rules if behind upstream proxy

Currently, the wget call only uses proxy information for HTTP.
Since rulesets are downloaded via HTTPS now, the same information
also needs to be applied for HTTPS.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index d9d697debb..eddfc387c6 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -692,7 +692,7 @@ sub downloadrulesfile {
 	}
 
 	if ($peer) {
-		system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
+		system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -e https_proxy=http://$peer:$peerport/ -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
 	} else {
 		system("wget -r -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
 	}