diff --git a/app.py b/app.py index cc7bf6d..7f6abcc 100644 --- a/app.py +++ b/app.py @@ -2,7 +2,6 @@ from flask import Flask, request, jsonify from flask_httpauth import HTTPBasicAuth from werkzeug.security import check_password_hash from ipaddress import ip_address -import logging import re from pfctl import pfctl_table_op, pfctl_cfg_read, pfctl_cfg_write @@ -10,7 +9,6 @@ from pfctl import pfctl_table_op, pfctl_cfg_read, pfctl_cfg_write app = Flask(__name__) auth = HTTPBasicAuth() -logging.basicConfig(level=logging.DEBUG) users = { "erg.verweg.com": 'pbkdf2:sha256:260000$leXVKkMYNu60eQZR$0893397beb241931d33d2c996e66447a375d3b7923aa32fc4af6b80eec716fbe' @@ -44,7 +42,7 @@ def verify_password(username, password): def flush(name): remote_user = auth.username() name = untaint(PAT_NAME, name) - logging.info(f'Flushing table f2b-{name}' + app.logger.info(f'Flushing table f2b-{name}' ' in anchor f2b-jail/{remote_user}') res = pfctl_table_op('f2b-jail/{remote_user}', table='f2b-{name}', @@ -86,7 +84,7 @@ def register(): pfctl_table_op(f'f2b-jail/{remote_user}', table=f'f2b-{name}', operation='kill') - logging.info(f'pfctl -a f2b-jail/{remote_user} -f-') + 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}', @@ -104,14 +102,14 @@ def ban(): name = untaint(PAT_NAME, data['name']) ip = ip_address(data['ip']) if request.method == 'PUT': - logging.info(f'Add {ip} to f2b-{name}' + app.logger.info(f'Add {ip} to f2b-{name}' f' in anchor f2b-jail/{remote_user}') res = pfctl_table_op(f'f2b-jail/{remote_user}', table=f'f2b-{name}', operation='add', value=str(ip)) elif request.method == 'DELETE': - logging.info(f'Remove {ip} from f2b-{name}' + app.logger.info(f'Remove {ip} from f2b-{name}' f' in anchor f2b-jail/{remote_user}') res = pfctl_table_op(f'f2b-jail/{remote_user}', table=f'f2b-{name}', @@ -129,11 +127,11 @@ def permission_err(error): ''' Show a json parsable error if the value is illegal ''' - logging.fatal(error) + app.logger.fatal(error) return jsonify({'error': str(error)}), 500 @auth.error_handler def auth_error(): - logging.error('Access Denied') + app.logger.error('Access Denied') return jsonify({'error': 'Access Denied'}), 401