lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter/aliases: minor regression in maintaining target alias file (/var/db/aliastables/%s.txt). when it's either changed, expired or simply not there, it should dump the contents before loading it with pfctl

Browse Source
This commit is contained in:
Ad Schellevis 2021-01-05 14:52:44 +01:00
parent f29c0b9728
commit d9891b1ff9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/scripts/filter/update_tables.py
View File

@ -137,13 +137,8 @@ if __name__ == '__main__':
alias_changed_or_expired = max(alias_changed_or_expired, rel_alias.changed(), rel_alias.expired())
alias_content += rel_alias.resolve()
# when the alias or any of it's dependencies has changed, generate new
if alias_changed_or_expired:
alias_content_txt = '\n'.join(sorted(alias_content))
open('/var/db/aliastables/%s.txt' % alias_name, 'w').write(alias_content_txt)
elif os.path.isfile('/var/db/aliastables/%s.txt' % alias_name):
alias_content_txt = open('/var/db/aliastables/%s.txt' % alias_name, 'r').read()
else:
alias_content_txt = ""
if alias_changed_or_expired or not os.path.isfile('/var/db/aliastables/%s.txt' % alias_name):
open('/var/db/aliastables/%s.txt' % alias_name, 'w').write('\n'.join(sorted(alias_content)))
alias_pf_content = list()
sp = subprocess.run(['/sbin/pfctl', '-t', alias_name, '-T', 'show'], capture_output=True, text=True)