rc/friwall
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate error handling

Browse source 
Do or do not; there is no try. With some exceptions.
This commit is contained in:
Timotej Lazar 2023-07-12 14:18:31 +02:00
parent 8c824fe9e6
commit a5df435931
5 changed files with 106 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

58
web/rules.py
View file

@ -9,29 +9,23 @@ blueprint = flask.Blueprint('rules', __name__, url_prefix='/rules')
@blueprint.route('/', methods=('GET', 'POST'))
@flask_login.login_required
def index():
try:
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
if not flask_login.current_user.is_admin:
return flask.Response('forbidden', status=403, mimetype='text/plain')
if flask.request.method == 'POST':
with db.locked():
rules = db.read('rules')
form = flask.request.form
oldrules = {rule['name']: rule for rule in rules}
rules = []
for index, name in sorted(
zip(form.getlist('index'), form.getlist('name')), key=lambda e: int(e[0] or 0)):
if index and name:
rules.append(oldrules.get(name, {'name': name}))
db.write('rules', rules)
system.run(system.save_config)
if flask.request.method == 'POST':
with db.locked():
rules = db.read('rules')
form = flask.request.form
oldrules = {rule['name']: rule for rule in rules}
rules = []
for index, name in sorted(
zip(form.getlist('index'), form.getlist('name')), key=lambda e: int(e[0] or 0)):
if index and name:
rules.append(oldrules.get(name, {'name': name}))
db.write('rules', rules)
system.run(system.save_config)
return flask.render_template('rules/index.html', rules=db.load('rules'))
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')
return flask.render_template('rules/index.html', rules=db.load('rules'))
@blueprint.route('/edit/<int:index>', methods=('GET', 'POST'))
@flask_login.login_required
@ -53,11 +47,6 @@ def edit(index):
return flask.render_template('rules/edit.html', index=index, rule=db.load('rules')[index])
except IndexError as e:
return flask.Response(f'invalid rule: {index}', status=400, mimetype='text/plain')
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')
def can_toggle(user, rule):
return user.is_admin or not user.groups.isdisjoint(rule.get('managers', ()))
@ -65,15 +54,9 @@ def can_toggle(user, rule):
@blueprint.route('/manage')
@flask_login.login_required
def manage():
try:
rules = [rule|{'index': index} for index, rule in enumerate(db.load('rules'))
if can_toggle(flask_login.current_user, rule)]
return flask.render_template('rules/manage.html', rules=rules)
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')
rules = [rule|{'index': index} for index, rule in enumerate(db.load('rules'))
if can_toggle(flask_login.current_user, rule)]
return flask.render_template('rules/manage.html', rules=rules)
@blueprint.route('/toggle/<int:index>/<enable>')
@flask_login.login_required
@ -89,8 +72,3 @@ def toggle(index, enable):
return flask.redirect(flask.url_for('rules.manage'))
except IndexError as e:
return flask.Response(f'invalid rule: {index}', status=400, mimetype='text/plain')
except TimeoutError:
return flask.render_template('busy.html')
except Exception as e:
return flask.Response(f'something went catastrophically wrong: {e}',
status=400, mimetype='text/plain')