phprpc 3.0.4 → 3.0.5

data/lib/phprpc/cgi_server.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # cgi_server.rb                                            #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # PHPRPC CGIServer library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
 # LastModified: Sep 9, 2008
 # This library is free.  You can redistribute it and/or modify it.
@@ -31,9 +31,9 @@
 require "phprpc/base_server"
 
 module PHPRPC
-  
+
   class CGIServer < BaseServer
-    
+
     def start()
       cgi = CGI::new
       header, body = call!(ENV, cgi)

data/lib/phprpc/client.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # client.rb                                                #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,9 +23,9 @@
 #
 # PHPRPC Client library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
-# LastModified: Oct 6, 2008
+# LastModified: Mar 10, 2009
 # This library is free.  You can redistribute it and/or modify it.
 
 require "net/http"
@@ -35,9 +35,10 @@ require "digest/md5"
 require "php/formator"
 require "crypt/xxtea"
 require "powmod"
+require "thread"
 
 module PHPRPC
-  
+
   class Error < Exception
     attr_accessor :number
   end
@@ -46,22 +47,34 @@ module PHPRPC
 
     VERSION = '3.00'
 
+    @@cookie = ''
+    @@cookies = {}
+    @@sid = 0
+    @@mutex = Mutex.new
+
     def initialize(url = nil)
+      @clientID = "ruby" + rand(1 << 32).to_s + Time.now.to_i.to_s + @@sid.to_s
+      @@sid += 1
       Net::HTTP.version_1_2
-      @httpclient = nil
+      @httpclients = []
       @http = Net::HTTP
       @uri = nil
       if url then
         @uri = URI.parse(url)
+        if @uri.query.nil? then
+            @uri.query = "phprpc_id=" + @clientID
+        else
+            @uri.query = @uri.query + "&phprpc_id=" + @clientID
+        end
       end
+      @mutex = Mutex.new
       @timeout = 30
       @output = ''
       @warning = nil
       @key = nil
       @keylength = 128
       @encryptmode = 0
-      @cookie = ''
-      @cookies = {}
+      @keyexchanged = false;
       @charset = 'utf-8'
       @server_version = nil
     end
@@ -70,11 +83,15 @@ module PHPRPC
       if url then
         close
         @uri = URI.parse(url)
+        if @uri.query.nil? then
+            @uri.query = "phprpc_id=" + @clientID
+        else
+            @uri.query = @uri.query + "&phprpc_id=" + @clientID
+        end
         @key = nil
         @keylength = 128
         @encryptmode = 0
-        @cookie = ''
-        @cookies = {}
+        @keyexchanged = false;
         @charset = 'utf-8'
         @uri.user = username unless username.nil?
         @uri.password = password unless password.nil?
@@ -113,68 +130,101 @@ module PHPRPC
     end
 
     attr_accessor :charset, :timeout
-    
+
     attr_reader :output, :warning
 
-    def invoke(methodname, args, byref = false)
+    def invoke(methodname, args, byref = false, encryptmode = nil, &block)
+      if block_given? then
+        Thread.start {
+          data = _invoke(methodname, args, byref, encryptmode)
+          case block.arity
+            when 0: yield
+            when 1: yield data[:result]
+            when 2: yield data[:result], args
+            when 3: yield data[:result], args, data[:output]
+            when 4: yield data[:result], args, data[:output], data[:warning]
+          end
+        }
+      else
+        data = _invoke(methodname, args, byref, encryptmode)
+        @warning = data[:warning]
+        @output = data[:output]
+        data[:result]
+      end
+    end
+
+    def close
+      loop do
+        httpclient = @httpclients.shift
+        break if httpclient.nil?
+        httpclient.finish if httpclient.started?
+      end
+    end
+
+    private
+
+    def _invoke(methodname, args, byref = false, encryptmode = nil)
+      data = {}
       begin
-        _key_exchange()
+        encryptmode = @encryptmode if encryptmode.nil?
+        @mutex.synchronize {
+          encryptmode = _key_exchange(encryptmode)
+        }
         request = "phprpc_func=#{methodname}"
-        request << '&phprpc_args=' << [_encrypt(PHP::Formator.serialize(args), 1)].pack('m').delete!("\n").gsub('+', '%2B') if args.size > 0
-        request << "&phprpc_encrypt=#{@encryptmode}"
+        request << '&phprpc_args=' << [_encrypt(PHP::Formator.serialize(args), 1, encryptmode)].pack('m').delete!("\n").gsub('+', '%2B') if args.size > 0
+        request << "&phprpc_encrypt=#{encryptmode}"
         request << '&phprpc_ref=false' unless byref
         result = _post(request)
         if result.key?('phprpc_errstr') and result.key?('phprpc_errno') then
-          @warning = PHPRPC::Error.new(result['phprpc_errstr'].unpack('m')[0])
-          @warning.number = result['phprpc_errno'].to_i
+          warning = PHPRPC::Error.new(result['phprpc_errstr'].unpack('m')[0])
+          warning.number = result['phprpc_errno'].to_i
         elsif result.key?('phprpc_functions') then
-          @warning = PHPRPC::Error.new("PHPRPC server haven't received then POST data!")
-          @warning.number = 1
+          warning = PHPRPC::Error.new("PHPRPC server haven't received the POST data!")
+          warning.number = 1
         else
-          @warning = PHPRPC::Error.new("PHPRPC server occured unknown error!")
-          @warning.number = 1
+          warning = PHPRPC::Error.new("PHPRPC server occured unknown error!")
+          warning.number = 1
         end
+        data[:warning] = warning
         if result.key?('phprpc_output') then
-          @output = result['phprpc_output'].unpack('m')[0]
-          @output = _decrypt(@output, 3) if @server_version >= 3
+          output = result['phprpc_output'].unpack('m')[0]
+          output = _decrypt(output, 3, encryptmode) if @server_version >= 3
         else
-          @output = ''
+          output = ''
         end
+        data[:output] = output
         if result.key?('phprpc_result') then
-          PHP::Formator.unserialize(_decrypt(result['phprpc_arg'].unpack('m')[0], 1)).each { |key, value|
+          PHP::Formator.unserialize(_decrypt(result['phprpc_arg'].unpack('m')[0], 1, encryptmode)).each { |key, value|
             args[key] = value
           } if result.key?('phprpc_args')
-          PHP::Formator.unserialize(_decrypt(result['phprpc_result'].unpack('m')[0], 2))
+          data[:result] = PHP::Formator.unserialize(_decrypt(result['phprpc_result'].unpack('m')[0], 2, encryptmode))
         else
-          @warning
+          data[:result] = warning
         end
       rescue PHPRPC::Error => e
-        return e
+        data[:result] = e
       rescue Exception => ex
         e = PHPRPC::Error.new(ex.message)
         e.number = 1
-        return e
+        data[:result] = e
+      ensure
+        return data
       end
     end
-    
-    def close
-      @httpclient.finish if (not @httpclient.nil?) and @httpclient.started?
-      @httpclient = nil
-    end
-
-    private
 
     def _raise_error(number, message)
       error = Error.new(message)
       error.number = number
       raise error
     end
-    
+
     def _post(req)
-      if @httpclient.nil? then
-        @httpclient = @http.new(@uri.host, @uri.port)
-        @httpclient.use_ssl = (@uri.scheme == 'https')
-        @httpclient.start
+      httpclient = @httpclients.shift
+      if httpclient.nil? then
+        httpclient = @http.new(@uri.host, @uri.port)
+        httpclient.use_ssl = (@uri.scheme == 'https')
+        #httpclient.set_debug_output $stderr
+        httpclient.start
       end
       headers = {
         'User-Agent' => "PHPRPC 3.0 Client for Ruby (#{RUBY_VERSION})",
@@ -183,16 +233,18 @@ module PHPRPC
         'Content-Length' => req.size.to_s,
         'Connection' => 'keep-alive',
       }
-      headers['Cookie'] = @cookie unless @cookie.empty?
+      headers['Cookie'] = @@cookie unless @@cookie.empty?
       headers['Authorization'] = 'Basic ' << ["#{@uri.user}:#{@uri.password}"].pack('m').delete!("\n") unless @uri.user.nil? or @uri.password.nil?
-      resp, data = @httpclient.request_post(@uri.path, req, headers)
+      resp, data = httpclient.request_post(@uri.path + '?' + @uri.query, req, headers)
+      @httpclients.push(httpclient)
       if resp.code == '200' then
         if resp.key?('x-powered-by') then
-          @server_version = nil
+          server_version = nil
           resp['x-powered-by'].split(', ').each { |value|
-            @server_version = value[14..-1].to_f if value[0, 13] == 'PHPRPC Server'
+            server_version = value[14..-1].to_f if value[0, 13] == 'PHPRPC Server'
           }
-          _raise_error(1, 'Illegal PHPRPC server.') if @server_version.nil? 
+          _raise_error(1, 'Illegal PHPRPC server.') if server_version.nil?
+          @server_version = server_version
         else
           _raise_error(1, 'Illegal PHPRPC server.')
         end
@@ -200,14 +252,16 @@ module PHPRPC
           @charset = value[20..-1] if value[/^text\/plain; charset=/i]
         }
         if resp.key?('set-cookie') then
-          resp['set-cookie'].split(/[;,]\s?/).each { |pairs|
-            name, value = pairs.split('=', 2)
-            values ||= ''
-            @cookies[name] = value unless ['domain', 'expires', 'path', 'secure'].include?(name)
-          }
-          @cookie = ''
-          @cookies.each { |name, value|
-            @cookie << "#{name}=#{value}; "
+          @@mutex.synchronize {
+            resp['set-cookie'].split(/[;,]\s?/).each { |pairs|
+              name, value = pairs.split('=', 2)
+              values ||= ''
+              @@cookies[name] = value unless ['domain', 'expires', 'path', 'secure'].include?(name)
+            }
+            @@cookie = ''
+            @@cookies.each { |name, value|
+              @@cookie << "#{name}=#{value}; "
+            }
           }
         end
         result = {}
@@ -220,44 +274,47 @@ module PHPRPC
       end
     end
 
-    def _key_exchange
-      if (@key.nil?) and (@encryptmode != 0) then
-        result = _post("phprpc_encrypt=true&phprpc_keylen=#{@keylength.to_s}")
-        @keylength = result.key?('phprpc_keylen') ? result['phprpc_keylen'].to_i : 128
-        if result.key?('phprpc_encrypt') then
-          encrypt = PHP::Formator.unserialize(result['phprpc_encrypt'].unpack("m")[0])
-          x = rand(1 << (@keylength - 1)) or (1 << (@keylength - 2))
-          key = Math.powmod(encrypt['y'].to_i, x, encrypt['p'].to_i)
-          @key = (@keylength == 128) ? [key.to_s(16).rjust(32, '0')].pack('H*') : Digest::MD5.digest(key.to_s)
-          y = Math.powmod(encrypt['g'].to_i, x, encrypt['p'].to_i)
-          _post("phprpc_encrypt=#{y}")
-        else
-          @key = nil
-          @encryptmode = 0
-        end
+    def _key_exchange(encryptmode)
+      return encryptmode if (!@key.nil?) or (encryptmode == 0)
+      return 0 if (@key.nil?) and (@keyexchanged)
+      result = _post("phprpc_encrypt=true&phprpc_keylen=#{@keylength.to_s}")
+      @keylength = result.key?('phprpc_keylen') ? result['phprpc_keylen'].to_i : 128
+      if result.key?('phprpc_encrypt') then
+        encrypt = PHP::Formator.unserialize(result['phprpc_encrypt'].unpack("m")[0])
+        x = rand(1 << (@keylength - 1)) or (1 << (@keylength - 2))
+        key = Math.powmod(encrypt['y'].to_i, x, encrypt['p'].to_i)
+        @key = (@keylength == 128) ? [key.to_s(16).rjust(32, '0')].pack('H*') : Digest::MD5.digest(key.to_s)
+        y = Math.powmod(encrypt['g'].to_i, x, encrypt['p'].to_i)
+        _post("phprpc_encrypt=#{y}")
+      else
+        @key = nil
+        @keyexchanged = true
+        @encryptmode = 0
+        encryptmode = 0
       end
+      return encryptmode
     end
-    
-    def _encrypt(str, level)
-      ((not @key.nil?) and (@encryptmode >= level)) ? Crypt::XXTEA.encrypt(str, @key) : str
+
+    def _encrypt(str, level, encryptmode)
+      ((not @key.nil?) and (encryptmode >= level)) ? Crypt::XXTEA.encrypt(str, @key) : str
     end
-    
-    def _decrypt(str, level)
-      ((not @key.nil?) and (@encryptmode >= level)) ? Crypt::XXTEA.decrypt(str, @key) : str
+
+    def _decrypt(str, level, encryptmode)
+      ((not @key.nil?) and (encryptmode >= level)) ? Crypt::XXTEA.decrypt(str, @key) : str
     end
-    
-    def method_missing(methodname, *args)
-      self.invoke(methodname, args)
+
+    def method_missing(methodname, *args, &block)
+      self.invoke(methodname, args, &block)
     end
 
     class Proxy
 
       def initialize(phprpc_client)
-	@phprpc_client = phprpc_client
+        @phprpc_client = phprpc_client
       end
 
-      def method_missing(methodname, *args)
-        @phprpc_client.invoke(methodname, args)
+      def method_missing(methodname, *args, &block)
+        @phprpc_client.invoke(methodname, args, &block)
       end
 
     end # class Proxy

data/lib/phprpc/ebb_server.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # ebb_server.rb                                            #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # PHPRPC EbbServer library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
 # LastModified: Sep 14, 2008
 # This library is free.  You can redistribute it and/or modify it.
@@ -34,14 +34,14 @@ require "phprpc/base_server"
 
 module PHPRPC
   class EbbServer < BaseServer
-    
+
     def initialize(options = {})
       super()
       @options = {
         :port                 => 3000,
         :session_mode         => :file,
         :path                 => "/",
-        :expire_after         => 1800,        
+        :expire_after         => 1800,
       }.update(options)
       @opts = OptionParser.new
       @opts.banner = "Usage: #{@opts.program_name} ebb [options]"

data/lib/phprpc/fake_server.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # fake_server.rb                                           #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # PHPRPC FakeServer library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
 # LastModified: Sep 13, 2008
 # This library is free.  You can redistribute it and/or modify it.

data/lib/phprpc/fcgi_server.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # fcgi_server.rb                                           #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # PHPRPC FCGIServer library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
 # LastModified: Sep 14, 2008
 # This library is free.  You can redistribute it and/or modify it.
@@ -34,19 +34,19 @@ require 'phprpc/base_server'
 module PHPRPC
 
   class FCGIServer < BaseServer
-    
+
     def initialize(options = {})
       super()
       @options = {
         :session_mode         => :file,
         :path                 => "/",
-        :expire_after         => 1800,        
+        :expire_after         => 1800,
       }.update(options)
       @opts = OptionParser.new
       @opts.banner = "Usage: #{@opts.program_name} fcgi [options]"
       @opts.separator ""
       @opts.separator "Server options:"
-      @opts.on('-a', '--address IP', String, "Bind FCGI to the specified ip.") { |ip| @options[:host] = ip }  
+      @opts.on('-a', '--address IP', String, "Bind FCGI to the specified ip.") { |ip| @options[:host] = ip }
       @opts.on('-p', '--port PORT', Integer, "Run FCGI on the specified port.") { |port| @options[:port] = port }
       @opts.separator ""
       @opts.separator "Session options:"
@@ -63,7 +63,7 @@ module PHPRPC
       rescue OptionParser::ParseError
         puts @opts
         exit
-      end      
+      end
     end
 
     def start()