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

Warn about deleting key for active connection

Browse source
This commit is contained in:
Timotej Lazar 2023-12-10 12:58:20 +01:00
parent bb68978b22
commit 85714f83b9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web/templates/vpn/index.html
View file

@ -111,13 +111,12 @@ function fetch_keys() {
}); });
var li = document.createElement('li'); var li = document.createElement('li');
li.innerHTML = ' ' + (new Date(key.time*1000).toISOString().split('T')[0]) + li.innerHTML = ' ' + (new Date(key.time*1000).toISOString().split('T')[0]) +
' <code>' + key.key + '</code>' + ' <code>' + key.key + '</code> ' + key.name +
(key.active ? '<font color="red"><sup>★</sup></font> ' : ' ') + (key.active ? '<font color="red"><sup>★</sup></font> ' : '');
key.name;
li.prepend(a); li.prepend(a);
keys.appendChild(li); keys.appendChild(li);
if (key.active) if (key.active)
warning.innerHTML = '<font color="red"><sup>★</sup></font>Ta ključ uporablja aktivna povezava. Če ga odstranite, bo prekinjena.'; warning.innerHTML = '<font color="red"><sup>★</sup></font> Ta ključ uporablja trenutna povezava. Če ga odstranite, bo prekinjena.';
} }
document.querySelector('section.keys').style.display = (Object.keys(data).length ? 'unset' : 'none'); document.querySelector('section.keys').style.display = (Object.keys(data).length ? 'unset' : 'none');
}) })

4
web/vpn.py
View file

@ -22,7 +22,9 @@ def index():
@flask_login.login_required @flask_login.login_required
def list(): def list():
user = flask_login.current_user.get_id() user = flask_login.current_user.get_id()
return flask.jsonify({k: v for k, v in db.load('wireguard').items() if v.get('user') == user}) return flask.jsonify(
{k: v | {'active': flask.request.remote_addr in (v.get('ip'), v.get('ip6'))}
for k, v in db.load('wireguard').items() if v.get('user') == user})
@blueprint.route('/new', methods=('POST',)) @blueprint.route('/new', methods=('POST',))
@flask_login.login_required @flask_login.login_required