From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rob Brewer <ipfire-devel@grantura.co.uk>
To: development@lists.ipfire.org
Subject: Re: ipblacklist V2
Date: Tue, 08 Mar 2022 10:59:09 +0000
Message-ID: <t07ctt$hav$1@tuscan3.grantura.co.uk>
In-Reply-To: <t062er$ebr$1@tuscan3.grantura.co.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3074888928030582396=="
List-Id: <development.lists.ipfire.org>

--===============3074888928030582396==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Monday 07 March 2022 22:54 Rob Brewer wrote:

> On Monday 07 March 2022 20:39 Michael Tremer wrote:
>=20
>> Hello Rob,
>>=20
>>> On 5 Mar 2022, at 21:46, Rob Brewer <ipfire-devel(a)grantura.co.uk> wrote:
>>>=20
>>> Hi Stefan
>>>=20
>>> On Saturday 05 March 2022 18:52 Stefan Schantl wrote:
>>>=20
>>>> Hello *,
>>>>=20
>>>> I've made some development progress, which I want to share here:
>>>>=20
>>>> Most parts of the main backend script ("ipblacklist") from Tim and Rob
>>>> are ported into a new functions library (ipblocklist-functions.pl) and
>>>> into the main firewall script (rules.pl).
>>>>=20
>>> Good
>>>> This process is almost finished and currently allows to create the
>>>> firewall rules, download the blocklists and to convert them into an
>>>> ipset compatible format.
>>>>=20
>>>> Next step will be to import the frontend code (WUI) and adjust it to
>>>> use the backend code (functions) from the "ipblocklist-functions.pl".
>>>>=20
>>>> At this time the blocklist feature should be in a use-able state again
>>>> and I'll go to create an automatic update script and to import all the
>>>> logging pages stuff etc.
>>>>=20
>>>> The development progress and single commits can be found here:
>>>>=20
>>>>=20
>>> https://git.ipfire.org/?p=3Dpeople/stevee/ipfire-2.x.git;a=3Dshortlog;h=
=3Drefs/heads/ipblocklist
>>>>=20
>>>> As usual please feel free to ask any questions or to share your opinion
>>>> here.
>>>>=20
>>>> I wish you a nice day,
>>>>=20
>>>> -Stefan
>>> Great progress. I did find a bug I introduced when I modified the
>>> ipblacklist V2 perl script to add a space after the log-prefix BLKLST ent=
ry
>>> to make the logs compatible with other log-prefixes.
>>> This affected showrequestfromblacklist.dat and the modified version
>>> 'modified regex for V3 log-prefix added space' should be used.
>>>=20
>>> https://git.ipfire.org/?p=3Dpeople/helix/ipfire-2.x.git;a=3Dcommit;h=3D2c=
cc47f1944fcf1f8eec8ad132fa606081b21578
>>=20
>> Good catch, but wouldn=E2=80=99t it be helpful to add the space to all log=
 prefixes
>> so that it is always easily readable for humans, too?
>>=20
>> -Michael
>>=20
>=20
> I think ipblocklist was the only logfile entry to have this problem.
>=20
> Rob

I think there is a missing space in  rules.pl before tha last "\"
I think line 755 should be:

run("$IPTABLES -A ${blocklist}_DROP -j LOG -m limit --limit 10/second --log-p=
refix \"BLKLST_$blocklist \"");


and in my ipblocklists.dat I changed your line 298 to be compatible with core=
 163 as I don't think you can change the 'theme' now
and produced an error.

from:
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/i=
nclude/colors.txt", \%color);

to:=20
 &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", =
\%color);


Rob


--===============3074888928030582396==--