Wiki2Go 1.17.5 → 1.22.0

data/lib/Wiki2Go/cgi/diff.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "CgiOptions.rb"
+
+require "cgi"
+
+require 'Web2Go/CGIRequest'
+require 'Web2Go/CGIResponse'
+require 'Wiki2Go/Wiki2GoServlet'
+
+config = CgiOptions.new
+
+cgi = CGI.new("html4Tr")
+
+request = Web2Go::CGIRequest.new(cgi)
+response = Web2Go::CGIResponse.new(cgi)
+
+servlet = Wiki2Go::Servlet.new(config)
+servlet.execute(request,response)
+

data/lib/Wiki2Go/cgi/secure/log_rss.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "CgiOptions.rb"
+
+require "cgi"
+
+require 'Web2Go/CGIRequest'
+require 'Web2Go/CGIResponse'
+require 'Wiki2Go/Wiki2GoServlet'
+
+config = CgiOptions.new
+
+cgi = CGI.new("html4Tr")
+
+request = Web2Go::CGIRequest.new(cgi)
+response = Web2Go::CGIResponse.new(cgi)
+
+servlet = Wiki2Go::Servlet.new(config)
+servlet.execute(request,response)
+
+

data/lib/Wiki2Go/cgi/sidebyside.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "CgiOptions.rb"
+
+require "cgi"
+
+require 'Web2Go/CGIRequest'
+require 'Web2Go/CGIResponse'
+require 'Wiki2Go/Wiki2GoServlet'
+
+config = CgiOptions.new
+
+cgi = CGI.new("html4Tr")
+
+request = Web2Go::CGIRequest.new(cgi)
+response = Web2Go::CGIResponse.new(cgi)
+
+servlet = Wiki2Go::Servlet.new(config)
+servlet.execute(request,response)
+

data/lib/Wiki2Go/cgi/wikiedit.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "CgiOptions.rb"
+
+require "cgi"
+
+require 'Web2Go/CGIRequest'
+require 'Web2Go/CGIResponse'
+require 'Wiki2Go/Wiki2GoServlet'
+
+config = CgiOptions.new
+
+cgi = CGI.new("html4Tr")
+
+request = Web2Go::CGIRequest.new(cgi)
+response = Web2Go::CGIResponse.new(cgi)
+
+servlet = Wiki2Go::Servlet.new(config)
+servlet.execute(request,response)
+

data/lib/Wiki2Go/firewall_blacklist.rb

@@ -0,0 +1,88 @@
+# 
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+require 'optparse'
+
+require 'Wiki2Go/BlackList.rb'
+require 'Wiki2Go/FileStorage.rb'
+
+module Wiki2Go
+  class BlacklistConfiguration
+    attr_accessor :head
+    attr_accessor :tail
+    attr_accessor :out
+    attr_accessor :directory
+    
+    def initialize
+      @directory = File.expand_path(".")
+      @out       = File.expand_path("./iptables.txt")
+    end
+  end
+  
+  class FirewallBlacklist
+    def initialize(path)
+      @storage = Wiki2Go::FileStorage.new(path,path)
+    end
+    
+    def FirewallBlacklist.generate(args)
+      opts = OptionParser.new
+
+      configuration = BlacklistConfiguration.new      
+
+      opts.on("-h",'--head file',String) { |val| configuration.head = File.expand_path(val) }
+      opts.on("-t",'--tail file',String) { |val| configuration.tail = File.expand_path(val) }
+      opts.on("-o",'--out file',String) { |val| configuration.out = File.expand_path(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)
+      
+      list = FirewallBlacklist.new(configuration.directory)
+      list.write_file(configuration.head, configuration.tail, configuration.out)
+    end
+    
+    # Reads the blacklist for the given wiki
+    # Returns an iptables ruleset for blocking all ip addresses in the blacklist
+    def generate_blocks
+      blacklist = @storage.load_blacklist('user')
+      FirewallBlacklist.block_all(blacklist)
+    end
+    # Given a string ip address
+    # Return a string suitable for logging and blocking that address with iptables
+    def FirewallBlacklist.block(ip_address)
+      ip_address = clean(ip_address)
+      "-A  INPUT -p tcp --dport 80 --source #{ip_address} -j LOG --log-prefix \"spammer! \" --log-level 7\n-A  INPUT -p tcp --dport 80 --source #{ip_address} -j REJECT\n"
+    end
+    
+    def FirewallBlacklist.block_all(blacklist)
+      out = ""
+      blacklist.each do |ip_address|
+        out << FirewallBlacklist.block(ip_address)
+      end
+      out
+    end
+    
+    def write_file(head,tail,out)
+      header = []
+      trailer = []
+      File.open(head,'r') {|f| header = f.read }
+      File.open(tail,'r') {|f| trailer = f.read }
+      
+      File.open(out,"w") do |f|
+        f.write header
+        f.write self.generate_blocks
+        f.write trailer
+      end
+      
+      
+    end
+    private 
+    
+    def FirewallBlacklist.clean(ip_address)
+      ip_address.gsub(/\\\./,'.')
+    end
+  end
+end

data/test/All.rb

@@ -6,16 +6,19 @@ require 'test/unit/ui/console/testrunner'
 
 require 'TestWeb'
 require 'TestConfig'
+require 'test_page'
 require 'TestLineFormatter'
 require 'TestFormatter'
 require 'TestStorage'
 require 'TestRSS'
 require 'TestWiki2Go'
-require 'TestBlacklist'
+require 'TestBlackList'
 require 'TestUrlFinder'
 require 'TestSpamFilter'
 require 'TestWeb2Go'
 require 'TestDot'
 require 'TestWiki2GoServlet'
 require 'TestSyntaxHighlighter'
-
+require 'TestHTMLFormatter'
+require 'test_firewall_blacklist.rb'
+#require 'TestInstall'

data/test/TestBlackList.rb

@@ -12,7 +12,7 @@ require 'UnitTestFiles'
 
 class TestBlackList <  Test::Unit::TestCase
 
-include UnitTestFiles
+  include UnitTestFiles
   
   def setup
     @storage = Wiki2Go::FileStorage.new(scratchdata,scratchdata('html'))
@@ -29,13 +29,26 @@ include UnitTestFiles
     assert(!blacklist.contains('155.66.00.1'))
   end
   
+  def test_collection
+    blacklist = Wiki2Go::BlackList.new("user_blacklist.txt",[])
+    blacklist.add('1.2.3.4')
+    blacklist.add('5.6.7.8')
+    blacklist.add('0.0.0.0')
+    
+    assert_equal ['0\.0\.0\.0','1\.2\.3\.4','5\.6\.7\.8'],blacklist.all
+    
+    out = ""
+    blacklist.each {|pattern| out << pattern; out << ','}
+    assert_equal '0\.0\.0\.0,1\.2\.3\.4,5\.6\.7\.8,',out
+  end
+  
   def test_find_patterns_in_text
     text = ["Some ok text", 'a bad url http://buy.viagra.com must be found' , 'some more innocent text']
     bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",['viagra\.'])
     
     assert(bad_urls.found_in(text))
   end
-
+  
   def test_dont_find_patterns_in_ok_text
     text = "Some ok text\ndon''t care if viagra is mentioned\nsome more innocent text"
     bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",['viagra\.'])
@@ -59,24 +72,67 @@ include UnitTestFiles
   def test_greylist
     list = Wiki2Go::GreyList.new('.',[])
     assert !list.contains_user?('pvc')
-
+    
     list.add('pvc','http://www.xp.be')
     assert list.contains_user?('pvc')
     assert list.url_found_in("this is a link to {xpbe@http://www.xp.be/FrontPage} ")
-
+    
     assert !list.contains_user?('vera')
     assert !list.url_found_in("this is a link to {xpbe@www.xp.be/FrontPage} ")
-
+    
   end
-
-
+  
+  
   def test_only_keep_hostnames
-     bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",[])
-     bad_urls.add("http://www.somehost.com/selling_useless_stuff")
-     bad_urls.add("http://www.somehost.com/selling_illegal_stuff")
-     bad_urls.add("http://www.somehost.com:80/selling_illegal_stuff")
-
-     assert_equal 1,bad_urls.length
+    bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",[])
+    bad_urls.add("http://www.somehost.com/selling_useless_stuff")
+    bad_urls.add("http://www.somehost.com/selling_illegal_stuff")
+    bad_urls.add("http://www.somehost.com:80/selling_illegal_stuff")
+    bad_urls.add("http://wiki.somehost.com:80/selling_illegal_stuff")
+    bad_urls.add("http://somehost.com/selling_illegal_stuff")
+    
+    assert_equal 1,bad_urls.length
+    assert_equal 'https?:\/\/([^\/]*\.)?somehost\.com',bad_urls.all[0]
+  end
+  
+  def test_only_keep_3part_hostnames
+    bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",[])
+    bad_urls.add("http://www.somehost.co.uk/selling_useless_stuff")
+    bad_urls.add("http://www.somehost.co.uk/selling_illegal_stuff")
+    bad_urls.add("http://www.somehost.co.uk:80/selling_illegal_stuff")
+    bad_urls.add("http://wiki.somehost.co.uk:80/selling_illegal_stuff")
+    bad_urls.add("http://somehost.co.uk/selling_illegal_stuff")
+    
+    assert_equal 1,bad_urls.length
+    assert_equal 'https?:\/\/([^\/]*\.)?somehost\.co\.uk',bad_urls.all[0]
   end
   
-end
+  def test_read_chongqed_format_blacklist
+    bad_urls = Wiki2Go::BlackList.new("url_blacklist.txt",['https?:\/\/([^\/]*\.)?discount-phentermine\.health-livening\.com','https?:\/\/([^\/]*\.)?discounted-phentermine\.health-livening\.com'],true)
+    
+    assert_equal 1,bad_urls.length
+    assert_equal 'https?:\/\/([^\/]*\.)?health-livening\.com',bad_urls.all[0]
+  end
+  
+  def test_read_chongqed_blacklist
+    dir = File.expand_path(File.join(File.dirname(__FILE__),'..','lib','Wiki2Go','Install'))
+    @storage = Wiki2Go::FileStorage.new(dir,dir)
+    chongqed = @storage.load_blacklist('chonqed')
+
+    assert_equal 6680,chongqed.length
+    
+  end  
+  
+  def test_read_url_blacklist
+    dir = File.expand_path(File.join(File.dirname(__FILE__),'..','lib','Wiki2Go','Install'))
+    @storage = Wiki2Go::FileStorage.new(dir,dir)
+    urls = @storage.load_blacklist('url',true)
+    
+    @storage.save_list(urls)
+    
+    saved_urls = @storage.load_blacklist('url',true)
+    
+    assert_equal urls.length,saved_urls.length
+    
+  end  
+end

data/test/TestConfig.rb

@@ -26,7 +26,7 @@ module TestConfig_local
       @blacklist['chonqed'] = Wiki2Go::BlackList.new(scratchdata('chonqed_blacklist.txt'),[])
     end
 
-    def load_blacklist(type)
+    def load_blacklist(type,normalize_urls=false)
       @blacklist[type]
     end
 
@@ -35,7 +35,7 @@ module TestConfig_local
     end
   end
 
-  class MockPublicConfig < PublicWikiConfig
+  class MockPublicConfig < Wiki2Go::PublicWikiConfig
 
     attr_accessor :tarpitted
 
@@ -114,7 +114,7 @@ class TestConfig <  Test::Unit::TestCase
     web = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Wiki2Go/FrontPage',{ 'REMOTE_USER' => 'evilguy'} ),@config)
     @config.storage.blacklist('user','evilguy')
     assert !@config.accept_page?(web,spam_page)
-    assert @config.tarpitted
+    assert !@config.tarpitted
   end
 
   def check_logged_method(config, log_method, log_string, should_match)
@@ -124,9 +124,9 @@ class TestConfig <  Test::Unit::TestCase
       lines = f.readlines
       last_line = lines.pop.strip 
       if should_match then
-        assert_match Regexp.new(Regexp.quote(unique_log_string)),last_line
+        assert_match Regexp.new(Regexp.escape(unique_log_string)),last_line 
       else
-        assert_no_match Regexp.new(Regexp.quote(unique_log_string)),last_line
+        assert_no_match Regexp.new(Regexp.escape(unique_log_string)),last_line 
       end
     end
   end

data/test/TestDiff.rb

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+# -*- coding: ISO-8859-1 -*-
+
+
+require 'diff/lcs'
+require 'test/unit'
+
+class TestXXX < Test::Unit::TestCase
+
+    UNKNOWN = 0 
+    KEEPING = 1
+    EDITING = 2
+    
+    def setup
+        @mode = UNKNOWN
+        @buffer = ''
+        @keeping = ''
+        @discarding = ''
+        @adding = ''
+    end
+    
+    def teardown
+    end
+
+    def xtest_xxx
+    
+        seq1 = %w(a b c e h j l m n p)
+        seq2 = %w(b c d e f j k l m r s t)
+        
+        lcs = Diff::LCS.LCS(seq1, seq2)
+        puts lcs.inspect
+        puts "==="
+        diffs = Diff::LCS.diff(seq1, seq2,nil) # { |input| puts input.inspect }
+        puts "---"
+        puts diffs.inspect
+        puts "==="
+        sdiff = Diff::LCS.sdiff(seq1, seq2,nil) # { |input| puts input.inspect }
+        puts "---"
+        puts sdiff.inspect
+        puts "==="
+    end
+    
+    def test_lcs
+        lcs = Diff::LCS.LCS("I added this!","I edited this")
+        puts lcs.inspect  
+        
+        diff = Diff::LCS.diff("I added this!","I edited this")
+        puts diff.inspect
+    end
+    
+    def test_string
+        
+        diffs = Diff::LCS.sdiff("I added this!","I edited this",nil)  do |change|
+            case change.action
+            when '='
+                keep change.new_element
+            when '-'
+                discard change.old_element
+            when '+'
+                add change.new_element
+            when '!'
+                discard change.old_element
+                add     change.new_element
+            end
+            done
+        end
+        puts @buffer
+    end
+
+    def keep(element)
+        done if @mode != KEEPING
+        @mode = KEEPING
+        @keeping += element
+    end    
+
+    def add(element)
+        done if @mode = EDITING
+        @mode = EDITING
+        @adding += element
+    end    
+    def discard(element)
+        done if @mode = EDITING
+        @mode = EDITING
+        @discarding += element
+    end    
+    
+    def done
+        @buffer += @keeping
+        @buffer += "<del>#{@discarding}</del>" if @discarding.length > 0
+        @buffer += "<add>#{@adding}</add>"     if @adding.length > 0
+        @keeping = ''
+        @discarding = ''
+        @adding = ''  
+    end
+end