ad/firegex
1
0
Fork 0
mirror of https://github.com/Av0idD4rk/firegex.git synced 2026-10-23 16:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from Pwnzer0tt1/dev

Browse Source 
Write pending block counters before an export
This commit is contained in:
Domingo Dirutigliano 2026-10-16 19:03:49 +02:00 committed by GitHub
commit e9e2289c2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/app.py
View File

@ -421,6 +421,9 @@ async def reset_firegex(form: ResetRequest):
@api.get('/export') @api.get('/export')
async def export_db(): async def export_db():
"""Export all configuration databases as JSON""" """Export all configuration databases as JSON"""
# Block counters are written once a second; without this a backup misses the last ones.
from routers.services import firewall
firewall.flush_blocks()
dbs = {} dbs = {}
if not os.path.exists('db'): if not os.path.exists('db'):
return dbs return dbs

9
tests/integration/test_backup.py
View File

@ -130,8 +130,15 @@ def test_a_deleted_service_comes_back_whole_and_filtering(api, protected, filter
_filters_as_configured(channel) _filters_as_configured(channel)
# Read through the services API first, which writes the counters still waiting: what # Read through the services API first, which writes the counters still waiting: what
# is compared afterwards includes them. # is compared afterwards includes them. Until two reads agree, because on NFQUEUE a
# block reaches the backend after the client has already seen the refusal — one
# counted between this snapshot and the export failed the 5.0.0 release run.
before = _snapshot(api, service_id) before = _snapshot(api, service_id)
for _ in range(10):
time.sleep(SETTLE)
before, settled = _snapshot(api, service_id), before
if before == settled:
break
backup = api.export_backup() backup = api.export_backup()
assert api.services_delete(service_id) assert api.services_delete(service_id)