unbound / blacklists: cleanse domain input. change regex in https://github.com/opnsense/core/issues/4898 per suggestion @kulikov-a

This commit is contained in:
Ad Schellevis 2021-04-06 11:22:08 +02:00
parent d3063a2017
commit f538c08065
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ if __name__ == '__main__':
sys.exit(99)
domain_pattern = re.compile(
r'(([\da-zA-Z])([_\w-]{,62})\.){,127}(([\da-zA-Z])[_\w-]{,61})'
r'(([\da-zA-Z_])([_\w-]{,62})\.){,127}(([\da-zA-Z])[_\w-]{,61})'
r'?([\da-zA-Z]\.((xn\-\-[a-zA-Z\d]+)|([a-zA-Z\d]{2,})))'
)

View File

@ -55,7 +55,7 @@ custom_{{loop.index}}={{uri}}
# exclude localhost entries
default_pattern_1=.*localhost$
# exclude non domain entries
default_pattern_2=^(?![a-zA-Z\d]).*
default_pattern_2=^(?![a-zA-Z_\d]).*
{% if not helpers.empty('OPNsense.unboundplus.dnsbl.whitelists')%}
# user defined
{% for pattern in OPNsense.unboundplus.dnsbl.whitelists.split(',') %}