|
 |
1334bf |
diff --git a/Mailman/CSRFcheck.py b/Mailman/CSRFcheck.py
|
|
|
1334bf |
index 24e3e11..81998cf 100644
|
|
|
1334bf |
--- a/Mailman/CSRFcheck.py
|
|
|
1334bf |
+++ b/Mailman/CSRFcheck.py
|
|
|
1334bf |
@@ -55,7 +55,7 @@ def csrf_token(mlist, contexts, user=None):
|
|
|
1334bf |
token = binascii.hexlify(marshal.dumps((issued, keymac)))
|
|
|
1334bf |
return token
|
|
|
1334bf |
|
|
|
1334bf |
-def csrf_check(mlist, token, options_user=None):
|
|
|
1334bf |
+def csrf_check(mlist, token, cgi_user=None):
|
|
|
1334bf |
""" check token by mailman cookie validation algorithm """
|
|
|
1334bf |
try:
|
|
|
1334bf |
issued, keymac = marshal.loads(binascii.unhexlify(token))
|
|
|
1334bf |
@@ -67,12 +67,25 @@ def csrf_check(mlist, token, options_user=None):
|
|
|
1334bf |
key, user = key.split('+', 1)
|
|
|
1334bf |
else:
|
|
|
1334bf |
user = None
|
|
|
1334bf |
+ # Don't allow unprivileged tokens for admin or admindb.
|
|
|
1334bf |
+ if cgi_user == 'admin':
|
|
|
1334bf |
+ if key not in ('admin', 'site'):
|
|
|
1334bf |
+ syslog('mischief',
|
|
|
1334bf |
+ 'admin form submitted with CSRF token issued for %s.',
|
|
|
1334bf |
+ key + '+' + user if user else key)
|
|
|
1334bf |
+ return False
|
|
|
1334bf |
+ elif cgi_user == 'admindb':
|
|
|
1334bf |
+ if key not in ('moderator', 'admin', 'site'):
|
|
|
1334bf |
+ syslog('mischief',
|
|
|
1334bf |
+ 'admindb form submitted with CSRF token issued for %s.',
|
|
|
1334bf |
+ key + '+' + user if user else key)
|
|
|
1334bf |
+ return False
|
|
|
1334bf |
if user:
|
|
|
1334bf |
# This is for CVE-2021-42097. The token is a user token because
|
|
|
1334bf |
# of the fix for CVE-2021-42096 but it must match the user for
|
|
|
1334bf |
# whom the options page is requested.
|
|
|
1334bf |
raw_user = UnobscureEmail(urllib.unquote(user))
|
|
|
1334bf |
- if options_user and options_user != raw_user:
|
|
|
1334bf |
+ if cgi_user and cgi_user != raw_user:
|
|
|
1334bf |
syslog('mischief',
|
|
|
1334bf |
'Form for user %s submitted with CSRF token '
|
|
|
1334bf |
'issued for %s.',
|
|
|
1334bf |
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
|
|
|
1334bf |
index d2577b5..7c600df 100644
|
|
|
1334bf |
--- a/Mailman/Cgi/admin.py
|
|
|
1334bf |
+++ b/Mailman/Cgi/admin.py
|
|
|
1334bf |
@@ -107,7 +107,8 @@ def main():
|
|
|
1334bf |
'legend']
|
|
|
1334bf |
params = cgidata.keys()
|
|
|
1334bf |
if set(params) - set(safe_params):
|
|
|
1334bf |
- csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'))
|
|
|
1334bf |
+ csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'),
|
|
|
1334bf |
+ 'admin')
|
|
|
1334bf |
else:
|
|
|
1334bf |
csrf_checked = True
|
|
|
1334bf |
# if password is present, void cookie to force password authentication.
|
|
|
1334bf |
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
|
|
|
1334bf |
index 58bb357..c152501 100644
|
|
|
1334bf |
--- a/Mailman/Cgi/admindb.py
|
|
|
1334bf |
+++ b/Mailman/Cgi/admindb.py
|
|
|
1334bf |
@@ -144,7 +144,8 @@ def main():
|
|
|
1334bf |
safe_params = ['adminpw', 'admlogin', 'msgid', 'sender', 'details']
|
|
|
1334bf |
params = cgidata.keys()
|
|
|
1334bf |
if set(params) - set(safe_params):
|
|
|
1334bf |
- csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'))
|
|
|
1334bf |
+ csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'),
|
|
|
1334bf |
+ 'admindb')
|
|
|
1334bf |
else:
|
|
|
1334bf |
csrf_checked = True
|
|
|
1334bf |
# if password is present, void cookie to force password authentication.
|
|
|
1334bf |
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
|
|
|
1334bf |
index 1dd9e87..170e811 100644
|
|
|
1334bf |
--- a/Mailman/Cgi/edithtml.py
|
|
|
1334bf |
+++ b/Mailman/Cgi/edithtml.py
|
|
|
1334bf |
@@ -111,7 +111,8 @@ def main():
|
|
|
1334bf |
safe_params = ['VARHELP', 'adminpw', 'admlogin']
|
|
|
1334bf |
params = cgidata.keys()
|
|
|
1334bf |
if set(params) - set(safe_params):
|
|
|
1334bf |
- csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'))
|
|
|
1334bf |
+ csrf_checked = csrf_check(mlist, cgidata.getfirst('csrf_token'),
|
|
|
1334bf |
+ 'admin')
|
|
|
1334bf |
else:
|
|
|
1334bf |
csrf_checked = True
|
|
|
1334bf |
# if password is present, void cookie to force password authentication.
|