Wiki2Go 1.14.4 → 1.15.0

data/lib/Wiki2Go/Page.rb

@@ -1,12 +1,19 @@
 module Wiki2Go
   
+  # Represents one page in the Wiki
   class Page
 
+    # Name of the file
     attr_reader :title
+    # Descriptive name given by author
     attr_reader :name
+    # Real author (if authenticated) or IP/DNS address
     attr_accessor :author
+    # Authorname given by author
     attr_reader :alias
-    attr_reader :lines
+    # Array of Strings containing the page text
+    attr_accessor :lines
+    # Date and time last modified
     attr_reader :lastmodified
 
     def initialize(title,lines, author, time,name,aliasname=nil) 
@@ -21,7 +28,7 @@ module Wiki2Go
     def Page.make_page(title, lines,default_time)
       author = "unknown"
       lastmodified = default_time
-      name = File.basename(title)
+      name = File.basename(title,'.rbl')
 
       last = lines.last
       while !last.nil? and last =~ /\$([^:]+):(.*)\$/ do
@@ -52,6 +59,7 @@ module Wiki2Go
       file.puts "$AUTHOR:#{@author}$"
     end
 
+
     def length
       return @lines.length 
     end
@@ -65,5 +73,9 @@ module Wiki2Go
       @lastmodified = date
     end
 
+    def Page.is_dynamic?(pagename)
+      pagename =~ /\.rbl$/
+    end
+
   end
 end  

data/lib/Wiki2Go/PrivateWikiConfig.rb

@@ -3,30 +3,45 @@
 require "Wiki2Go/FileStorage.rb"
 require "Wiki2Go/Wiki2GoConfig.rb"
 
-class PrivateWikiConfig < Wiki2Go::Config
+module Wiki2Go
+  # The base class for configurations files of private wikis
+  class PrivateWikiConfig < Wiki2Go::Config
+
+    # Initialize with root directory of wiki
+    # By default generate HTML
+    def initialize(directory)
+      super(directory)
+      @generate_html = true
+    end  
+
+    # A private wiki is always editable
+    def editable?(web)
+      true
+    end
+
+    # Never redirect URLs
+    def redirect_url?(web,url)
+      false
+    end
+
+    # Redirect to the .HTML version after a Save, if site generates HTML
+    def redirect_to_html?(web)
+      @generate_html
+    end
+
+    # The configuration to generate a static HTML page is identical to the current one
+    def static_web(web) 
+      web.clone
+    end
 
-  def initialize(directory)
-    super(directory)
-    @generate_html = true
-  end  
-
-  def editable?(web)
-    true
-  end
-
-  def redirect_url?(web,url)
-    false
-  end
 
-  def redirect_to_html?(web)
-    @generate_html
   end
+end
 
-  def static_web(web) 
-    web.clone
+class PrivateWikiConfig < Wiki2Go::PrivateWikiConfig
+  def initialize(directory)
+    super(directory)
   end
-
-
 end
 
 

data/lib/Wiki2Go/PublicWikiConfig.rb

@@ -5,48 +5,66 @@ require "Wiki2Go/Wiki2GoConfig.rb"
 
 require 'Wiki2Go/SpamFilter'
 
-class PublicWikiConfig < Wiki2Go::Config
-  
-  def initialize(directory)
-    super(directory)
-    @generate_html = true 
-  end  
-  
-  def accept_page?(web,content)    
-  
-    return true if web.secure
-    
-    author = web.user
-    filter = Wiki2Go::SpamFilter.new(self)
-    
-    if filter.edit_by_banned_user?(author) || 
-       filter.edit_contains_banned_url?(content) then
-
-      current_page = storage.load_page(web.name,web.current_page)
-      filter.blacklist_user_and_urls_added(author,current_page.content,content)
-
-      tarpit
-      false
-    else
-      current_page = storage.load_page(web.name,web.current_page)
-      filter.greylist_new_urls(author,current_page.content,content)
-      return true
+module Wiki2Go
+  # Base class for public wiki
+  class PublicWikiConfig < Wiki2Go::Config
+
+    # Initialize with root directory of wiki
+    # By default, generates HTML
+    def initialize(directory)
+      super(directory)
+      @generate_html = true 
+    end  
+
+    # Accept a page save if
+    #    * The edit is by an authenticated user
+    #    * OR the user is not on the blacklist and none of the URLs on the page are on the blacklist
+    def accept_page?(web,content)    
+
+      return true if web.secure
+
+      author = web.user
+      filter = Wiki2Go::SpamFilter.new(self)
+
+      if filter.edit_by_banned_user?(author) || 
+        filter.edit_contains_banned_url?(content) then
+
+        current_page = storage.load_page(web.name,web.current_page)
+        filter.blacklist_user_and_urls_added(author,current_page.content,content)
+
+        tarpit
+        false
+      else
+        current_page = storage.load_page(web.name,web.current_page)
+        filter.greylist_new_urls(author,current_page.content,content)
+        return true
+      end
     end
-  end
-  
-  def tarpit
+
+    # What to do when we encounter a spammer? Delay him for 60 seconds
+    def tarpit
       sleep(60)
-  end
-  
-  def editable?(web)
-    true
-  end
-  
-  def redirect_url?(web,url)
-    return false if web.secure
-    
-    greylist = storage.load_greylist
-    greylist.contains_url(url)
-  end
+    end
+
+    # A public wiki is always editable
+    def editable?(web)
+      true
+    end
+
+    # Redirect if the url is on the greylist, unless the user is authenticated
+    def redirect_url?(web,url)
+      return false if web.secure
+
+      greylist = storage.load_greylist
+      greylist.contains_url(url)
+    end
 
+  end
 end
+
+class PublicWikiConfig < Wiki2Go::PublicWikiConfig
+
+  def initialize(directory)
+    super(directory)
+  end
+end  

data/lib/Wiki2Go/ReadWriteWikiConfig.rb

@@ -3,21 +3,32 @@
 require "Wiki2Go/FileStorage.rb"
 require "Wiki2Go/Wiki2GoConfig.rb"
 
-class ReadWriteWikiConfig < Wiki2Go::Config
-  
+module Wiki2Go
+    # Base class for read/write wikis (authenticated users can write, everybody can read)
+    class ReadWriteWikiConfig < Wiki2Go::Config
+
+    def initialize(directory)
+      super(directory)
+      @generate_html = true 
+    end  
+
+    # Wiki is editable if user is authenticated
+    def editable?(web)
+      web.secure
+    end
+
+    # Never redirect URLs, we trust our authenticated writers
+    def redirect_url?(web,url)
+      false
+    end
+
+  end
+end
+
+class ReadWriteWikiConfig < Wiki2Go::ReadWriteWikiConfig
+
   def initialize(directory)
     super(directory)
-    @generate_html = true 
   end  
-  
-  def editable?(web)
-    web.secure
-  end
-  
-  def redirect_url?(web,url)
-    false
-  end
-  
 end
 
-

data/lib/Wiki2Go/Server.rb

@@ -15,9 +15,9 @@ require 'Wiki2Go/DotGraphics'
 require 'optparse'
 
 module Wiki2Go
-  
+
   class LocalConfig < PublicWikiConfig
-    
+
     def initialize(dir)
       super(dir)
       @generate_html = false
@@ -25,17 +25,17 @@ module Wiki2Go
       @debug         = true
       add_processor('GRAPH',Wiki2Go::DotGraphics.new('c:/Program Files/ATT/Graphviz/bin/'))
     end
-    
+
     def redirect_url?(web,url)
       result = super(web,url)
       return result
     end
-    
+
   end
-  
-  
+
+
   class Server
-    
+
     def initialize(args) 
       puts "Args = #{args.inspect}"
       opts = OptionParser.new      
@@ -43,37 +43,38 @@ module Wiki2Go
       port = 8081
       wiki = 'Wiki2Go'
       single = false
+      allow_dynamic = false
+
       opts.on("-d",'--dir <directory>','(default is current directory)',String) { |val| dir = val }
       opts.on("-p",'--port <nb>',"(default is port 8081)",String) { |val| port = val }
       opts.on("-w",'--wiki <wikiname>',"(default is 'Wiki2Go')",String) { |val| wiki = val }
-      opts.on("-s","--single","Single or multi-wiki (default)") { |val| 
-        puts "In -s option"
-        single = true 
-      }
+      opts.on("-s","--single","Single or multi-wiki (default)") { |val| single = true }
+      opts.on('-r','--rublets','Allow dynamic pages') { |val| allow_dynamic = true }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
         exit
       end
       opts.parse(args)
-      
+
       @config = LocalConfig.new(dir)
+      @config.allow_dynamic_pages = allow_dynamic
       @config.port = port
       @config.default_web = wiki
       @config.generate_html = false
       @config.multi_wiki = !single
       puts "Multi wiki = #{@config.multi_wiki}"
     end
-    
+
     def start
       begin
-        
+
         yield @config if block_given?
-        
+
         web_thread = Thread.new(@config) do |config|
           s = WEBrick::HTTPServer.new( :Port => config.port)
-          
+
           s.mount("/", WikiServlet,config)
-          
+
           trap("INT"){ s.shutdown }
           s.start
         end
@@ -83,7 +84,7 @@ module Wiki2Go
         puts $@
       end
     end
-    
+
     def stop
       Net::HTTP.start( @config.server, @config.port) { |http|
         response = http.get('/stop/' + @config.default_web + '/')

data/lib/Wiki2Go/SpamFilter.rb

@@ -1,59 +1,60 @@
 require 'Wiki2Go/UrlFinder'
 
 require "uri"
+require 'net/http'
 
 module Wiki2Go
   class SpamFilter
-    
+
     def initialize(config)
       @config = config
     end
-    
+
     def edit_by_banned_user?(author)
       banned_users.contains(author)
     end
-    
+
     def edit_contains_banned_url?(content)
       banned_urls.found_in(content) || chonqed_urls.found_in(content)
     end
-    
+
     def too_many_new_urls?(original_content, modified_content,max_new_urls)
       return added_urls(original_content,modified_content).size > max_new_urls
     end
-    
+
     def added_urls(original_content, modified_content)
       url_finder = Wiki2Go::UrlFinder.new
-      
+
       old_urls = url_finder.urls_in(original_content)
       new_urls = url_finder.urls_in(modified_content)
       urls = new_urls - old_urls
       urls
     end
-    
+
     def blacklist_user(author)
       bad_users = banned_users
       bad_users.add(author)
       @config.storage.save_list(bad_users)
     end
-    
+
     def blacklist_url(url)
       banned_urls.add(host_of(url))
       @config.storage.save_list(banned_urls)
     end
-    
+
     def blacklist_urls(urls)
       urls.each do |url|
         banned_urls.add(url)
       end
       @config.storage.save_list(banned_urls)
     end
-    
+
     def blacklist_user_and_urls_added(author,original,new_content)
       blacklist_user(author)
       new_urls = added_urls(original,new_content)
       blacklist_urls(new_urls)
     end
-    
+
     def greylist_new_urls(author,original,new_content)
       new_urls = added_urls(original,new_content)
       if new_urls.length > 0 then    
@@ -64,32 +65,44 @@ module Wiki2Go
         @config.storage.save_list(list)
       end
     end
-    
+
+    def update_chongqed
+      output = 'Updating blacklist'
+      response = Net::HTTP.get_response('blacklist.chongqed.org','/index.html')
+      if response.code == '200' then
+        output = response.body
+        @config.storage.update_chongqed_spamlist(output)
+      else
+        output = "Error code #{response.code}: #{response.message}"
+      end
+      output
+    end
+
     private
-    
+
     def host_of(url)
       return '://' + URI::parse(url).host
     end
-    
+
     def banned_users
       @banned_users ||= @config.storage.load_blacklist('user')
       @banned_users
     end    
-    
+
     def banned_urls
       @banned_urls ||= @config.storage.load_blacklist('url')
       @banned_urls
     end
-    
+
     def chonqed_urls
       @chonqed_urls ||= @config.storage.load_blacklist('chonqed')
       @chonqed_urls
     end
-    
+
     def greylist
       @greylist ||= @config.storage.load_greylist
       @greylist
     end
-    
+
   end
 end