diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py

index d187332..defc58d 100644

--- a/Mailman/Cgi/admindb.py

+++ b/Mailman/Cgi/admindb.py

@@ -39,6 +39,7 @@ from Mailman.ListAdmin import readMessage

 from Mailman.Cgi import Auth

 from Mailman.htmlformat import *

 from Mailman.Logging.Syslog import syslog

+from Mailman.CSRFcheck import csrf_check

 EMPTYSTRING = ''

 NL = '\n'

@@ -51,6 +52,9 @@ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)

 EXCERPT_HEIGHT = 10

 EXCERPT_WIDTH = 76

+AUTH_CONTEXTS = (mm_cfg.AuthListAdmin, mm_cfg.AuthSiteAdmin,

+                 mm_cfg.AuthListModerator)

+

 def helds_by_sender(mlist):

@@ -100,6 +104,18 @@ def main():

     # Make sure the user is authorized to see this page.

     cgidata = cgi.FieldStorage(keep_blank_values=1)

+    # CSRF check

+    safe_params = ['adminpw', 'admlogin', 'msgid', 'sender', 'details']

+    params = cgidata.keys()

+    if set(params) - set(safe_params):

+        csrf_checked = csrf_check(mlist, cgidata.getvalue('csrf_token'))

+    else:

+        csrf_checked = True

+    # if password is present, void cookie to force password authentication.

+    if cgidata.getvalue('adminpw'):

+        os.environ['HTTP_COOKIE'] = ''

+        csrf_checked = True

+

     if not mlist.WebAuthenticate((mm_cfg.AuthListAdmin,

                                   mm_cfg.AuthListModerator,

                                   mm_cfg.AuthSiteAdmin),

@@ -177,7 +193,11 @@ def main():

         elif not details:

             # This is a form submission

             doc.SetTitle(_('%(realname)s Administrative Database Results'))

-            process_form(mlist, doc, cgidata)

+            if csrf_checked:

+                process_form(mlist, doc, cgidata)

+            else:

+                doc.addError(

+                    _('The form lifetime has expired. (request forgery check)'))

         # Now print the results and we're done.  Short circuit for when there

         # are no pending requests, but be sure to save the results!

         admindburl = mlist.GetScriptURL('admindb', absolute=1)

@@ -198,7 +218,7 @@ def main():

             mlist.Save()

             return

-        form = Form(admindburl)

+        form = Form(admindburl, mlist=mlist, contexts=AUTH_CONTEXTS)

         # Add the instructions template

         if details == 'instructions':

             doc.AddItem(Header(

diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py

index ee1ccd0..5c9416e 100644

--- a/Mailman/Cgi/edithtml.py

+++ b/Mailman/Cgi/edithtml.py

@@ -30,9 +30,12 @@ from Mailman import Errors

 from Mailman.Cgi import Auth

 from Mailman.Logging.Syslog import syslog

 from Mailman import i18n

+from Mailman.CSRFcheck import csrf_check

 _ = i18n._

+AUTH_CONTEXTS = (mm_cfg.AuthListAdmin, mm_cfg.AuthSiteAdmin)

+

 def main():

@@ -82,6 +85,18 @@ def main():

     # Must be authenticated to get any farther

     cgidata = cgi.FieldStorage()

+    # CSRF check

+    safe_params = ['VARHELP', 'adminpw', 'admlogin']

+    params = cgidata.keys()

+    if set(params) - set(safe_params):

+        csrf_checked = csrf_check(mlist, cgidata.getvalue('csrf_token'))

+    else:

+        csrf_checked = True

+    # if password is present, void cookie to force password authentication.

+    if cgidata.getvalue('adminpw'):

+        os.environ['HTTP_COOKIE'] = ''

+        csrf_checked = True

+

     # Editing the html for a list is limited to the list admin and site admin.

     if not mlist.WebAuthenticate((mm_cfg.AuthListAdmin,

                                   mm_cfg.AuthSiteAdmin),

@@ -126,7 +141,11 @@ def main():

     try:

         if cgidata.keys():

-            ChangeHTML(mlist, cgidata, template_name, doc)

+            if csrf_checked:

+                ChangeHTML(mlist, cgidata, template_name, doc)

+            else:

+                doc.addError(

+                  _('The form lifetime has expired. (request forgery check)'))

         FormatHTML(mlist, doc, template_name, template_info)

     finally:

         doc.AddItem(mlist.GetMailmanFooter())

@@ -145,7 +164,8 @@ def FormatHTML(mlist, doc, template_name, template_info):

     doc.AddItem(FontSize("+1", link))

     doc.AddItem('
')

     doc.AddItem('
')

-    form = Form(mlist.GetScriptURL('edithtml') + '/' + template_name)

+    form = Form(mlist.GetScriptURL('edithtml') + '/' + template_name,

+               mlist=mlist, contexts=AUTH_CONTEXTS)

     text = Utils.maketext(template_name, raw=1, mlist=mlist)

     # MAS: Don't websafe twice.  TextArea does it.

     form.AddItem(TextArea('html_code', text, rows=40, cols=75))

diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py

index ae701a7..328d9d5 100644

--- a/Mailman/Cgi/options.py

+++ b/Mailman/Cgi/options.py

@@ -33,6 +33,7 @@ from Mailman import MemberAdaptor

 from Mailman import i18n

 from Mailman.htmlformat import *

 from Mailman.Logging.Syslog import syslog

+from Mailman.CSRFcheck import csrf_check

 SLASH = '/'

 SETLANGUAGE = -1

@@ -47,6 +48,8 @@ except NameError:

     True = 1

     False = 0

+AUTH_CONTEXTS = (mm_cfg.AuthListAdmin, mm_cfg.AuthSiteAdmin,

+                 mm_cfg.AuthListModerator, mm_cfg.AuthUser)

 def main():

@@ -88,6 +91,19 @@ def main():

     # The total contents of the user's response

     cgidata = cgi.FieldStorage(keep_blank_values=1)

+    # CSRF check

+    safe_params = ['displang-button', 'language', 'email', 'password', 'login',

+                   'login-unsub', 'login-remind', 'VARHELP', 'UserOptions']

+    params = cgidata.keys()

+    if set(params) - set(safe_params):

+        csrf_checked = csrf_check(mlist, cgidata.getvalue('csrf_token'))

+    else:

+        csrf_checked = True

+    # if password is present, void cookie to force password authentication.

+    if cgidata.getvalue('password'):

+        os.environ['HTTP_COOKIE'] = ''

+        csrf_checked = True

+

     # Set the language for the page.  If we're coming from the listinfo cgi,

     # we might have a 'language' key in the cgi data.  That was an explicit

     # preference to view the page in, so we should honor that here.  If that's

@@ -269,6 +285,15 @@ def main():

     # options.  The first set of checks does not require the list to be

     # locked.

+    # Before going further, get the result of CSRF check and do nothing 

+    # if it has failed.

+    if csrf_checked == False:

+        doc.addError(

+            _('The form lifetime has expired. (request forgery check)'))

+        options_page(mlist, doc, user, cpuser, userlang)

+        print doc.Format()

+        return

+

     if cgidata.has_key('logout'):

         print mlist.ZapCookie(mm_cfg.AuthUser, user)

         loginpage(mlist, doc, user, language)

@@ -779,7 +804,8 @@ def options_page(mlist, doc, user, cpuser, userlang, message=''):

         mlist.FormatButton('othersubs',

                            _('List my other subscriptions')))

     replacements['<mm-form-start>'] = (

-        mlist.FormatFormStart('options', user))

+        mlist.FormatFormStart('options', user, mlist=mlist, 

+            contexts=AUTH_CONTEXTS, user=user))

     replacements['<mm-user>'] = user

     replacements['<mm-presentable-user>'] = presentable_user

     replacements['<mm-email-my-pw>'] = mlist.FormatButton(

diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py

index dad51e7..3afe4bb 100644

--- a/Mailman/HTMLFormatter.py

+++ b/Mailman/HTMLFormatter.py

@@ -28,6 +28,8 @@ from Mailman.htmlformat import *

 from Mailman.i18n import _

+from Mailman.CSRFcheck import csrf_token

+

 EMPTYSTRING = ''

 BR = '
'

@@ -314,12 +316,17 @@ class HTMLFormatter:

             container.AddItem("</center>")

         return container

-    def FormatFormStart(self, name, extra=''):

+    def FormatFormStart(self, name, extra='',

+                        mlist=None, contexts=None, user=None):

         base_url = self.GetScriptURL(name)

         if extra:

             full_url = "%s/%s" % (base_url, extra)

         else:

             full_url = base_url

+        if mlist:

+            return ("""<form method="POST" action="%s">

+<input type="hidden" name="csrf_token" value="%s">""" 

+                % (full_url, csrf_token(mlist, contexts, user)))

         return ('<FORM Method=POST ACTION="%s">' % full_url)

     def FormatArchiveAnchor(self):

diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py

index 2387096..e2ad2e4 100644

--- a/Mailman/htmlformat.py

+++ b/Mailman/htmlformat.py

@@ -405,13 +405,14 @@ class Center(StdContainer):

 class Form(Container):

     def __init__(self, action='', method='POST', encoding=None, 

-                       mlist=None, contexts=None, *items):

+                       mlist=None, contexts=None, user=None, *items):

         apply(Container.__init__, (self,) +  items)

         self.action = action

         self.method = method

         self.encoding = encoding

         self.mlist = mlist

         self.contexts = contexts

+        self.user = user

     def set_action(self, action):

         self.action = action

@@ -426,7 +427,7 @@ class Form(Container):

         if self.mlist:

             output = output + \

                 '<input type="hidden" name="csrf_token" value="%s">\n' \

-                % csrf_token(self.mlist, self.contexts)

+                % csrf_token(self.mlist, self.contexts, self.user)

         output = output + Container.Format(self, indent+2)

         output = '%s\n%s</FORM>\n' % (output, spaces)

         return output