From patchwork Fri Apr 19 13:39:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7745 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNs3Yg8z3wxX for ; Fri, 19 Apr 2024 13:39:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4VLbNm2TLzz3VP; Fri, 19 Apr 2024 13:39:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4VLbNl6WMPz32sC; Fri, 19 Apr 2024 13:39:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNh34Jxz32rY for ; Fri, 19 Apr 2024 13:39:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4VLbNg1t19z1ff; Fri, 19 Apr 2024 13:39:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1713533987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1+EJDgbtZAo+U/fZgD/dyH8h91ThcNHwkCHFNtFs3TA=; b=B8b9JjCZaNu52qdEarggSTgKX6hrI8/ehQ10P3nGEcpG8mDYOYG0QeL9+YQqt7j/4XlLJW ZF1oyLGF7qJP9yCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1713533987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1+EJDgbtZAo+U/fZgD/dyH8h91ThcNHwkCHFNtFs3TA=; b=eXj+L4+zngv1+2SUQgMOUSGiO9dGuPxm0UwQZiNPiK+0Yc6sWOPt+C9Qg6wT/3BuOMcTAf RT6higKIbBaYMF3PiVCYlVcgzJz/oiVnh8J7ZKwdpZrY9ktYPrQ5Xvkl9o500btQU5uxoo duiz5C8x8fEhpTJ6B15kzjveq8J/UIO/1EPpLqFtHQvCois68uxthQvOYOnVDiZN7/TaQ7 hev6Yach+zIvAK/WPNapHKzZnRg7p/hAvWuIrqdIh/Q98j2j5eNDnldW6KWIsHiThPQx1F U4dpk5yrwNAwZ8gVa/9AQENMPHh/9QqFKkHQ3xTdhES+oHoTvP/n4A306qvcaQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/3] sources: Removal of ALIENVAULT and SPAMHAUS_EDROP from ipblocklist sources Date: Fri, 19 Apr 2024 15:39:39 +0200 Message-ID: <20240419133941.3503396-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: LSV2OTOT7BLMXUR6INJTZLEYL4IYMNYJ X-Message-ID-Hash: LSV2OTOT7BLMXUR6INJTZLEYL4IYMNYJ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - ALIENVAULT has not been updated since at least Nov 2022 but probably earlier. There is no date for the file to be downloaded but a forum user has log messages from Nov 2022 that indicate the file had not changed as therefore no download occurred. - AT&T aquired AlienVault in August 2018. Somewhere between 2018 and 2022 the list stopped getting updated. AlienVault references on the AT&T website are now for a different product. - Discussed in IPFire conf call of April 2024 and agreed to remove the ALIENVAULT blocklist. - On Apr 10th the Spamhaus eDROP list was merged with the Spamhaus DROP list. The eDROP list is still available but is now empty. Trying to select the SPAMHAUS_EDROP list gives an error message that the blocklist was found to be empty. - This patch removes both the ALIENVAULT and the SPAMHAUS_EDROP lists from the ipblocklist sources file. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/ipblocklist/sources | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index be0cf0229..0835c0f9c 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -55,12 +55,6 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '12h', 'category' => 'reputation' }, - 'SPAMHAUS_EDROP' => { 'name' => "Spamhaus Extended Don't Route or Peer List", - 'url' => 'https://www.spamhaus.org/drop/edrop.txt', - 'info' => 'https://www.spamhaus.org/drop/', - 'parser' => 'ip-or-net-list', - 'rate' => '1h', - 'category' => 'reputation' }, 'DSHIELD' => { 'name' => 'Dshield.org Recommended Block List', 'url' => 'https://www.dshield.org/block.txt', 'info' => 'https://dshield.org/', @@ -106,12 +100,6 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list',, 'rate' => '1h', 'category' => 'application' }, - 'ALIENVAULT' => { 'name' => 'AlienVault IP Reputation database', - 'url' => 'https://reputation.alienvault.com/reputation.generic', - 'info' => 'https://www.alienvault.com/resource-center/videos/what-is-ip-domain-reputation', - 'parser' => 'ip-or-net-list', - 'rate' => '1h', - 'category' => 'reputation' }, 'BOGON' => { 'name' => 'Bogus address list (Martian)', 'url' => 'https://www.team-cymru.org/Services/Bogons/bogon-bn-agg.txt', 'info' => 'https://www.team-cymru.com/bogon-reference', From patchwork Fri Apr 19 13:39:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7744 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNs38szz3wkf for ; Fri, 19 Apr 2024 13:39:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4VLbNm0mhMz2Qx; Fri, 19 Apr 2024 13:39:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4VLbNl5HW2z32rq; Fri, 19 Apr 2024 13:39:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNh31P3z2yvG for ; Fri, 19 Apr 2024 13:39:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4VLbNg74cDz2Kq; Fri, 19 Apr 2024 13:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1713533988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WIZQJgLQuso8MtGJQEGSp3LPmH3JxhvBp1TBRgREMdc=; b=NSzUVL2s6yQT0n88ZF4cQ4W7Dar8knaXANpuEXVYW1GxCd9+CkPfUNUlX+ZH5NEYsw2qDp tTXMgkpDr3BOgZsWBNz2/gNOXMedYOfroMBL9qjUvfFi4EsqsCwWRZO7vcfjUt5u/8OjA3 0N9yBIyEF3Vrn/n3TlgNyqfLygj2AKyJ2tkSC/Txo6UI9QZZ7YD6GjHQmZPW5mgDOizE4c aCUrL4EG9APxg1GmVU0EiirYDKsggOMZJtWr1ixkgNec6uni8RC9JJkFkXW1yVQf6MdOkq kUCMjVIKy+YpLEOm1r0CC8mFparKtl8Fm7Se+Ik525obIesQVP0WqhDEfDUR4g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1713533988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WIZQJgLQuso8MtGJQEGSp3LPmH3JxhvBp1TBRgREMdc=; b=l2fIWPtKuBcqZBNsu8M3wEl+jLtyoobgh41irJDkodb/ABA69xN7jHcMFIA3TjVSdcSf+2 2TDK7GCFSy95cqDA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] update.sh: Remove existing entries for ALIENVAULT & SPAMHAUS_EDROP Date: Fri, 19 Apr 2024 15:39:40 +0200 Message-ID: <20240419133941.3503396-2-adolf.belka@ipfire.org> In-Reply-To: <20240419133941.3503396-1-adolf.belka@ipfire.org> References: <20240419133941.3503396-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: TXR2VCJXMQXIQEZ37W22GDZEXOLJFZEQ X-Message-ID-Hash: TXR2VCJXMQXIQEZ37W22GDZEXOLJFZEQ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - This removes any time entries in the modified file for either ALIENVAULT or SPAMHAUS_EDROP. - This also removes any blocklists for either of these sources from the /var/lib/ipblocklist directory. - This patch will ensure that any reference to either of these sources is removed from the ipblocklist files. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/core/186/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index d79a35133..9a4bd7f2a 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -123,6 +123,17 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi +# Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file +# and the associated ipblocklist files from the /var/lib/ipblocklist directory +sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified +sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified +if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then + rm /var/lib/ipblocklist/ALIENVAULT.conf +fi +if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then + rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf +fi + # This update needs a reboot... touch /var/run/need_reboot From patchwork Fri Apr 19 13:39:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7746 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNs3jVYz3wyH for ; Fri, 19 Apr 2024 13:39:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4VLbNm4QWTz2y8; Fri, 19 Apr 2024 13:39:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4VLbNm0XPwz32sM; Fri, 19 Apr 2024 13:39:52 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4VLbNh4LVCz32rY for ; Fri, 19 Apr 2024 13:39:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4VLbNh1LjLz2Qx; Fri, 19 Apr 2024 13:39:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1713533988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f30GxmhER/GoVE6onW+Y7rCrIvc21Lv9LheH/zmQR+s=; b=0NjDeuckLX0hY9rhoD25BuuPo6WRbnS3C+iwTbWZwlcFXQmqCpIvy14do/GWl/UPrnR43H aUW+nZ/6XDIDajBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1713533988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f30GxmhER/GoVE6onW+Y7rCrIvc21Lv9LheH/zmQR+s=; b=lh4KJsyT7NQYAVREAoZz15KDEbzsGIJ7cyqw/RFfWuwxTFtTQpngP/LKa4V0ZWJAaabKv6 rO5D/0A1tIGVoFxOrbbMP8gfvZKpjxchGLn7i9Ot1hzDKLZq7WDmueC2y4Fi30NbNi4qF3 SJaIbku0FXyN4NKDMG8izbgbXiswHEi+8UH/evqzaZ6KfjKLddhR16vbheEkC+QxhqZ5uq knRHCJz6zBRasEvwZKi17LQqRJhunH9WgbyKmHzZDINx7x/s5inkkeghjidVh38dmPuuTl k0TsevAY+hK6jhJC2n1oiL1hOUQA79l6BL1V21S6J07DkDZgvS3N1Lmbe3QZBw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/3] backup.pl: removes any references to ALIENVAULT & SPAMHAUSEDROP from restores Date: Fri, 19 Apr 2024 15:39:41 +0200 Message-ID: <20240419133941.3503396-3-adolf.belka@ipfire.org> In-Reply-To: <20240419133941.3503396-1-adolf.belka@ipfire.org> References: <20240419133941.3503396-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: G2MKNRSTXEERZ7KIG6HWWQF6SZA7KYJW X-Message-ID-Hash: G2MKNRSTXEERZ7KIG6HWWQF6SZA7KYJW X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - This patch ensures that if a restore is carried out from an earlier version that includes ALIENVAULT and/or SPAMHAUS_EDROP that the references will be removed. - This is the same code as was put into the update.sh file with the previous patch of this set. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/backup/backup.pl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index b43420740..d848084e9 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -193,7 +193,7 @@ restore_backup() { # Update OpenVPN CRL /etc/fcron.daily/openvpn-crl-updater - + # Update OpenVPN N2N Client Configs ## Add providers legacy default line to n2n client config files # Check if ovpnconfig exists and is not empty @@ -246,6 +246,17 @@ restore_backup() { -signkey /etc/httpd/server.key \ -out /etc/httpd/server.crt &>/dev/null fi + + # Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file + # and the associated ipblocklist files from the /var/lib/ipblocklist directory + sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified + sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified + if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then + rm /var/lib/ipblocklist/ALIENVAULT.conf + fi + if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then + rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf + fi return 0 }