From f8d71b7b065e0f3a5341bd511a94e8960f2bef8f Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Thu, 25 Apr 2024 12:20:51 +0200
Subject: [PATCH] vpn: fix key name regex

---
 web/templates/vpn/index.html | 2 +-
 web/vpn.py                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/templates/vpn/index.html b/web/templates/vpn/index.html
index 0b51aef..5002f01 100644
--- a/web/templates/vpn/index.html
+++ b/web/templates/vpn/index.html
@@ -40,7 +40,7 @@ Na vsaki napravi, ki jo želite povezati v omrežje FRI, ustvarite nov ključ. P
 
 <p>
 <label for="name">Ime naprave</label><br>
-<input id="name" name="name" pattern="[.-_A-Za-z0-9 ]*" maxlength="16" placeholder="A-Z a-z 0-9 . _ - " />
+<input id="name" name="name" pattern="[-._A-Za-z0-9 ]*" maxlength="16" placeholder="A-Z a-z 0-9 . _ - " />
 <button id="submit" type="submit">Ustvari ključ</button>
 <p>
 <input type="checkbox" id="add_default" name="add_default" />
diff --git a/web/vpn.py b/web/vpn.py
index 8a5b818..bb09540 100644
--- a/web/vpn.py
+++ b/web/vpn.py
@@ -63,7 +63,7 @@ def new():
         else:
             return flask.Response('no more available IP addresses', status=500, mimetype='text/plain')
         now = datetime.datetime.utcnow()
-        name = re.sub('[^\w ]', '', flask.request.json.get('name', ''))
+        name = re.sub('[^-._A-Za-z0-9]', '', flask.request.json.get('name', ''))
 
         keys[str(ip)] = {
             'key': pubkey,