Message ID | bcd36d0d-9883-2023-8c79-51a35bbc6551@link38.eu |
---|---|
State | Superseded |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 5F9E261592 for <patchwork@web02.i.ipfire.org>; Sun, 12 Aug 2018 12:27:37 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 88B081143922; Sun, 12 Aug 2018 11:27:36 +0100 (BST) Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 18599105FD51 for <development@lists.ipfire.org>; Sun, 12 Aug 2018 11:27:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1534069654; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=4ORUEWnBRPpSA9Zu89IIT6fofkIM5uw+fuabsbjqvS8=; b=WWL/PkT48hsHO62SqBVHrNXnUKv61Dtl/FgEjGmRX9NU+zrLVAGbncJ0+h948vRaNBmkUW VTbmCx4Rjpwm/nz7RqcUC4Hw29LqdX3iznSDU0DJFcZEXQJGBvHqJ+3r0dJxKl4FTmQRH3 r/8o5ZAVneRCLvIX2KbUxjcdTg6Ge80Xd91UYNfCPhyN6483tnVXVUofEJm4bANeQQAYp2 D0JS6gmxpQDYkSVL/7Nak0RTuOeIDY1Ajkn2wHSYWkxTDW45ZX6tdNVJmfu0uyLRQkgq6I hM18dwdRsQykMD8oouDrjGltrBsG1ioj/nwx+fOyvsSDX5qwSeigdVgMEwlBwQ== To: "ipfire: Development-List" <development@lists.ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@link38.eu> Openpgp: preference=signencrypt Autocrypt: addr=peter.mueller@link38.eu; prefer-encrypt=mutual; keydata= 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 eNtEia+FigGVqn+PSQ== Subject: [PATCH] download ET IDS rules via HTTPS Message-ID: <bcd36d0d-9883-2023-8c79-51a35bbc6551@link38.eu> Date: Sun, 12 Aug 2018 11:50:46 +0200 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="fBQhZUI6rRo4RBGKrv0j4G47cxNIxImcj" Authentication-Results: mail01.ipfire.org; dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu X-Spamd-Result: default: False [-11.64 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[link38.eu]; BAYES_HAM(-3.00)[100.00%]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; RCPT_COUNT_ONE(0.00)[1]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; DKIM_TRACE(0.00)[link38.eu:+]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2]; SIGNED_PGP(-2.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-3.78)[ip: (-9.91), ipnet: 37.120.160.0/19(-4.96), asn: 197540(-3.96), country: DE(-0.09)]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-11.64 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <https://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
download ET IDS rules via HTTPS
|
|
Commit Message
Peter Müller
Aug. 12, 2018, 7:50 p.m. UTC
The Emerging Threats ruleset server supports HTTPS. It should
be used for downloading the ruleset in IPFire, too.
This also needs to be applied on the upcoming ids.cgi file for Suricata
which I will do in a second patch.
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
---
html/cgi-bin/ids.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi, this is another patch that just doesn't to apply. I downloaded the email in mbox format and got this: [root@hughes ipfire-2.x]# git am -s /home/ms/Downloads/\[PATCH\]_download_ET_IDS_rules_via_HTTPS.mbox Applying: download ET IDS rules via HTTPS error: corrupt patch at line 14 Patch failed at 0001 download ET IDS rules via HTTPS Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Looking at "git am --show-current-patch": diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 9863251e2..d9d697deb 100644 - --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -265,7 +265,7 @@ if (!$errormessage) { } elsif ($snortsettings{'RULES'} eq 'community') { $url=3D" https://www.snort.org/rules/community"; } else { - - $url=3D"http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rul= es.tar.gz"; + $url=3D"https://rules.emergingthreats.net/open/snort-2.9.0/emerging.ru= les.tar.gz"; } =20 if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'AC= TION2'} eq "snort" ) { - --=20 2.16.4 There are fancy line-wraps in that patch. Is that the PGP stuff that is adding them? Best, - -Michael On Sun, 2018-08-12 at 11:50 +0200, Peter Müller wrote: > The Emerging Threats ruleset server supports HTTPS. It should > be used for downloading the ruleset in IPFire, too. > > This also needs to be applied on the upcoming ids.cgi file for Suricata > which I will do in a second patch. > > Signed-off-by: Peter Müller <peter.mueller@link38.eu> > --- > html/cgi-bin/ids.cgi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi > index 9863251e2..d9d697deb 100644 > --- a/html/cgi-bin/ids.cgi > +++ b/html/cgi-bin/ids.cgi > @@ -265,7 +265,7 @@ if (!$errormessage) { > } elsif ($snortsettings{'RULES'} eq 'community') { > $url=" https://www.snort.org/rules/community"; > } else { > - $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; > + $url="https://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; > } > > if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) { -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAltx5K0ACgkQgHnw/2+Q CQcddg//XjElESBx3KE4XNC0nDzNB4OBmUN6jXTYvud9CWuT3eTYvwRz9RQLuTrK +R22I0L7ZZ9gegKiN/QrhLPqxSY5aGFDJxBiI4JQtpb6J+81hTheF9GINGqucBCw ZpYaXBfVlFjKq7ryCaakr6gprtxuoyiUPdSrZ/G9GooRf252+XBtThyJ1yNJEiQH VDLNkHF8CAtrp5UNlARfk+iC/dBhz8Tj3LihGOm7E4aHviGkVwF2M/rgPIQjAYJS eQQ/iorFz0IaQzKIbyxeboZcxeyeQdzHDEnujfrNflgKHDfqeXnnWO0a13D27df6 cFNywMV5qm+zAy7KmuYqKlWpCQDEazZLidJz0pptcxV9+O5oQAEIBolXqNllBWXk kwq+t6KToGMQAcBKs85fHUNUsNqOknkWg3KaNlC+n5OtbT7u4anunfhflswZj01t 73XyjjJ+L2T8eTluBhb2v5ug8uhmJwTEXSXTXWVRE/VYj4OCLP6JZktEsDeWdo49 G3Rg4bjK0AYC2YsNN/g/hu6e8wzhcexu4mMdxM1pfpAx+BFHzKS9ActAzjI08ZPk 333rqaRRz6XxMTSc8IMLsFjkazvChlbRWuM1hnR9AzDSY2wMh3Sgqs4ZQuPCKI7A rAceVPqrvP6aoF9RuMKTbYXlUoxpxkgvdIL/y8wFvxDHvWdrVqg= =l9h+ -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hello Michael, thanks for the hint. These linewraps did not occur again after switching to inline PGP signatures, so I suspect it was because of a bug in PGP/MIME implementation of my MUA. Sorry for the delay. All affected patches were re-sent. Let me know if there is any trouble with them. Thanks, and best regards, Peter Müller - -- "We don't care. We don't have to. We're the Phone Company." -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEvP4SiGhEYDJyrRLk2UjyD317n2gFAlt0P2UACgkQ2UjyD317 n2gm/xAAqFNT6RprcdyGVJHDtf2cgQNyf4SrLkgQxKmIXDG02G/8GHx35vwi2mHT gAL884a8pjANVgD39zfyyhLRdAtp25hrtWTixz7LnisyMO66yTwtUNTDBGeA5BfK qKxOrQbZoRkYwmoJI63KDmqR6RrmgWaVQE9v4jaV76IcQP93zE+ehk4CfW/JJrPJ W4aBw45AL6hGIDuShp1FdKhvZ7VNqIbrxmMzd34p5eLil2ZlRcvp3Gsac98coXMY UP85k+/uLcO5iSKkT8kHjdVD+dE/REjsXpcXvdV53Qy/a4DenAKRCEtdccU2HmhT su8MwtxgrqOz8pVd0Cq4ZVEoR6RN55Y/6MWfdwSvoS4WcxzQJ7LE1ilK5zS7qYhW m8TwyM0ItLW05WlI/CRfpqLJ1r5Wcz4KiXxn/o4lC+Yo5EC3Z1qqKJXSibFEd6os xBOZ7YxZQe85xr4gRpdH5T71ugTDsgUJipeBMqH7jk6lpPTP4ZYl+qZbI+PND7SG xEQOBV69FLIhw+nzgyH1ECAT/fsTPxBVWE9q5LFu6u29p102kO7rElvzfo0lfjXs FK0dRlzzNWX3EzCOLE37bSo7nN7jVWXfTLnjIsP9nm86+b96YHpHJtGC8NdWw6hi kb3HjLseuJEg3SUCp87s5+t4AEnUaTSe6W0BM/2ZmrwsB0sGsqI= =VYpy -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On Wed, 2018-08-15 at 16:57 +0200, Peter Müller wrote: > Hello Michael, > > thanks for the hint. > > These linewraps did not occur again after switching to inline > PGP signatures, so I suspect it was because of a bug in PGP/MIME > implementation of my MUA. > > Sorry for the delay. All affected patches were re-sent. > > Let me know if there is any trouble with them. Yes there was. I responded on another email. > > Thanks, and best regards, > Peter Müller -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAlt1cLcACgkQgHnw/2+Q CQed5A/+OvTFprYCo6bzB49ek/BzM4xHfIyfTnu62nNfQYrUux5VmExRPdxZQhnd woyAjBzI3cVNhU7NDHl+QrUbLbP56J77ZDVQDEmvLRbPjCf8WzngSLdlXhSR2UFI pP4PK52uAeTcGqHHHd6CPlt2rSm7wJnaR2peEBTiNdwVFyfIiRboQnnGXtpg2kFB BfPASTeJ/x6vMJ1Yy3cURNeD1ozS0ryCm/KJYJAZUvbFOVwd1xfeWxxHeJ/bRptG 4vLIZTGFgwfx/XBE+INhMoYFodvnSHA+ns6Nvt37D48sA7tr1wmNUuQav0dTaBe4 gZNaVpELqOMW1/0XubJFFceAE9A4AZw/SHOGlq3pgQ3CieVG916mRXX+WttgKmRR EcReEARWJrJBt7igWOkdiLCYnf82eg/pq/CutIKvijdguIucfYT48JFk/pe8O6FC BH40Bb7pZR8X/wVoeTq5Zskb4zmQr9XgKYTkSSA/gMA/yBb/PSK372FPCFr7WMcj PqoUkCi2ebljJ26L5WofxNzmwMceCnHaPDXStGWVLh5X0dL96OBH7FEm4WpgH7G8 zaPgfmQmqctF3HGiFC2S5eey8lr72jcvrIg2cd8v5n5pb2nr+v8955qTGG4fg/NS q/5Up82Ri3MtFP7S0kYt3D2dHhR7cOwPn9KnEPA85242I3lwz1Y= =cs5l -----END PGP SIGNATURE-----
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 9863251e2..d9d697deb 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -265,7 +265,7 @@ if (!$errormessage) { } elsif ($snortsettings{'RULES'} eq 'community') { $url=" https://www.snort.org/rules/community"; } else { - $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; + $url="https://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) {