This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via db3451fe72518d7875e52db51315e7d3a87d9eaa (commit) via 84227f7a1c1b5093c01a0cabd6160d82197ee04b (commit) via 40407aee99546b4f25632bcaeb796d2a53cb1bcb (commit) from b06288b74d1abe20df2670824c8aafccb1f3aef6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit db3451fe72518d7875e52db51315e7d3a87d9eaa Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 20 19:10:15 2019 +0100
suricata: Ship updated rule download script
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 84227f7a1c1b5093c01a0cabd6160d82197ee04b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon May 20 20:06:22 2019 +0200
update-ids-ruleset: Release ids_page_lock when the downloader fails.
Fixes #12085.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 40407aee99546b4f25632bcaeb796d2a53cb1bcb Author: Peter Müller peter.mueller@ipfire.org Date: Sat May 18 15:14:00 2019 +0000
ids.cgi: Fix upstream proxy validation
Signed-off-by: Peter Müller peter.mueller@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/ids-functions.pl | 24 +++++++----------------- config/rootfiles/core/132/filelists/files | 1 + src/scripts/update-ids-ruleset | 3 +++ 3 files changed, 11 insertions(+), 17 deletions(-)
Difference in files: diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index deb287bb7..5530da11e 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -174,28 +174,18 @@ sub downloadruleset {
# Check if an upstream proxy is configured. if ($proxysettings{'UPSTREAM_PROXY'}) { - my ($peer, $peerport) = (/^(?:[a-zA-Z ]+://)?(?:[A-Za-z0-9_.-]*?(?::[A-Za-z0-9_.-]*?)?@)?([a-zA-Z0-9._-]*?)(?::([0-9]{1,5}))?(?:/.*?)?$/); my $proxy_url;
- # Check if we got a peer. - if ($peer) { - $proxy_url = "http://"; + $proxy_url = "http://";
- # Check if the proxy requires authentication. - if (($proxysettings{'UPSTREAM_USER'}) && ($proxysettings{'UPSTREAM_PASSWORD'})) { - $proxy_url .= "$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"; - } - - # Add proxy server address and port. - $proxy_url .= "$peer:$peerport"; - } else { - # Log error message and break. - &_log_to_syslog("Could not proper configure the proxy server access."); - - # Return "1" - false. - return 1; + # Check if the proxy requires authentication. + if (($proxysettings{'UPSTREAM_USER'}) && ($proxysettings{'UPSTREAM_PASSWORD'})) { + $proxy_url .= "$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"; }
+ # Add proxy server address and port. + $proxy_url .= $proxysettings{'UPSTREAM_PROXY'}; + # Setup proxy settings. $downloader->proxy(['http', 'https'], $proxy_url); } diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index dea80e4a2..cd6938878 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -19,6 +19,7 @@ srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi usr/lib/firewall/rules.pl usr/local/bin/backupiso +usr/local/bin/update-ids-ruleset usr/sbin/convert-snort var/ipfire/ids-functions.pl var/ipfire/langs diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index f28a8c156..956c3a1f5 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -54,6 +54,9 @@ if(&IDS::downloadruleset()) { # Store error message for displaying in the WUI. &IDS::_store_error_message("$Lang::tr{'could not download latest updates'}");
+ # Unlock the IDS page. + &IDS::unlock_ids_page(); + # Exit. exit 0; }
hooks/post-receive -- IPFire 2.x development tree