Development
This commit is contained in:
parent
563d82daf3
commit
70ccfe2c29
48 changed files with 549 additions and 578 deletions
|
|
@ -2,8 +2,8 @@ from pathlib import Path
|
|||
import copy
|
||||
import os
|
||||
from flask import Blueprint, request, redirect, flash, send_file, abort
|
||||
from auth import require_level
|
||||
from config_utils import load_config, verify_config_hash, record_group, diff_fields, CONFIGS_DIR
|
||||
import auth
|
||||
import config_utils
|
||||
import sanitize
|
||||
import mod_validation as validate
|
||||
|
||||
|
|
@ -11,11 +11,11 @@ _PAGE = Path(__file__).parent.name
|
|||
|
||||
bp = Blueprint(_PAGE, __name__)
|
||||
|
||||
LOG_FILE = f'{CONFIGS_DIR}/ddns.log'
|
||||
LOG_FILE = f'{config_utils.CONFIGS_DIR}/ddns.log'
|
||||
|
||||
|
||||
@bp.route('/action/ddns/addaccount_add', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def addaccount_add():
|
||||
provider_type = sanitize.filtervalue(request.form.get('provider', ''), validate.VALID_DDNS_PROVIDERS)
|
||||
description = sanitize.description(request.form.get('description', ''))
|
||||
|
|
@ -31,7 +31,7 @@ def addaccount_add():
|
|||
flash('Unknown provider type.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
|
@ -47,15 +47,15 @@ def addaccount_add():
|
|||
else:
|
||||
entry['api_token'] = request.form.get('api_token', '').strip()
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
cfg.setdefault('ddns', {}).setdefault('providers', []).append(entry)
|
||||
changes = diff_fields(None, entry)
|
||||
flash(record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
changes = config_utils.diff_fields(None, entry)
|
||||
flash(config_utils.record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/accounts_edit', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def accounts_edit():
|
||||
try:
|
||||
row_index = int(request.form.get('row_index', -1))
|
||||
|
|
@ -72,11 +72,11 @@ def accounts_edit():
|
|||
flash('Unknown provider type.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
providers = cfg.setdefault('ddns', {}).setdefault('providers', [])
|
||||
if row_index < 0 or row_index >= len(providers):
|
||||
flash('Invalid provider index.', 'error')
|
||||
|
|
@ -96,13 +96,13 @@ def accounts_edit():
|
|||
entry['api_token'] = request.form.get('api_token', '').strip()
|
||||
|
||||
providers[row_index] = entry
|
||||
changes = diff_fields(before, entry)
|
||||
flash(record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
changes = config_utils.diff_fields(before, entry)
|
||||
flash(config_utils.record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/accounts_delete', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def accounts_delete():
|
||||
try:
|
||||
row_index = int(request.form.get('row_index', -1))
|
||||
|
|
@ -110,11 +110,11 @@ def accounts_delete():
|
|||
flash('Invalid row index.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
providers = cfg.setdefault('ddns', {}).setdefault('providers', [])
|
||||
if row_index < 0 or row_index >= len(providers):
|
||||
flash('Invalid provider index.', 'error')
|
||||
|
|
@ -123,13 +123,13 @@ def accounts_delete():
|
|||
before = copy.deepcopy(providers[row_index])
|
||||
description = before.get('description', str(row_index))
|
||||
del providers[row_index]
|
||||
changes = diff_fields(before, None)
|
||||
flash(record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
changes = config_utils.diff_fields(before, None)
|
||||
flash(config_utils.record_group(cfg, 'ddns.providers', 'description', description, changes, 'ddns update', queue=False), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/ipcheckinterval_save', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def ipcheckinterval_save():
|
||||
raw = request.form.get('timer_interval', '').strip()
|
||||
try:
|
||||
|
|
@ -141,22 +141,22 @@ def ipcheckinterval_save():
|
|||
return redirect(f'/{_PAGE}')
|
||||
timer_interval = f'{mins}m'
|
||||
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
before = copy.deepcopy(cfg.get('ddns', {}).get('general', {}))
|
||||
cfg.setdefault('ddns', {}).setdefault('general', {})['timer_interval'] = timer_interval
|
||||
changes = diff_fields(before, cfg['ddns']['general'])
|
||||
flash(record_group(cfg, 'ddns.general', None, None, changes, 'core apply'), 'success')
|
||||
changes = config_utils.diff_fields(before, cfg['ddns']['general'])
|
||||
flash(config_utils.record_group(cfg, 'ddns.general', None, None, changes, 'core apply'), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/ipcheckservices_save', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def ipcheckservices_save():
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
|
@ -167,18 +167,18 @@ def ipcheckservices_save():
|
|||
flash('At least one IP check service is required.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
before = copy.deepcopy(cfg.get('ddns', {}).get('ip_check_services', []))
|
||||
services = [{'type': 'http', 'url': u} for u in http_services]
|
||||
services += [{'type': 'dig', 'url': u} for u in dig_services]
|
||||
cfg.setdefault('ddns', {})['ip_check_services'] = services
|
||||
changes = diff_fields({'ip_check_services': before}, {'ip_check_services': services})
|
||||
flash(record_group(cfg, 'ddns', None, None, changes, 'ddns update', queue=False), 'success')
|
||||
changes = config_utils.diff_fields({'ip_check_services': before}, {'ip_check_services': services})
|
||||
flash(config_utils.record_group(cfg, 'ddns', None, None, changes, 'ddns update', queue=False), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/logging_save', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def logging_save():
|
||||
log_max_kb = validate.int_range(request.form.get('log_max_kb', '').strip(), 64, None)
|
||||
if log_max_kb is None:
|
||||
|
|
@ -186,23 +186,23 @@ def logging_save():
|
|||
return redirect(f'/{_PAGE}')
|
||||
log_errors_only = 'log_errors_only' in request.form
|
||||
|
||||
if not verify_config_hash(request.form.get('config_hash', '')):
|
||||
if not config_utils.verify_config_hash(request.form.get('config_hash', '')):
|
||||
flash('Configuration was modified by another session. Please refresh and try again.', 'error')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
cfg = load_config()
|
||||
cfg = config_utils.load_config()
|
||||
before = copy.deepcopy(cfg.get('ddns', {}).get('general', {}))
|
||||
cfg.setdefault('ddns', {}).setdefault('general', {}).update({
|
||||
'log_max_kb': log_max_kb,
|
||||
'log_errors_only': log_errors_only,
|
||||
})
|
||||
changes = diff_fields(before, cfg['ddns']['general'])
|
||||
flash(record_group(cfg, 'ddns.general', None, None, changes, 'ddns update', queue=False), 'success')
|
||||
changes = config_utils.diff_fields(before, cfg['ddns']['general'])
|
||||
flash(config_utils.record_group(cfg, 'ddns.general', None, None, changes, 'ddns update', queue=False), 'success')
|
||||
return redirect(f'/{_PAGE}')
|
||||
|
||||
|
||||
@bp.route('/action/ddns/logging_clear', methods=['POST'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def logging_clear():
|
||||
try:
|
||||
open(LOG_FILE, 'w').close()
|
||||
|
|
@ -213,7 +213,7 @@ def logging_clear():
|
|||
|
||||
|
||||
@bp.route('/action/ddns/logging_download', methods=['GET'])
|
||||
@require_level('administrator')
|
||||
@auth.require_level('administrator')
|
||||
def logging_download():
|
||||
if not os.path.isfile(LOG_FILE):
|
||||
abort(404)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue