~ubuntu-branches/ubuntu/oneiric/moin/oneiric-security

# HG changeset patch

# User Thomas Waldmann <tw AT waldmann-edv DOT de>

# Date 1200688823 -3600

# Node ID dbe95b27954adcb135e392ff1f9c883d0cfb7dc6

# Parent  ca98a59c590262c1a7cad51be6af1dfa40e605fe

fixed Despam action: editor grouping was broken, increase time interval to 30d

 

diff -r ca98a59c5902 -r dbe95b27954a MoinMoin/action/Despam.py

--- a/MoinMoin/action/Despam.py Fri Oct 26 09:15:18 2007 +0200

+++ b/MoinMoin/action/Despam.py Fri Jan 18 21:40:23 2008 +0100

@@ -8,6 +8,8 @@

     @license: GNU GPL, see COPYING for details.

 """

 

+DAYS = 30 # we look for spam edits in the last x days

+

 import time

 

 from MoinMoin.logfile import editlog

@@ -16,6 +18,20 @@ from MoinMoin import wikiutil, Page, Pag

 from MoinMoin import wikiutil, Page, PageEditor

 from MoinMoin.macro import RecentChanges

 from MoinMoin.formatter.text_html import Formatter

+

+def render(editor_tuple):

+    etype, evalue = editor_tuple

+    if etype == 'ip':

+        ret = evalue

+    elif etype == 'interwiki':

+        ewiki, euser = evalue

+        if ewiki == 'Self':

+            ret = euser

+        else:

+            ret = '%s:%s' % evalue

+    else:

+        ret = repr(editor_tuple)

+    return ret

 

 def show_editors(request, pagename, timestamp):

     _ =  request.getText

@@ -31,13 +47,14 @@ def show_editors(request, pagename, time

         if not request.user.may.read(line.pagename):

             continue

         

-        editor = line.getEditor(request)

+        editor = line.getInterwikiEditorData(request)

         if not line.pagename in pages:

             pages[line.pagename] = 1

             editors[editor] = editors.get(editor, 0) + 1

             

-    editors = [(nr, editor) for editor, nr in editors.iteritems()]

+    editors = [(nr, editor) for editor, nr in editors.items()]

     editors.sort()

+    editors.reverse()

 

     pg = Page.Page(request, pagename)

 

@@ -46,7 +63,7 @@ def show_editors(request, pagename, time

                        Column('pages', label=_("Pages"), align='right'),

                        Column('link', label='', align='left')]

     for nr, editor in editors:

-        dataset.addRow((editor, unicode(nr), pg.link_to(request, text=_("Select Author"), querystr="action=Despam&editor=%s" % wikiutil.url_quote_plus(editor))))

+        dataset.addRow((render(editor), unicode(nr), pg.link_to(request, text=_("Select Author"), querystr="action=Despam&editor=%s" % wikiutil.url_quote_plus(repr(editor)))))

     

     table = DataBrowserWidget(request)

     table.setData(dataset)

@@ -77,7 +94,7 @@ def show_pages(request, pagename, editor

 

         if not line.pagename in pages:

             pages[line.pagename] = 1

-            if line.getEditor(request) == editor:

+            if repr(line.getInterwikiEditorData(request)) == editor:

                 line.time_tuple = request.user.getTime(wikiutil.version2timestamp(line.ed_time_usecs))

                 request.write(RecentChanges.format_page_edits(macro, [line], timestamp))

 

@@ -104,10 +121,10 @@ def revert_page(request, pagename, edito

     for line in log.reverse():

         if first:

             first = False

-            if line.getEditor(request) != editor:

+            if repr(line.getInterwikiEditorData(request)) != editor:

                 return

         else:

-            if line.getEditor(request) != editor:

+            if repr(line.getInterwikiEditorData(request)) != editor:

                 rev = line.rev

                 break

 

@@ -144,17 +161,17 @@ def revert_pages(request, editor, timest

 

         if not line.pagename in pages:

             pages[line.pagename] = 1

-            if line.getEditor(request) == editor:

+            if repr(line.getInterwikiEditorData(request)) == editor:

                 revertpages.append(line.pagename)

 

-    request.write("Debug: Pages to revert:<br>%s" % "<br>".join(revertpages))

+    request.write("Pages to revert:<br>%s" % "<br>".join(revertpages))

     for pagename in revertpages:

-        request.write("Debug: Begin reverting %s ...<br>" % pagename)

+        request.write("Begin reverting %s ...<br>" % pagename)

         msg = revert_page(request, pagename, editor)

         if msg:

             request.write("<p>%s: %s</p>" % (

                 Page.Page(request, pagename).link_to(request), msg))

-        request.write("Debug: Finished reverting %s.<br>" % pagename)

+        request.write("Finished reverting %s.<br>" % pagename)

 

 def execute(pagename, request):

     _ = request.getText

@@ -166,7 +183,7 @@ def execute(pagename, request):

             msg = _('You are not allowed to use this action.'))

 

     editor = request.form.get('editor', [None])[0]

-    timestamp = time.time() - 24 * 3600

+    timestamp = time.time() - DAYS * 24 * 3600

        # request.form.get('timestamp', [None])[0]

     ok = request.form.get('ok', [0])[0]

 

diff -r ca98a59c5902 -r dbe95b27954a docs/CHANGES

--- a/docs/CHANGES      Fri Oct 26 09:15:18 2007 +0200

+++ b/docs/CHANGES      Fri Jan 18 21:40:23 2008 +0100

@@ -41,6 +41,8 @@ Version 1.5.current:

     * Fix "Toggle line numbers" link in code areas, so it gets translated

       for the current user's language.

     * added missing data/plugin/converter package

+    * Fixed Despam action (same editor grouping was broken), now looking for

+      spam edits in the last 30 days.

 

 Version 1.5.8:

   New features: