Handle pfctl_cfg_write output as expected

This commit is contained in:
2022-03-10 23:29:14 +01:00
parent c33e63978e
commit af1fef189c
3 changed files with 8 additions and 9 deletions

View File

@ -54,7 +54,7 @@ def create_app():
return jsonify({'anchor': f'f2b-jail/{remote_user}',
'table': f'f2b-{name}',
'operation': 'flush',
'result': res})
'result': [x.decode('ascii') for x in res]})
@app.route("/register", methods=['PUT', 'DELETE'])
@auth.login_required
@ -88,12 +88,11 @@ def create_app():
table=f'f2b-{name}',
operation='kill')
app.logger.info(f'pfctl -a f2b-jail/{remote_user} -f-')
return jsonify({'remote_user': remote_user, 'data': data})
return jsonify({'anchor': f'f2b-jail/{remote_user}',
'table': f'f2b-{name}',
'action': 'start' if request.method == 'PUT'
else 'stop',
'result': res})
'result': [x.decode('ascii') for x in res]})
@app.route("/ban", methods=['PUT', 'DELETE'])
@auth.login_required

View File

@ -29,7 +29,7 @@ def pfctl_cfg_write(anchor, cfg):
if res:
logging.info('Result: %s', res)
res.check_returncode()
return res
return res.stdout.splitlines()
def pfctl_table_op(anchor, **kwargs):