You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/03/08 19:26:00 UTC

svn commit: r1734118 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java

Author: metskem
Date: Tue Mar  8 18:25:59 2016
New Revision: 1734118

URL: http://svn.apache.org/viewvc?rev=1734118&view=rev
Log:
2016-03-08  Harry Metske (metskem@apache.org)

       * 2.10.3-svn-3

       * Added MaxPageNameLengtj support in SpamFilter

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1734118&r1=1734117&r2=1734118&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Mar  8 18:25:59 2016
@@ -1,3 +1,9 @@
+2016-03-08  Harry Metske (metskem@apache.org)
+
+       * 2.10.3-svn-3
+
+       * Added MaxPageNameLengtj support in SpamFilter
+
 2016-02-28  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-svn-2  Few more small fixes on the HADDOCK template 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1734118&r1=1734117&r2=1734118&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Mar  8 18:25:59 2016
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "2";
+    public static final String     BUILD         = "3";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java?rev=1734118&r1=1734117&r2=1734118&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java Tue Mar  8 18:25:59 2016
@@ -81,6 +81,7 @@ import net.sf.akismet.Akismet;
  *     that page.  Default is "SpamFilterWordList".
  *    <li>IPlist - Page name where the IP regexps are found.  Use [{SET ips='regexp list separated with spaces'}] on
  *     that page.  Default is "SpamFilterIPList".
+ *    <li>maxpagenamelength - Maximum page name length. Default is 100.
  *    <li>blacklist - The name of an attachment containing the list of spam patterns, one per line. Default is
  *        "SpamFilterWordList/blacklist.txt"</li>
  *    <li>errorpage - The page to which the user is redirected.  Has a special variable $msg which states the reason. Default is "RejectedMessage".
@@ -114,6 +115,7 @@ public class SpamFilter extends BasicPag
     private static final String REASON_TOO_MANY_URLS = "TooManyUrls";
     private static final String REASON_SIMILAR_MODIFICATIONS = "SimilarModifications";
     private static final String REASON_TOO_MANY_MODIFICATIONS = "TooManyModifications";
+    private static final String REASON_PAGENAME_TOO_LONG = "PageNameTooLong";
     private static final String REASON_UTF8_TRAP = "UTF8Trap";
 
     private static final String LISTVAR = "spamwords";
@@ -125,7 +127,11 @@ public class SpamFilter extends BasicPag
 
     /** The filter property name for specifying the page which contains the list of IPs to ban.
      *  Value is <tt>{@value}</tt>. */
-    public static final String  PROP_IPLIST              = "IPlist";
+    public static final String  PROP_IPLIST                = "IPlist";
+
+    /** The filter property name for specifying the maximum page name length.
+     *  Value is <tt>{@value}</tt>. */
+    public static final String  PROP_MAX_PAGENAME_LENGTH   = "maxpagenamelength";
 
     /** The filter property name for the page to which you are directed if Herb rejects your
      *  edit.  Value is <tt>{@value}</tt>. */
@@ -173,6 +179,7 @@ public class SpamFilter extends BasicPag
 
     private String          m_forbiddenWordsPage = "SpamFilterWordList";
     private String          m_forbiddenIPsPage   = "SpamFilterIPList";
+    private String          m_pageNameMaxLength  = "100";
     private String          m_errorPage          = "RejectedMessage";
     private String          m_blacklist          = "SpamFilterWordList/blacklist.txt";
 
@@ -244,6 +251,7 @@ public class SpamFilter extends BasicPag
     public void initialize( WikiEngine engine, Properties properties ) {
         m_forbiddenWordsPage = properties.getProperty( PROP_WORDLIST, m_forbiddenWordsPage );
         m_forbiddenIPsPage = properties.getProperty( PROP_IPLIST, m_forbiddenIPsPage);
+        m_pageNameMaxLength = properties.getProperty( PROP_MAX_PAGENAME_LENGTH, m_pageNameMaxLength);
         m_errorPage = properties.getProperty( PROP_ERRORPAGE, m_errorPage );
         m_limitSinglePageChanges = TextUtil.getIntegerProperty( properties,
                                                                 PROP_PAGECHANGES,
@@ -327,6 +335,7 @@ public class SpamFilter extends BasicPag
             checkSinglePageChange( context, content, change );
             checkIPList( context );
             checkPatternList( context, content, change );
+            checkPageName( context, content, change);
         }
 
         if( !m_stopAtFirstMatch ) {
@@ -341,6 +350,23 @@ public class SpamFilter extends BasicPag
         return content;
     }
 
+    private void checkPageName(WikiContext context, String content, Change change) throws RedirectException {
+        WikiPage page = context.getPage();
+        String pageName = page.getName();
+        int maxlength = Integer.valueOf(m_pageNameMaxLength);
+        if ( pageName.length() > maxlength) {
+            //
+            //  Spam filter has a match.
+            //
+
+            String uid = log( context, REJECT, REASON_PAGENAME_TOO_LONG + "(" + m_pageNameMaxLength + ")" , pageName);
+
+            log.info("SPAM:PageNameTooLong (" + uid + "). The length of the page name is too large (" + pageName.length() + " , limit is " + m_pageNameMaxLength + ")");
+            checkStrategy( context, REASON_PAGENAME_TOO_LONG, "Herb says '" + pageName + "' is a bad pageName and I trust Herb! (Incident code " + uid + ")" );
+
+        }
+    }
+
     private void checkStrategy( WikiContext context, String error, String message ) throws RedirectException {
         if( m_stopAtFirstMatch ) {
             throw new RedirectException( message, getRedirectPage( context ) );
@@ -819,7 +845,7 @@ public class SpamFilter extends BasicPag
                 //
                 String uid = log( context, REJECT, REASON_IP_BANNED_PERMANENTLY + "(" + p.getPattern() + ")", remoteIP );
 
-                log.info( "SPAM:Regexp (" + uid + "). remoteIP matches the IP filter '" + p.getPattern() + "'" );
+                log.info( "SPAM:IPBanList (" + uid + "). remoteIP matches the IP filter '" + p.getPattern() + "'" );
                 checkStrategy( context, REASON_IP_BANNED_PERMANENTLY, "Herb says '" + p.getPattern() + "' is a banned IP and I trust Herb! (Incident code " + uid + ")" );
             }
         }