Whitelist always wins

[DL6ER]

Sorry for the long delay, there was so much v6.0 stuff going on, that this slipped my attention in between.

I just pushed a new commit implementing something like

@jpgpi250

Is something like assets.adobedtm.com;querytype=!(ANY,HTTPS,SVCB) an option?

just without the extra (). If the first character is an !, the list is used as "everything except". If there is no ! (a simple list like A,AAAA), the usual interpretation of "only these" is used. This was considerably easier to implement and is fully backwards compatible with what we have now.

The

@jpgpi250

[2023-01-15 15:59:45.487 28711/T28727]     Hint: This regex matches only specific query types:
[2023-01-15 15:59:45.488 28711/T28727]       - AAAA
[2023-01-15 15:59:45.488 28711/T28727]       - ANY
[2023-01-15 15:59:45.488 28711/T28727]       - SRV
[2023-01-15 15:59:45.489 28711/T28727]       - SOA

lines will only be shown in regex debug mode.

I also already added automatic tests for

• ;querytype=ANY,SRV,HTTPS - matching ONLY ANY, SRV , and HTTPS type queries, and
• ;querytype=!ANY,SRV,HTTPS - matching everything EXCEPT ANY, SRV , and HTTPS type queries.

Please test away. The binaries already finished compiling while I have been writing this reply.

---

edit Related pull request (draft):

https://github.com/pi-hole/FTL/pull/1527