Wiki2Go 1.22.1 → 1.24.0

data/bin/Wiki2Go_regenerate.rb

@@ -0,0 +1,9 @@
+#!/usr/local/bin/ruby
+
+require 'rubygems'
+gem "Wiki2Go"
+
+require 'fileutils'
+require 'Wiki2Go/Install/make_site'
+
+Wiki2Go::Install::regenerate_wiki(ARGV)

data/lib/Wiki2Go/Akismet.rb

@@ -0,0 +1,146 @@
+# Akismet
+#
+# Author:: David Czarnecki
+# Copyright:: Copyright (c) 2005 - David Czarnecki
+# License:: BSD
+
+require 'net/http'
+require 'uri'
+  
+
+module Wiki2Go
+
+  class Akismet
+
+    STANDARD_HEADERS = {
+      'User-Agent' => 'Akismet Ruby API/1.0',
+      'Content-Type' => 'application/x-www-form-urlencoded'
+    }
+  
+    # Instance variables
+    @apiKey
+    @blog
+    @verifiedKey
+    @proxyPort = nil
+    @proxyHost = nil
+
+    # Create a new instance of the Akismet class
+    #
+    # apiKey 
+    #   Your Akismet API key
+    # blog 
+    #   The blog associated with your api key
+    def initialize(apiKey, blog)
+      @apiKey = apiKey
+      @blog = blog
+      @verifiedKey = false
+    end
+  
+    # Set proxy information 
+    #
+    # proxyHost
+    #   Hostname for the proxy to use
+    # proxyPort
+    #   Port for the proxy
+    def set_proxy(proxyHost, proxyPort) 
+      @proxyPort = proxyPort
+      @proxyHost = proxyHost
+    end
+    
+    # Call to check and verify your API key. You may then call the #hasVerifiedKey method to see if your key has been validated.
+    def verify_API_key()
+      http = Net::HTTP.new('rest.akismet.com', 80, @proxyHost, @proxyPort)
+      path = '/1.1/verify-key'
+    
+      data="key=#{@apiKey}&blog=#{@blog}"
+    
+      resp, data = http.post(path, data, STANDARD_HEADERS)
+      @verifiedKey = (data == "valid")
+    end
+ 
+    # Returns <tt>true</tt> if the API key has been verified, <tt>false</tt> otherwise
+    def verified_key?()
+      return @verifiedKey
+    end
+  
+    # Internal call to Akismet. Prepares the data for posting to the Akismet service.
+    #
+    # akismet_function
+    #   The Akismet function that should be called
+    # user_ip (required)
+    #    IP address of the comment submitter.
+    # user_agent (required)
+    #    User agent information.
+    # referrer (note spelling)
+    #    The content of the HTTP_REFERER header should be sent here.
+    # permalink
+    #    The permanent location of the entry the comment was submitted to.
+    # comment_type
+    #    May be blank, comment, trackback, pingback, or a made up value like "registration".
+    # comment_author
+    #    Submitted name with the comment
+    # comment_author_email
+    #    Submitted email address
+    # comment_author_url
+    #    Commenter URL.
+    # comment_content
+    #    The content that was submitted.
+    # Other server enviroment variables
+    #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.  
+    def callAkismet(akismet_function, user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+      http = Net::HTTP.new("#{@apiKey}.rest.akismet.com", 80, @proxyHost, @proxyPort)
+      path = "/1.1/#{akismet_function}"        
+    
+      data = "blog=#{@blog}&user_ip=#{user_ip}&user_agent=#{user_agent}&referrer=#{referrer}&permalink=#{permalink}&comment_type=#{comment_type}&comment_author=#{comment_author}&comment_author_email=#{comment_author_email}&comment_author_url=#{comment_author_url}&comment_content=#{comment_content}"
+      if (other != nil) 
+        other.each_pair {|key, value| data.concat("&#{key}=#{value}")}
+      end
+      data = URI.escape(data)
+            
+      resp, data = http.post(path, data, STANDARD_HEADERS)
+        
+      return (data != "false")
+    end
+  
+    protected :callAkismet
+
+    # This is basically the core of everything. This call takes a number of arguments and characteristics about the submitted content and then returns a thumbs up or thumbs down. Almost everything is optional, but performance can drop dramatically if you exclude certain elements.
+    #
+    # user_ip (required)
+    #    IP address of the comment submitter.
+    # user_agent (required)
+    #    User agent information.
+    # referrer (note spelling)
+    #    The content of the HTTP_REFERER header should be sent here.
+    # permalink
+    #    The permanent location of the entry the comment was submitted to.
+    # comment_type
+    #    May be blank, comment, trackback, pingback, or a made up value like "registration".
+    # comment_author
+    #    Submitted name with the comment
+    # comment_author_email
+    #    Submitted email address
+    # comment_author_url
+    #    Commenter URL.
+    # comment_content
+    #    The content that was submitted.
+    # Other server enviroment variables
+    #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.
+    def check_comment(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+      return callAkismet('comment-check', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+    end
+  
+    # This call is for submitting comments that weren't marked as spam but should have been. It takes identical arguments as comment check.
+    # The call parameters are the same as for the #commentCheck method.
+    def submitSpam(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+      callAkismet('submit-spam', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+    end
+  
+    # This call is intended for the marking of false positives, things that were incorrectly marked as spam. It takes identical arguments as comment check and submit spam.
+    # The call parameters are the same as for the #commentCheck method.
+    def submitHam(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+      callAkismet('submit-ham', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+    end
+  end
+
+end

data/lib/Wiki2Go/Install/make_site.rb

@@ -8,7 +8,7 @@ require 'rbconfig.rb'
 
 include Config
 
-WIKI2GO_VERSION = '1.22.1'
+WIKI2GO_VERSION = '1.24.0'
 gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/Web.rb'
@@ -40,6 +40,7 @@ module Wiki2Go
     attr_accessor  :type
     attr_reader    :source_dir
     attr_accessor  :subsite
+    attr_reader    :cgi_options
 
     def initialize
       @user         = WebUser.new(nil,nil)
@@ -58,7 +59,8 @@ module Wiki2Go
       configfile = File.join(@directory,'site','scripts','CgiOptions.rb')
       if File.exists?(configfile) then
         load configfile
-        return CgiOptions.new
+        @cgi_options = CgiOptions.new
+        return @cgi_options
       end
       return nil
     end
@@ -205,6 +207,41 @@ module Wiki2Go
       end
     end
 
+    def Install.regenerate_wiki(args,&block)
+      opts = OptionParser.new
+
+      configuration = Configuration.new
+      opts.on("-s URL",'--server URL',String) { |val| configuration.server_at(val) }
+      opts.on("-p",'--port URL',"(default is port 80)",String) { |val| configuration.port = val }
+      opts.on("-u",'--user username',String) { |val| configuration.user.user = val }
+      opts.on("-g",'--group groupname',String) { |val| configuration.user.group = val }
+      opts.on("-w",'--web default_web',String) { |val| configuration.default_wiki = val }
+      opts.on("-d",'--directory dir',"default = .",String) { |val| configuration.directory = File.expand_path(val) }
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+
+      opts.parse(args)
+
+      configuration.read_existing_configuration
+
+      if configuration.type.nil? then
+        puts "Wiki type (public, private, readwrite) must be specified" if configuration.type.nil?
+        puts opts
+      else
+        yield "Regenerating Wiki2Go site in #{configuration.directory}" if block_given?
+
+        oldmask = File.umask(02)
+        cd(configuration.directory) {
+          do_regenerate(configuration)
+        }
+        set_owner(configuration.directory,configuration.user)
+        File.umask(oldmask)
+        yield "Updated." if block_given?
+      end
+    end
+
     def Install.make_wiki(args,&block)
       opts = OptionParser.new      
 
@@ -293,6 +330,12 @@ module Wiki2Go
       make_config( config,'PrivateWikiConfig')
     end    
 
+    def Install.do_regenerate(config)
+      wiki = Wiki2Go::Wiki.new(config.cgi_options)
+      web = Wiki2Go::Web.from_page_url("http://#{config.server}:#{config.port}/scripts/secure/view/#{config.default_wiki}/FrontPage",'view',config.cgi_options)
+      puts wiki.generate_html(web)
+    end
+    
     def Install.install_scripts(config)
       mkdir_p(File.join('site','scripts','secure'),{ :mode => 0775})
       source = File.join(config.source_dir,'..','cgi')
@@ -361,7 +404,7 @@ module Wiki2Go
     end
 
     def Install.set_owner(dir,owner)
-      if !owner.user.nil? then
+      if !owner.user.nil? && owner.user.length > 0 then
         info = Etc.getpwnam(owner.user)
         if !info.nil? then
           user_id = info.uid
@@ -460,6 +503,10 @@ class CgiOptions < Wiki2Go::#{baseconfig}
     @checksum_salt = '#{config.directory}'
     # Set to true to add users who save without checksum to the blacklist
     @blacklist_when_no_checksum = false
+
+    # Enable the Akismet (http://akismet.com/) spam engine
+    # Get a free API key and configure the key and your URL
+    # use_akismet(api_key,#{config.server})
   end  
 
 end

data/lib/Wiki2Go/LineFormatter.rb

@@ -70,8 +70,10 @@ module Wiki2Go
       result = @web.subsite.empty? ? '' : ('/' + @web.subsite)
       parameters.each do |name|
         if !name.nil? and !name.empty? then
-          result += '/' 
-          result += name
+          name.split('/').each do |subname|
+            result += '/' 
+            result += ERB::Util::url_encode(subname)
+          end
         end
       end
       result.squeeze('/')
@@ -148,7 +150,7 @@ module Wiki2Go
       end
     end
     
-        # Return a link suitable for creating a new page with the confgured editor, if editing is allowed
+    # Return a link suitable for creating a new page with the confgured editor, if editing is allowed
     # Return the name of the page, otherwise
     def editor_link2(subwiki,page,name)
       if @editable then
@@ -350,16 +352,12 @@ module Wiki2Go
       
     end
     
-    def escape_spaces(name)
-      name.gsub(/ /,'%20')
-    end
-
     # URL to a static resource (under the html subdirectory of the site)
     def resource_url(name)
       if @absolute_urls then
-        @web.base_url.chop + make_url('html',@web.name,escape_spaces(name))
+        @web.base_url.chop + make_url('html',@web.name,name)
       else
-        make_url('html',@web.name,escape_spaces(name))
+        make_url('html',@web.name,name)
       end
     end
     

data/lib/Wiki2Go/PublicWikiConfig.rb

@@ -41,6 +41,7 @@ module Wiki2Go
     #    * OR the user is not on the blacklist and none of the URLs on the page are on the blacklist and no more than 5 urls added
     #    * AND no hidden style in tags    
     #    * AND page not erased
+    #    * AND Akismet (if configured) accepts the page
     def accept_page?(web,content)    
     
       return true if web.secure?
@@ -75,7 +76,7 @@ module Wiki2Go
       
       current_page = storage.load_page(web.name,web.current_page)
       urls = @spamfilter.added_urls(current_page.content,content)
-      
+         
       if @spamfilter.edit_by_banned_user?(author) then 
         @spamfilter.blacklist_urls(urls)
         
@@ -100,6 +101,16 @@ module Wiki2Go
         
         tarpit
         return false
+      elsif @spamfilter.stopped_by_spam_engine(web.url,content,author,web.alias) then
+        blacklist_user(author)
+        @spamfilter.blacklist_urls(urls)
+        
+        errorlog("Edit by user #{author} of page '#{pagename}' caught by Akismet. Blacklisting #{urls.join(', ')}")
+        errorlog(content)
+        
+        tarpit
+        return false
+        
       else
         if urls.length > 0 then
           @spamfilter.greylist_urls(author,urls)
@@ -128,6 +139,9 @@ module Wiki2Go
       return redirect
     end
     
+    def use_akismet(api_key,blog)
+      @spamfilter.use_akismet(api_key,blog)
+    end
   end
 end
 

data/lib/Wiki2Go/SpamFilter.rb

@@ -3,11 +3,16 @@ require 'Wiki2Go/UrlFinder'
 require "uri"
 require 'net/http'
 
+require "Wiki2Go/Akismet"
+
 module Wiki2Go
   class SpamFilter
 
     def initialize(config)
       @config = config
+      @akismet = nil
+      @akismet_api_key = nil
+      @akismet_blog = nil
     end
 
     def edit_by_banned_user?(author)
@@ -110,8 +115,27 @@ module Wiki2Go
       content !~ /\S/
     end
 
+    def use_akismet(api_key,blog)
+      @akismet_api_key = api_key
+      @akismet_blog = blog
+    end
+
+    def stopped_by_spam_engine(url,content,user_ip,author_alias)
+      engine = akismet
+      return false if engine.nil?
+      
+      return engine.check_comment(user_ip, "","", url, "wiki page", author_alias, "", "", content, {})
+    end
+
     private
 
+    def akismet
+      return nil if @akismet_api_key.nil?
+      
+      @akismet ||= Wiki2Go::Akismet.new(@akismet_api_key,@akismet_blog)
+      @akismet.verify_API_key unless @akismet.verified_key?
+      return @akismet.verified_key? ? @akismet : nil
+    end
  
 
   end

data/lib/Wiki2Go/Web.rb

@@ -49,15 +49,19 @@ module Wiki2Go
       return copy
     end
 
+    def url
+      File.join(base_url,@subsite,script_prefix,@verb + @script_extension,path)  
+    end
+    
     def user
       @request.nil? ? 'unknown' : @request.user
     end
 
     def secure?
       @request.nil? ? false : @request.authenticated?
-  end
+    end
 
-  alias :secure :secure?
+    alias :secure :secure?
 
     def alias=(name)
       @alias = name
@@ -161,8 +165,8 @@ module Wiki2Go
         end
       end
       if path =~ /\// then
-          path =~ /^(.*)(\/+)([^\/]*)$/
-          return $1,$3
+        path =~ /^(.*)(\/+)([^\/]*)$/
+        return $1,$3
       else
         return "",path
       end

data/lib/Wiki2Go/WikiFormatter.rb

@@ -34,13 +34,13 @@ module Wiki2Go
     end
     
     def versions(from,to)
-        if to > 0 then
-            @to = to
-            @from = from
-        else
-            @from = -1 
-            @to = -1
-        end 
+      if to > 0 then
+        @to = to
+        @from = from
+      else
+        @from = -1
+        @to = -1
+      end
     end
   end
 
@@ -80,7 +80,7 @@ module Wiki2Go
       return template
     end
 
-     def dump_page_in_template(template,page,from,to) 
+    def dump_page_in_template(template,page,from,to)
       formatted_page = page.content
 
       template = splice_variable_values(template,page,formatted_page)
@@ -100,20 +100,20 @@ module Wiki2Go
 
     def generate_rss(template,changes)
     
-        # RSS must contain absolute URLs because some feedreaders don't honor the relative
-        #  URLs to the content of the <link> tag
-        old_absolute_urls = @absolute_urls 
-        @absolute_urls = true
+      # RSS must contain absolute URLs because some feedreaders don't honor the relative
+      #  URLs to the content of the <link> tag
+      old_absolute_urls = @absolute_urls
+      @absolute_urls = true
         
-        template_after_items = <<-END_OF_AFTER_ITEMS_XML
+      template_after_items = <<-END_OF_AFTER_ITEMS_XML
       </channel>
       </rss>
       END_OF_AFTER_ITEMS_XML
       
-        items = ""
+      items = ""
         
-        changes.each do |page| 
-            items = items + <<-END_OF_ITEMS
+      changes.each do |page|
+        items = items + <<-END_OF_ITEMS
         <item>
         <title>#{CGI::escapeHTML(page.name)}</title>
         <author>#{page.alias}</author>
@@ -122,22 +122,22 @@ module Wiki2Go
         <guid isPermaLink="true">#{absolute_url_of_topic(page.filename)}</guid>
         END_OF_ITEMS
         
-            if !Page.is_dynamic?(page.filename) then
-                items += "<description><![CDATA[#{format_page(page.content).strip}]]></description>\n"
-            end
-            items += "</item>\n"
-            
+        if !Page.is_dynamic?(page.filename) then
+          items += "<description><![CDATA[#{format_page(page.content).strip}]]></description>\n"
         end
+        items += "</item>\n"
+            
+      end
         
-        template = template + items + template_after_items
+      template = template + items + template_after_items
         
-        # We're using hard coded GMT, because %Z returns something strange
-        time = Time.new.gmtime.strftime("%d %B %Y %H:%M GMT")
-        template.gsub!(/\$DATE\$/, time)
-        template = splice_web_values(template)
+      # We're using hard coded GMT, because %Z returns something strange
+      time = Time.new.gmtime.strftime("%d %B %Y %H:%M GMT")
+      template.gsub!(/\$DATE\$/, time)
+      template = splice_web_values(template)
         
-        @absolute_urls = old_absolute_urls
-        return template
+      @absolute_urls = old_absolute_urls
+      return template
     end
 
     def generate_rss_from_log(log)
@@ -166,8 +166,8 @@ END_OF_HEADER
           type = $1
           datetime = $2
           message = $3 
-        if type == 'E' then
-        items = items + <<-END_OF_ITEMS
+          if type == 'E' then
+            items = items + <<-END_OF_ITEMS
         <item>
         <title>#{CGI::escapeHTML('errormessage')}</title>
         <link>#{File.join(@web.base_url,'scripts/secure/admin/show_log')}</link>
@@ -175,13 +175,13 @@ END_OF_HEADER
         <pubDate>#{parse_log_date(datetime).strftime("%d %B %Y %H:%M GMT")}</pubDate>
         <description><![CDATA[#{CGI::escapeHTML(message)}]]></description>
         </item>
-        END_OF_ITEMS
-      end
-    end
+            END_OF_ITEMS
+          end
+        end
       end
 
-#        <link>#{absolute_url_of_topic(page.filename)}</link>
-#        <guid isPermaLink="true">#{@web.name}/#{page.filename}</guid>
+      #        <link>#{absolute_url_of_topic(page.filename)}</link>
+      #        <guid isPermaLink="true">#{@web.name}/#{page.filename}</guid>
 
       return header + items + template_after_items
         

data/test/All.rb

@@ -21,4 +21,3 @@ require 'TestWiki2GoServlet'
 require 'TestSyntaxHighlighter'
 require 'TestHTMLFormatter'
 require 'test_firewall_blacklist.rb'
-#require 'TestInstall'

data/test/Slow.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+
+require 'test_akismet'
+require 'TestSpamFilterWithAkismet'
+require 'TestInstall.rb'

data/test/TestInstall.rb

@@ -131,6 +131,26 @@ class TestInstall <  Test::Unit::TestCase
     assert_wiki_structure_exists(wiki_dir,'Wiki2Go')
   end
 
+  def test_regeneration_of_static_html
+    wiki_dir = scratch_dir('regen')
+    args = ['-s', 'wiki2go.nayima.be' , '-w' , 'Wiki2Go' , '-t' , 'private', '-d' , wiki_dir]
+    Wiki2Go::Install.make_site(args)
+
+    File.open("#{wiki_dir}/texts/Wiki2Go/FrontPage.txt",File::CREAT|File::TRUNC|File::RDWR) do |file|
+      file.write "Regenerated file"
+    end
+
+    static_frontpage = "#{wiki_dir}/site/Wiki2Go/FrontPage.html"
+    assert File.exists?(static_frontpage)
+    rm static_frontpage
+    assert !File.exists?(static_frontpage)
+
+    args = ['-s', 'wiki2go.nayima.be' , '-w' , 'Wiki2Go' , '-d' , wiki_dir]
+    Wiki2Go::Install.regenerate_wiki(args)
+
+    assert File.exists?(static_frontpage)
+  end
+
   private
 
   def scratch_dir(type)
@@ -158,8 +178,8 @@ class TestInstall <  Test::Unit::TestCase
   end
   
   def assert_exists(wiki_dir,*dirs)
-      dir  = File.join(wiki_dir,dirs)
-      assert("#{dir} must exist",File.exists?(dir))
+    dir  = File.join(wiki_dir,dirs)
+    assert("#{dir} must exist",File.exists?(dir))
   end
 end
 

data/test/TestLineFormatter.rb

@@ -113,7 +113,7 @@ class TestLineFormatter <  Test::Unit::TestCase
 
   end
 
-  def test_Markup
+  def test_markup
     formatter = makeFormatter
 
     formatted = formatter.format_line(" *bold* *nothing ")
@@ -181,6 +181,13 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal '/view/Xpday/Registration.rbl',formatted
   end
   
+  def test_bug_spaces_are_not_escaped
+    formatter = makePublicFormatter
+    
+    formatted = formatter.format_line("{Toyota Way}")
+    assert_equal "<a href=\"/Xpday/Toyota%20Way.html\">Toyota Way</a>",formatted
+  end
+  
   def test_links_with_redirect    
     formatter = makeFormatter
 
@@ -405,7 +412,7 @@ class TestLineFormatter <  Test::Unit::TestCase
 
   end
 
-  def test_PageExistence
+  def test_page_existence
     storage = LineMockStorage.new
     formatter = makeFormatterWithStorage(storage)
 
@@ -419,7 +426,7 @@ class TestLineFormatter <  Test::Unit::TestCase
 
   end
 
-  def test_Tables
+  def test_tables
     formatter = makeFormatter
 
     formatted = formatter.format_line("|-------------| ") 
@@ -433,7 +440,7 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal("| kol 1 | kol 2 | ",formatted)
   end
 
-  def test_Tables_WrongSyntax
+  def test_tables_wrong_syntax
     formatter = makeFormatter
 
     formatted = formatter.format_line("|-------------| ") 
@@ -442,21 +449,21 @@ class TestLineFormatter <  Test::Unit::TestCase
     assert_equal("<tr><td> kol 1 </td><td> kol 2 ",formatted)
   end
 
-  def test_Tables_SpecifyClass
+  def test_tables_specify_class
     formatter = makeFormatter
 
     formatted = formatter.format_line("|(test)-------------| ") 
     assert_equal('<table class="test" > ',formatted)
   end
 
-  def test_Tables_SpecifyEmptyClass
+  def test_tables_specify_empty_class
     formatter = makeFormatter
 
     formatted = formatter.format_line("|()-------------| ") 
     assert_equal('|()-------------| ',formatted)
   end
 
-  def test_BulletLists
+  def test_bullet_lists
     formatter = makeFormatter
 
     formatted = formatter.format_line("   * bullet 1") 

data/test/TestSpamFilter.rb

@@ -48,6 +48,8 @@ class SpamMockConfig < Wiki2Go::Config
 end
 
 class TestSpamFilter <  Test::Unit::TestCase
+  
+  
 
   def setup
     @config = SpamMockConfig.new
@@ -158,5 +160,14 @@ EMPTY_URLS
 
     assert !@spam_filter.cleared_page?("     \r\n  a word \t \r  \n")
   end
+  
+  def test_spamfilter_accepts_page_if_akismet_not_configured
+    assert !@spam_filter.stopped_by_spam_engine('http://wiki.xp.be/SandBox.html',spammy_message,'59.92.162.46','59.92.162.46')
+  end
 
+  def spammy_message
+    return <<SPAM
+Hi, good site, <a href=" http://www.videocodezone.com/users/nexiumdrg ">cheap nexium order online</a>,  >:OO, <a href=" http://www.videocodezone.com/users/nexiumxtv ">buy nexium from canada</a>,  :OO, <a href=" http://www.videocodezone.com/users/nexiumtej ">buy b nexium b</a>,  vjy, 
+SPAM
+  end
 end

data/test/TestSpamFilterWithAkismet.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+
+require 'test/unit'
+
+require 'Wiki2Go/SpamFilter'
+require 'Wiki2Go/BlackList'
+require 'Wiki2Go/GreyList'
+require 'Wiki2Go/Wiki2GoConfig'
+
+class SpamMockStorage
+
+  def initialize
+    @blacklists = Hash.new
+  end
+
+  def load_page(subwiki,name)
+    if (subwiki == 'xpbe' && name == 'FrontPage') then
+      lines = Array.new(1)
+      lines[0] = "" 
+      return Wiki2Go::Page.make_page(name,lines,Time.now)
+    else
+      return nil
+    end
+  end
+
+  def load_blacklist(type,normalize_urls=false)
+    @blacklists[type] = Wiki2Go::BlackList.new(type,[]) if !@blacklists.has_key?(type)
+    @blacklists[type]
+  end
+
+  def save_list(list)
+    #   puts list.inspect
+  end
+
+  def load_greylist
+    @greylist ||= Wiki2Go::GreyList.new('greylist',[])
+    @greylist
+  end
+
+end
+
+class SpamMockConfig < Wiki2Go::Config
+
+  def make_storage
+    SpamMockStorage.new
+  end
+end
+
+class TestSpamFilter <  Test::Unit::TestCase
+  
+  
+
+  def setup
+    @config = SpamMockConfig.new
+    @spam_filter = Wiki2Go::SpamFilter.new(@config)
+  end  
+
+    def test_spamfilter_stops_page_if_akismet_configured
+      
+    @spam_filter.use_akismet("b463507ab767","http://wiki.xp.be")
+    assert @spam_filter.stopped_by_spam_engine('http://wiki.xp.be/SandBox.html',spammy_message,'59.92.162.46','59.92.162.46')
+  end
+
+  def spammy_message
+    return <<SPAM
+Hi, good site, <a href=" http://www.videocodezone.com/users/nexiumdrg ">cheap nexium order online</a>,  >:OO, <a href=" http://www.videocodezone.com/users/nexiumxtv ">buy nexium from canada</a>,  :OO, <a href=" http://www.videocodezone.com/users/nexiumtej ">buy b nexium b</a>,  vjy, 
+SPAM
+  end
+end

data/test/TestWeb.rb

@@ -188,6 +188,15 @@ class TestWeb <  Test::Unit::TestCase
     assert_equal("http://wiki.xp.be/",web.base_url)
     assert_equal('sub_site',web.subsite)
   end
+
+  def test_reconsitute_url
+    env = {"HTTP_HOST"=>"wiki.xp.be", "HTTP_REFERER"=>"http://wiki.xp.be/scripts/view/Xpbe/PairProgrammingParty2004September14", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0", "PATH"=>"/sbin:/bin:/usr/sbin:/usr/bin:/usr/bin/X11:/usr/local/sbin:/usr/local/bin", "REMOTE_ADDR"=>"80.200.195.232", "REMOTE_PORT"=>"62539", "SCRIPT_FILENAME"=>"/home/pvc/sites/xpbe/wiki2/site//view", "SERVER_ADDR"=>"212.13.211.135", "SERVER_ADMIN"=>"webmaster@nayima.vm.bytemark.co.uk", "SERVER_NAME"=>"wiki.xp.be", "SERVER_PORT"=>"80", "SERVER_SIGNATURE"=>"<ADDRESS>Apache/1.3.26 Server at wiki.xp.be Port 80</ADDRESS>\n", "SERVER_SOFTWARE"=>"Apache/1.3.26 (Unix) Debian GNU/Linux PHP/4.1.2", "GATEWAY_INTERFACE"=>"CGI/1.1", "SERVER_PROTOCOL"=>"HTTP/1.1", "REQUEST_METHOD"=>"GET", "QUERY_STRING"=>"", "REQUEST_URI"=>"sub_site/scripts/view/Xpbe/PairProgrammingParties", "SCRIPT_NAME"=>"sub_site/scripts/view", "PATH_INFO"=>"/Xpbe/PairProgramming/Parties"}
+
+    @config.multi_wiki = true
+    @config.subsite    = 'sub_site'
+    web = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://wiki.xp.be/sub_site/scripts/view/Xpbe/PairProgramming/Parties',env),@config)
+    assert_equal 'http://wiki.xp.be/sub_site/scripts/view/Xpbe/PairProgramming/Parties',web.url
+  end
   
 end
 

data/test/test_akismet.rb

@@ -0,0 +1,101 @@
+# 
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+ 
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'test/unit'
+require 'Wiki2Go/Akismet'
+
+class TestAkismet < Test::Unit::TestCase
+  def test_verify_my_key
+    akismet = Wiki2Go::Akismet.new("b463507ab767","http://wiki.xp.be")
+    assert_not_nil akismet
+    assert akismet.verify_API_key
+    
+    assert akismet.verified_key?
+    
+    spam_message = <<SPAM
+    Hi, good site, <a href=" http://www.videocodezone.com/users/nexiumdrg ">cheap nexium order online</a>,  >:OO, <a href=" http://www.videocodezone.com/users/nexiumxtv ">buy nexium from canada</a>,  :OO, <a href=" http://www.videocodezone.com/users/nexiumtej ">buy b nexium b</a>,  vjy, 
+SPAM
+    
+    result = akismet.check_comment('59.92.162.46',"","",'http://wiki.xp.be/Xpbe/SandBox.html','comment','59.92.162.46','','',spam_message,{})
+    assert result,"Message recognized as spam"
+
+    good_message = <<GOOD
+<!--GRAPH:p.png
+
+digraph g {
+hello->world
+}
+-->
+
+<b>bold</b> - <i>italics</i>
+
+NieuwePagina
+
+wiki test
+
+a link to the SandBox page
+
+   * a list
+   * a list
+      * a sublist
+     * a list
+
+   9 a numbered list
+   9 a numbered list fdgsdfs 
+
+
+ik kan alles schrijven wat ik wil
+Format *bold* or _italic_
+
+The idea is great but if you think AboutThis then you will see that it is better.
+
+I want to TryIt and I want to TrySomething too!
+
+trial and error and error and trial
+
+---
+<br>
+test test test
+urltest http://www.cnn.com http://www.microsoft.com http://www.slashdot.org <a href="http://www.netscape.com/">netscape</a> 
+
+---
+Some examples of external links
+
+%wiki:ExtremeProgramming% links to the ExtremeProgramming discussion on the C2 wiki
+
+%xpnl:FrontPage% links to the frontpage of the Dutch XP group
+
+%book:BookOfChanges% links to the recent changes on LaurentBossavit's BookShelved wiki about books<br>
+
+ik ben nu aan het typen
+
+CategoryCategory CategoryHomepage
+
+
+<pre>
+    # some programming code
+    a=1
+</pre>
+
+<!--Syntax:ruby
+    # some ruby code, syntax colored
+    class Foo
+      def bar
+        "It works"
+      end
+    end
+    a=1
+-->
+
+*eins*
+* zwei    
+GOOD
+    result = akismet.check_comment('87.202.103.174',"","",'http://wiki.xp.be/Xpbe/SandBox.html','comment','pascal','','',good_message,{})
+    assert !result,"Message recognized as ham"
+
+  end
+end

data/test/testdata/logs/wiki.log

@@ -654,3 +654,23 @@ I, [2008-08-23 19:35:13#1908]  INFO -- : >> perform_view(Bugs,FrontPage) {}
 I, [2008-08-23 19:35:14#1908]  INFO -- : << perform_view 0.578 sec elapsed {}
 I, [2008-08-23 21:30:08#756]  INFO -- : >> perform_view(Bugs,FrontPage) {}
 I, [2008-08-23 21:30:08#756]  INFO -- : << perform_view 0.578 sec elapsed {}
+I, [2008-12-29 12:52:03#3988]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-29 12:52:03#3988]  INFO -- : << perform_view 0.453 sec elapsed {}
+I, [2008-12-29 12:55:31#3536]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-29 12:55:32#3536]  INFO -- : << perform_view 0.438 sec elapsed {}
+I, [2008-12-29 13:40:31#2248]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-29 13:40:31#2248]  INFO -- : << perform_view 0.594 sec elapsed {}
+I, [2008-12-30 13:46:31#1492]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-30 13:46:32#1492]  INFO -- : << perform_view 0.453 sec elapsed {}
+I, [2008-12-30 13:46:55#1332]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-30 13:46:56#1332]  INFO -- : << perform_view 0.453 sec elapsed {}
+I, [2008-12-30 19:17:16#1828]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2008-12-30 19:17:17#1828]  INFO -- : << perform_view 0.594 sec elapsed {}
+I, [2009-01-25 15:12:11#3528]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2009-01-25 15:12:12#3528]  INFO -- : << perform_view 0.468 sec elapsed {}
+I, [2009-01-25 15:21:41#3016]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2009-01-25 15:21:41#3016]  INFO -- : << perform_view 0.453 sec elapsed {}
+I, [2009-01-25 15:41:46#1492]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2009-01-25 15:41:47#1492]  INFO -- : << perform_view 0.609 sec elapsed {}
+I, [2009-02-23 21:57:42#280]  INFO -- : >> perform_view(Bugs,FrontPage) {}
+I, [2009-02-23 21:57:43#280]  INFO -- : << perform_view 0.531 sec elapsed {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.22.1
+  version: 1.24.0
 platform: ruby
 authors: 
 - Pascal Van Cauwenberghe
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-31 00:00:00 +02:00
+date: 2009-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,6 +31,7 @@ executables:
 - Wiki2Go_update_site.rb
 - Wiki2Go_make_cvs_repository.rb
 - Wiki2Go_firewall_blacklist.rb
+- Wiki2Go_regenerate.rb
 extensions: []
 
 extra_rdoc_files: []
@@ -46,6 +48,7 @@ files:
 - lib/Web2Go/WebrickRequest.rb
 - lib/Web2Go/WebrickResponse.rb
 - lib/Wiki2Go
+- lib/Wiki2Go/Akismet.rb
 - lib/Wiki2Go/BlackList.rb
 - lib/Wiki2Go/cgi
 - lib/Wiki2Go/cgi/changes.rb
@@ -142,9 +145,11 @@ files:
 - bin/Wiki2Go_make_cvs_repository.rb
 - bin/Wiki2Go_make_site.rb
 - bin/Wiki2Go_make_wiki.rb
+- bin/Wiki2Go_regenerate.rb
 - bin/Wiki2Go_update_site.rb
 - test/All.rb
 - test/checksite.rb
+- test/Slow.rb
 - test/TestBlackList.rb
 - test/TestConfig.rb
 - test/testdata
@@ -221,6 +226,7 @@ files:
 - test/TestRSS.rb
 - test/TestServer.rb
 - test/TestSpamFilter.rb
+- test/TestSpamFilterWithAkismet.rb
 - test/TestStorage.rb
 - test/TestSyntaxHighlighter.rb
 - test/TestUnitTestFiles.rb
@@ -229,6 +235,7 @@ files:
 - test/TestWeb2Go.rb
 - test/TestWiki2Go.rb
 - test/TestWiki2GoServlet.rb
+- test/test_akismet.rb
 - test/test_firewall_blacklist.rb
 - test/test_page.rb
 - test/UnitTestFiles.rb
@@ -255,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wiki2go
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Wiki2Go is a Ruby Wiki