Compare commits
3 Commits
32032de81d
...
59ecd48210
Author | SHA1 | Date | |
---|---|---|---|
59ecd48210 | |||
dd66bf3dc9 | |||
d43a574579 |
@ -88,19 +88,28 @@ def create_app():
|
|||||||
name = untaint(PAT_NAME, name)
|
name = untaint(PAT_NAME, name)
|
||||||
app.logger.info(f'Flushing table f2b-{name}'
|
app.logger.info(f'Flushing table f2b-{name}'
|
||||||
f' in anchor f2b-jail/{remote_user}')
|
f' in anchor f2b-jail/{remote_user}')
|
||||||
|
reply = {'anchor': f'f2b-jail/{remote_user}',
|
||||||
|
'table': f'f2b-{name}',
|
||||||
|
'operation': 'list'}
|
||||||
|
try:
|
||||||
res = pfctl_table_op('f2b-jail/{remote_user}',
|
res = pfctl_table_op('f2b-jail/{remote_user}',
|
||||||
table='f2b-{name}',
|
table='f2b-{name}',
|
||||||
operation='show',
|
operation='show',
|
||||||
verbose=True)
|
verbose=True)
|
||||||
|
except CalledProcessError as err:
|
||||||
|
if err.stderr.find(b'pfctl: Table does not exist.') > 0:
|
||||||
|
res = []
|
||||||
|
reply.update({'error': f'\'{name}\' is not a known fail2ban jail'})
|
||||||
|
else:
|
||||||
|
raise err
|
||||||
|
|
||||||
result = [entry.groupdict() for entry in
|
result = [entry.groupdict() for entry in
|
||||||
re.finditer(_PFCTL_TABLE_PAT,
|
re.finditer(_PFCTL_TABLE_PAT,
|
||||||
'\n'.join([x.decode('ascii') for x in res]),
|
'\n'.join([x.decode('ascii') for x in res]),
|
||||||
re.MULTILINE|re.VERBOSE)]
|
re.MULTILINE|re.VERBOSE)]
|
||||||
|
reply.update({'result': result})
|
||||||
|
|
||||||
return jsonify({'anchor': f'f2b-jail/{remote_user}',
|
return jsonify(reply), 200 if len(res) else 404
|
||||||
'table': f'f2b-{name}',
|
|
||||||
'operation': 'list',
|
|
||||||
'result': result })
|
|
||||||
|
|
||||||
@app.route("/register", methods=['PUT', 'DELETE'])
|
@app.route("/register", methods=['PUT', 'DELETE'])
|
||||||
@auth.login_required
|
@auth.login_required
|
||||||
|
@ -94,9 +94,13 @@ def test_list_nonexistent_table(client, mocker, valid_credentials):
|
|||||||
run_res.returncode = 255
|
run_res.returncode = 255
|
||||||
run_res.check_returncode = noop
|
run_res.check_returncode = noop
|
||||||
|
|
||||||
# XXX raise a CalledProcessError here...
|
mocker.patch('jail2ban.pfctl.run',
|
||||||
|
return_value=run_res,
|
||||||
mocker.patch('jail2ban.pfctl.run', return_value=run_res)
|
side_effect=CalledProcessError(run_res.returncode,
|
||||||
|
'foobar',
|
||||||
|
output=run_res.stdout,
|
||||||
|
stderr=run_res.stderr)
|
||||||
|
)
|
||||||
|
|
||||||
response = client.get("/list/nonexistent",
|
response = client.get("/list/nonexistent",
|
||||||
headers={"Authorization":
|
headers={"Authorization":
|
||||||
|
Loading…
x
Reference in New Issue
Block a user