From 82edcb9364759aba3534a9241ba5fe59c24fe910 Mon Sep 17 00:00:00 2001
From: Richard Allitt <rsa33@srcf.net>
Date: Sun, 3 Dec 2023 09:46:16 +0000
Subject: [PATCH] Make list name validation consistent with job runner

---
 control/webapp/member.py  | 8 ++++++--
 control/webapp/society.py | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/control/webapp/member.py b/control/webapp/member.py
index 11d31b2..7856eba 100644
--- a/control/webapp/member.py
+++ b/control/webapp/member.py
@@ -6,6 +6,7 @@
 
 from srcf import domains
 from srcf.controllib import jobs
+from srcf.controllib.utils import validate_list_name
 from srcf.database import Domain
 
 from . import inspect_services, utils
@@ -130,9 +131,12 @@ def create_mailing_list():
         listname = request.form.get("listname", "").strip()
         if not listname:
             error = "Please enter a list name."
-        elif re.search(r"[^a-z0-9_-]", listname):
-            error = "List names can only contain letters, numbers, hyphens and underscores."
         else:
+            try:
+                validate_list_name(listname)
+            except ValueError as ex:
+                error = ex.args[0]
+        if not error:
             lists = inspect_services.lookup_mailinglists(mem.crsid)
             if "{}-{}".format(mem.crsid, listname) in lists:
                 error = "This mailing list already exists."
diff --git a/control/webapp/society.py b/control/webapp/society.py
index b2bd83a..9afc872 100644
--- a/control/webapp/society.py
+++ b/control/webapp/society.py
@@ -6,6 +6,7 @@
 
 from srcf import domains
 from srcf.controllib import jobs
+from srcf.controllib.utils import validate_list_name
 from srcf.database import Domain
 
 from . import inspect_services, utils
@@ -176,9 +177,12 @@ def create_mailing_list(society):
         listname = request.form.get("listname", "").strip()
         if not listname:
             error = "Please enter a list name."
-        elif re.search(r"[^a-z0-9_-]", listname):
-            error = "List names can only contain letters, numbers, hyphens and underscores."
         else:
+            try:
+                validate_list_name(listname)
+            except ValueError as ex:
+                error = ex.args[0]
+        if not error:
             lists = inspect_services.lookup_mailinglists(society)
             if "{}-{}".format(society, listname) in lists:
                 error = "This mailing list already exists."