- Utils.py Fixed a security hole which allowed a crafted URI to inject

  bogus apparent messages into the error log, possibly inducing an admin to
  visit a phishing site.

- options.py
  Topics.py
  Tagger.py
  MailList.py
  Utils.py
  Version.py
  versions.py
  The processing of Topics regular expressions has changed. Previously the
  Topics regexp was compiled in verbose mode but not documented as such
  which caused some confusion.  Also, the documentation indicated that topic
  keywords could be entered one per line, but these entries were not
  properly.  Topics regexps are now compiled in non-verbose mode and multi-
  line entries are 'ored'.  Existing Topics regexps will be converted when
  the list is updated so they will continue to work.

1 files changed, 5 insertions, 2 deletions

diff --git a/Mailman/Gui/Topics.py b/Mailman/Gui/Topics.py
index 282930b7c..147b2de04 100644
--- a/Mailman/Gui/Topics.py
+++ b/Mailman/Gui/Topics.py
@@ -22,6 +22,8 @@ from Mailman import Utils
 from Mailman.i18n import _
 from Mailman.Gui.GUIBase import GUIBase
 
+OR = '|'
+
 
 
 class Topics(GUIBase):
@@ -119,9 +121,10 @@ class Topics(GUIBase):
             # Make sure the pattern was a legal regular expression
             name = Utils.websafe(name)
             try:
-                re.compile(pattern)
+                orpattern = OR.join(pattern.splitlines())
+                re.compile(orpattern)
             except (re.error, TypeError):
-                safepattern = Utils.websafe(pattern)
+                safepattern = Utils.websafe(orpattern)
                 doc.addError(_("""The topic pattern '%(safepattern)s' is not a
                 legal regular expression.  It will be discarded."""))
                 continue