tdiary 3.2.2.20130507

data/misc/filter/linkcheck.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8; -*-
+#
+# linkcheck.rb: tDiary filter for checking link to my site in TrackBack source site.
+#
+# specification:
+#    * if source site has no URI of my site of top page, it's spam!
+#    * reading only top of 100KB of source site.
+#    * no response over 10 sec, it's mybe spam.
+#
+# Copyright (C) 2007 by TADA Tadashi <sho@spc.gr.jp>
+# Distributed under GPL2.
+#
+
+require 'open-uri'
+require 'timeout'
+
+module TDiary::Filter
+	class LinkcheckFilter < Filter
+		def initialize( *args )
+			super( *args )
+			@filter_mode = @conf['spamfilter.filter_mode']
+			@filter_mode = true if @filter_mode == nil
+		end
+
+		def comment_filter( diary, comment )
+			if @conf['spamfilter.linkcheck'] == 0 then
+				debug( "No linkcheck to TrackBacks.", DEBUG_FULL )
+				return true
+			end
+		
+			# check only TrackBack
+			return true unless comment.name == 'TrackBack'
+
+			dest_uri = @conf.index.dup
+			dest_uri[0, 0] = base_url if %r|^https?://|i !~ @conf.index
+			dest_uri.gsub!( %r|/\./|, '/' )
+
+			# TrackBack URI is the 1st line of comment.body.
+			src_uri, = comment.body.split( /\n/ )
+			unless %r|^https?://|i =~ src_uri then
+				debug( "TrackBack has bad source URI." )
+				comment.show = false
+				return @filter_mode
+			end
+			if src_uri.index( dest_uri ) == 0 then
+				debug( "TrackBack was sent to myself.", DEBUG_FULL )
+				return true
+			end
+
+			begin
+				Timeout::timeout( 10 ) do
+	      		open( src_uri ) do |f|
+						if f.read( 100 * 1024 ).include?( dest_uri ) then
+							debug( "TrackBack has links to me.", DEBUG_FULL )
+							return true
+						else
+							debug( "TrackBack dose not have links to me." )
+							comment.show = false
+							return @filter_mode
+						end
+					end
+				end
+			rescue Timeout::Error
+				debug( "TrackBack source was no response." )
+				comment.show = false
+				return @filter_mode
+			rescue 
+				debug( "Cannot access to TrackBack source (#{$!})." )
+				comment.show = false
+				return @filter_mode
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/filter/plugin/antispamservice.rb

@@ -0,0 +1,82 @@
+# -*- coding: utf-8; -*-
+#
+# antispamservice.rb: tDiary comment spam filter using API setup plugin. $Revision: 1.3 $
+#
+# Copyright (C) TADA Tadashi <sho@spc.gr.jp> 2007.
+# Modified by SHIBATA Hiroshi <shibata.hiroshi@gmail.com> 2008.
+# Distributed under GPL2.
+#
+
+require 'net/http'
+require 'uri'
+
+@antispam_service_list = {
+	# Service => ServiceHost
+	'Akismet' => 'rest.akismet.com',
+	'TypePad' => 'api.antispam.typepad.com'
+}
+
+add_conf_proc( 'antispamservice', @antispam_label_conf, 'security' ) do
+	antispam_conf_proc
+end
+
+def antispam_conf_proc
+	verify = true
+	if @mode == 'saveconf' then
+		@conf['antispam.service'] = @cgi.params['antispam.service'][0]
+		@conf['antispam.key'] = @cgi.params['antispam.key'][0]
+		if (@conf['antispam.key'] || '').length > 0 then
+			verify = antispam_verify_key?(@conf['antispam.service'], @conf['antispam.key'] )
+		end
+	end
+
+	result = <<-HTML
+		<p>#{@antispam_desc}</p>
+
+		<h3>#{@antispam_label_service}</h3>
+	HTML
+
+	options = ''
+	@antispam_service_list.each_key do |key|
+		options << %Q|<option value="#{h key}"#{" selected" if @conf['antispam.service'] == key}>#{h key}</option>\n|
+	end
+
+	result << <<-HTML
+		<p><select name="antispam.service">
+			#{options}
+		</select></p>
+
+		<h3>#{@antispam_label_key}</h3>
+	HTML
+
+	unless verify then
+		result << %Q[<p class="message">#{@antispam_warn_key}</p>]
+	end
+	result << <<-HTML
+		<p>#{@antispam_desc_key}: <input name="antispam.key" value="#{h( @conf['antispam.key'] || '')}" size="15"></p>
+	HTML
+end
+
+def antispam_verify_key?( host, key )
+	uri = URI::parse( "http://#{@antispam_service_list[host]}/1.1/verify-key")
+	blog = @conf.index.dup
+	blog[0, 0] = base_url unless %r|^https?://|i =~ blog
+	blog.gsub!( %r|/\./|, '/' )
+	data = "key=#{key}&blog=#{blog}"
+	header = {
+		'User-Agent' => "tDiary/#{TDIARY_VERSION} | Antispam filter",
+		'Content-Type' => 'application/x-www-form-urlencoded'
+	}
+	proxy_h, proxy_p = (@conf['proxy'] || '').split( /:/ )
+	res = ::Net::HTTP::Proxy( proxy_h, proxy_p ).start( uri.host, uri.port ) do |http|
+		http.post( uri.path, data, header )
+	end
+	return (res.body == 'valid')
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/filter/plugin/en/antispamservice.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8; -*-
+#
+# en/antispamservice.rb: English resource of Antispam filter setup plugin. $Revision: 1.2 $
+#
+
+@antispam_label_conf = 'Antispam service filter'
+@antispam_desc = 'Antispam service filter is a filter using WebService API. If you want to use this filter, you have to get API Key from your selected service.'
+
+@antispam_label_service = 'Select Antispam Service'
+
+@antispam_label_key = 'API Key'
+@antispam_desc_key = 'API Key'
+@antispam_warn_key = 'Invalid API Key.'
+
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/filter/plugin/ja/antispamservice.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8; -*-
+#
+# ja/antispamservice.rb: Japanese resource of Antispam filter setup plugin. $Revision: 1.2 $
+#
+
+@antispam_label_conf = 'Antispamサービス フィルタ'
+@antispam_desc = 'Antispamサービス フィルタは、APIとして提供されるspam判定サービスを使って、ツッコミやTrackBackのspamを排除するフィルタです。このサービスを利用するには、使用するサービスのAPI Keyを取得して、以下に設定する必要があります。'
+
+@antispam_label_service = '使用するspam判定サービスの選択'
+
+@antispam_label_key = 'API Key'
+@antispam_desc_key = 'API Key'
+@antispam_warn_key = 'API Keyが正しくありません。サービスの提供元によって拒絶されました。'
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/lib/README

@@ -0,0 +1,4 @@
+This directory is for libraries:
+
+* for compatibility with ruby 1.8 and 1.9.
+* for patching about charctor encoding.

data/misc/lib/compatible.rb

@@ -0,0 +1 @@
+# move to tdiary/compatible.rb

data/misc/lib/fcgi_patch.rb

@@ -0,0 +1,90 @@
+=begin
+
+Patched version of FCGI::each_cgi from fcgi-0.8.8.
+* if encoding error happens with UTF-8, try Shift_JIS.
+
+Original copyright notices:
+  fastcgi.rb Copyright (C) 2001 Eli Green
+  fcgi.rb    Copyright (C) 2002-2003 MoonWolf <moonwolf@moonwolf.com>
+  fcgi.rb    Copyright (C) 2004 Minero Aoki
+
+Patch written by:
+  Copyright (C) 2011 Kazuhiko <kazuhiko@fdiary.net>
+
+=end
+
+class FCGI
+  def self::each_cgi(*args)
+    require 'cgi'
+    
+    eval(<<-EOS,TOPLEVEL_BINDING)
+    class CGI
+      public :env_table
+      def self::remove_params
+        if (const_defined?(:CGI_PARAMS))
+          remove_const(:CGI_PARAMS)
+          remove_const(:CGI_COOKIES)
+        end
+      end
+    end # ::CGI class
+
+    class FCGI
+      class CGI < ::CGI
+        def initialize(request, *args)
+          ::CGI.remove_params
+          @request = request
+          # PATCH BEGIN : if encoding error happens with UTF-8, try
+          #               Shift_JIS.
+          encoding_error = {}
+          super(*(args+[:accept_charset => "UTF-8"]))  do |name, value|
+            encoding_error[name] = value
+          end
+          params = @params
+          unless encoding_error.empty?
+            super(*(args+[:accept_charset => "Shift_JIS"]))
+            @params = params
+          end
+          # PATCH END : if encoding error happens with UTF-8, try
+          #             Shift_JIS.
+          @args = *args
+        end
+        def args
+          @args
+        end
+        def env_table
+          @request.env
+        end
+        def stdinput
+          @request.in
+        end
+        def stdoutput
+          @request.out
+        end
+      end # FCGI::CGI class
+    end # FCGI class
+    EOS
+    
+    if FCGI::is_cgi?
+      yield ::CGI.new(*args)
+    else
+      exit_requested = false
+      FCGI::each {|request|
+        $stdout, $stderr = request.out, request.err
+
+        yield CGI.new(request, *args)
+        
+        request.finish
+      }
+    end
+  end
+end
+
+# The following indentation rule is not same as tDiary's by intention.
+# It is same as the original (fcgi-0.8.8/lib/fcgi.rb) so that we can
+# easily see the difference by diff command.
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: nil
+# ruby-indent-level: 2
+# End:

data/misc/migrate.rb

@@ -0,0 +1,157 @@
+# -*- coding: utf-8; -*-
+#!/usr/bin/env ruby
+#
+# migrate.rb $Revision: 1.2 $
+#
+# Copyright (C) 2001-2003, TADA Tadashi <sho@spc.gr.jp>
+# Copyright (C) 2007, Kazuhiko <kazuhiko@fdiary.net>
+# You can redistribute it and/or modify it under GPL2.
+#
+BEGIN { $stdout.binmode }
+$KCODE = 'n'
+
+require "fileutils"
+require "pstore"
+
+begin
+	if FileTest::symlink?( __FILE__ ) then
+		org_path = File::dirname( File::readlink( __FILE__ ) )
+	else
+		org_path = File::dirname( __FILE__ )
+	end
+	$:.unshift( org_path.untaint )
+	require 'tdiary'
+
+	class TDiary::MigrateConfig < TDiary::Config
+		include ERB::Util
+
+		def load_cgi_conf
+			raise TDiaryError, 'No @data_path variable.' unless @data_path
+
+			@data_path += '/' if /\/$/ !~ @data_path
+			raise TDiaryError, 'Do not set @data_path as same as tDiary system directory.' if @data_path == "#{TDiary::PATH}/"
+
+			# convert tdiary.conf in @data_path
+			conf_path = "#{@data_path}tdiary.conf"
+			conf = convert( File::open( conf_path ){|f| f.read } )
+			conf.gsub!(/(\\[0-9]{3})+/) do |str|
+				convert(eval(%Q["#{$&}"])).dump[1...-1]
+			end
+			File::open( conf_path, 'w' ) do |o|
+				o.print conf
+			end
+
+			# convert diary data and comment data
+			Dir["#{@data_path}[0-9][0-9][0-9][0-9]/??????.td[2c]"].each do |file|
+				convert_file(file)
+			end
+
+			# convert pstore cache files
+			dir = cache_path || "#{@data_path}cache"
+			%w(makerss.cache recent_comments recent_trackbacks tlink/tlink.dat).each do |e|
+				convert_pstore("#{dir}/#{e}") if File.exist?("#{dir}/#{e}")
+			end
+			Dir["#{dir}/disp_referrer2.d/*"].each do |file|
+				convert_pstore(file)
+			end
+			Dir["#{@data_path}category/*"].each do |file|
+				convert_pstore(file)
+			end
+
+			# rename category cache files
+			Dir["#{@data_path}category/*"].each do |file|
+				dirname, basename = File.split(file)
+				new_basename = u(convert(CGI::unescape(basename)))
+				FileUtils.mv(file, File.join(dirname, new_basename)) unless basename == new_basename
+			end
+
+			# remove ruby/erb cache files
+			Dir["#{dir}/*.rb"].each{|f| FileUtils.rm_f(f)}
+			Dir["#{dir}/*.parser"].each{|f| FileUtils.rm_f(f)}
+		end
+
+		def convert_pstore(file)
+			db = PStore.new(file)
+			begin
+				roots = db.transaction{ db.roots }
+			rescue ArgumentError
+				if /\Aundefined class\/module (.+?)(::)?\z/ =~ $!.message
+					klass = $1
+					if /EmptdiaryString\z/ =~ klass
+						eval("class ::#{klass} < String; end")
+					else
+						eval("class ::#{klass}; end")
+					end
+					retry
+				end
+			end
+			db.transaction do
+				roots.each do |root|
+					convert_element(db[root])
+				end
+			end
+		end
+
+		def convert_element(data)
+			case data
+			when Hash, Array
+				data.each_with_index do |e, i|
+					if String === e
+						data[i] = convert(e)
+					else
+						convert_element(e)
+					end
+				end
+			else
+				data.instance_variables.each do |e|
+					var = data.instance_variable_get(e)
+					if String === var
+						data.instance_variable_set(e, convert(var))
+					else
+						convert_element(var)
+					end
+				end
+			end
+		end
+
+		def convert_file(file)
+			body = convert( File::open( file ){|f| f.read} )
+			File::open( file, 'w' ) do |o|
+				o.print body
+			end
+		end
+
+		def convert(str)
+			str.class.new(to_native(str, 'EUC-JP'))
+		end
+	end
+
+	@cgi = CGI::new
+	conf = TDiary::MigrateConfig::new(@cgi)
+
+	print @cgi.header( 'status' => '200 OK', 'type' => 'text/html' )
+	puts "<h1>Migration completed.</h1>"
+	puts "<p>Do not forget to remove migrate.rb.</p>"
+
+rescue Exception
+	if @cgi then
+		print @cgi.header( 'status' => '500 Internal Server Error', 'type' => 'text/html' )
+	else
+		print "Status: 500 Internal Server Error\n"
+		print "Content-Type: text/html\n\n"
+	end
+	puts "<h1>500 Internal Server Error</h1>"
+	puts "<pre>"
+	puts CGI::escapeHTML( "#{$!} (#{$!.class})" )
+	puts ""
+	puts CGI::escapeHTML( $@.join( "\n" ) )
+	puts "</pre>"
+	puts "<div>#{' ' * 500}</div>"
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End: