soap4r 1.5.6 → 1.5.7

data/lib/xsd/mapping.rb

@@ -18,23 +18,40 @@ module XSD
 
 module Mapping
   MappingRegistry = SOAP::Mapping::LiteralRegistry.new
-  MappingOpt = {:default_encodingstyle => SOAP::LiteralNamespace}
 
   def self.obj2xml(obj, elename = nil, io = nil)
-    if !elename.nil? and !elename.is_a?(XSD::QName)
-      elename = XSD::QName.new(nil, elename)
-    end
-    elename ||= XSD::QName.new(nil, SOAP::Mapping.name2elename(obj.class.to_s))
-    soap = SOAP::Mapping.obj2soap(obj, MappingRegistry)
-    soap.elename = elename
-    generator = SOAP::SOAPGenerator.new(MappingOpt)
-    generator.generate(soap, io)
+    Mapper.new(MappingRegistry).obj2xml(obj, elename, io)
+  end
+
+  def self.xml2obj(stream, klass = nil)
+    Mapper.new(MappingRegistry).xml2obj(stream, klass)
   end
 
-  def self.xml2obj(stream)
-    parser = SOAP::Parser.new(MappingOpt)
-    soap = parser.parse(stream)
-    SOAP::Mapping.soap2obj(soap, MappingRegistry)
+  class Mapper
+    MAPPING_OPT = {:default_encodingstyle => SOAP::LiteralNamespace}
+
+    def initialize(registry)
+      @registry = registry
+    end
+
+    def obj2xml(obj, elename = nil, io = nil)
+      if !elename.nil? and !elename.is_a?(XSD::QName)
+        elename = XSD::QName.new(nil, elename)
+      end
+      soap = SOAP::Mapping.obj2soap(obj, @registry, elename)
+      if soap.elename.nil? or soap.elename == XSD::QName::EMPTY
+        soap.elename =
+          XSD::QName.new(nil, SOAP::Mapping.name2elename(obj.class.to_s))
+      end
+      generator = SOAP::SOAPGenerator.new(MAPPING_OPT)
+      generator.generate(soap, io)
+    end
+
+    def xml2obj(stream, klass = nil)
+      parser = SOAP::Parser.new(MAPPING_OPT)
+      soap = parser.parse(stream)
+      SOAP::Mapping.soap2obj(soap, @registry, klass)
+    end
   end
 end
 

data/test/interopR2/client.log

@@ -0,0 +1,5 @@
+File: client.log - Wiredumps for SOAP4R client / localhsot server.
+Date: Wed Jul 04 23:08:41 +0900 2007
+
+==== test_echoMapArray_multibyte_char ========================================
+

data/test/interopR2/client.rb

@@ -5,6 +5,7 @@ require 'soap/rpc/driver'
 require 'soap/mapping'
 require 'base'
 require 'interopResultBase'
+require 'xsd/xmlparser/rexmlparser'
 #XSD::Charset.encoding = 'EUC'
 
 class Float
@@ -100,7 +101,11 @@ class SOAPBuildersTest < Test::Unit::TestCase
       soap_action = InterfaceNS
       @@drv = RPC::Driver.new(location, namespace, soap_action)
       @@drv.mapping_registry = SOAPBuildersInterop::MappingRegistry
-      @@drv.wiredump_dev = @@log
+      if $DEBUG
+        @@drv.wiredump_dev = STDOUT
+      else
+        @@drv.wiredump_dev = @@log
+      end
       method_def(@@drv, soap_action)
     end
 
@@ -1222,7 +1227,8 @@ class SOAPBuildersTest < Test::Unit::TestCase
 end
 
 if $0 == __FILE__
-  name = ARGV.shift || 'localhost'
-  location = ARGV.shift || 'http://localhost:10080/'
+  #name = ARGV.shift || 'localhost'
+  #location = ARGV.shift || 'http://localhost:10080/'
+  name = 'localhsot'; location = 'http://localhost:10080/'
   SOAPBuildersTest.setup(name, location)
 end

data/test/interopR2/server.rb

@@ -8,6 +8,7 @@ $KCODE = "SJIS"
 
 require 'soap/rpc/standaloneServer'
 require 'base'
+require 'xsd/xmlparser/rexmlparser'
 
 class InteropApp < SOAP::RPC::StandaloneServer
   include SOAP

data/test/soap/asp.net/test_aspdotnet.rb

@@ -87,7 +87,7 @@ __XML__
     assert_equal("Hello Mike", @client.sayHello("Mike"))
   end
 
-  if defined?(HTTPAccess2)
+  if defined?(HTTPClient)
 
     # qualified!
     REQUEST_ASPDOTNETHANDLER =

data/test/soap/auth/htdigest

@@ -0,0 +1,2 @@
+admin:auth:4302fe65caa32f27721949149ccd3083
+guest:auth:402550d83a8289be65377d0e7d11fb6e

data/test/soap/auth/htpasswd

@@ -0,0 +1,2 @@
+admin:Qg266hq/YYKe2
+guest:gbPc4vPCH.h12

data/test/soap/auth/test_basic.rb

@@ -0,0 +1,116 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'webrick'
+require 'webrick/httpproxy'
+require 'logger'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
+
+module SOAP; module Auth
+
+
+class TestBasic < Test::Unit::TestCase
+  Port = 17171
+  ProxyPort = 17172
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::ERROR
+    @url = "http://localhost:#{Port}/"
+    @proxyurl = "http://localhost:#{ProxyPort}/"
+    @server = @proxyserver = @client = nil
+    @server_thread = @proxyserver_thread = nil
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_proxyserver if @proxyserver
+    teardown_server
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
+    htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
+    @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Realm => 'auth',
+      :UserDB => htpasswd_userdb
+    )
+    @server.mount(
+      '/',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
+    )
+    @server_thread = TestUtil.start_server_thread(@server)
+  end
+
+  def setup_proxyserver
+    @proxyserver = WEBrick::HTTPProxyServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => ProxyPort,
+      :AccessLog => []
+    )
+    @proxyserver_thread = TestUtil.start_server_thread(@proxyserver)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, '')
+    @client.add_method("do_server_proc")
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_proxyserver
+    @proxyserver.shutdown
+    @proxyserver_thread.kill
+    @proxyserver_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def do_server_proc(req, res)
+    @basic_auth.authenticate(req, res)
+    res['content-type'] = 'text/xml'
+    res.body = <<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return>OK</return>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def test_direct
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.options["protocol.http.auth"] << [@url, "admin", "admin"]
+    assert_equal("OK", @client.do_server_proc)
+  end
+
+  def test_proxy
+    setup_proxyserver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.options["protocol.http.proxy"] = @proxyurl
+    @client.options["protocol.http.auth"] << [@url, "guest", "guest"]
+    assert_equal("OK", @client.do_server_proc)
+  end
+end
+
+
+end; end

data/test/soap/auth/test_digest.rb

@@ -0,0 +1,117 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'webrick'
+require 'webrick/httpproxy'
+require 'logger'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
+
+module SOAP; module Auth
+
+
+class TestDigest < Test::Unit::TestCase
+  Port = 17171
+  ProxyPort = 17172
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::ERROR
+    @url = "http://localhost:#{Port}/"
+    @proxyurl = "http://localhost:#{ProxyPort}/"
+    @server = @proxyserver = @client = nil
+    @server_thread = @proxyserver_thread = nil
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_proxyserver if @proxyserver
+    teardown_server
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    htdigest = File.join(File.dirname(__FILE__), 'htdigest')
+    htdigest_userdb = WEBrick::HTTPAuth::Htdigest.new(htdigest)
+    @digest_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Algorithm => 'MD5',
+      :Realm => 'auth',
+      :UserDB => htdigest_userdb
+    )
+    @server.mount(
+      '/',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
+    )
+    @server_thread = TestUtil.start_server_thread(@server)
+  end
+
+  def setup_proxyserver
+    @proxyserver = WEBrick::HTTPProxyServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => ProxyPort,
+      :AccessLog => []
+    )
+    @proxyserver_thread = TestUtil.start_server_thread(@proxyserver)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, '')
+    @client.add_method("do_server_proc")
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_proxyserver
+    @proxyserver.shutdown
+    @proxyserver_thread.kill
+    @proxyserver_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def do_server_proc(req, res)
+    @digest_auth.authenticate(req, res)
+    res['content-type'] = 'text/xml'
+    res.body = <<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return>OK</return>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def test_direct
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.options["protocol.http.auth"] << [@url, "admin", "admin"]
+    assert_equal("OK", @client.do_server_proc)
+  end
+
+  def test_proxy
+    setup_proxyserver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.options["protocol.http.proxy"] = @proxyurl
+    @client.options["protocol.http.auth"] << [@url, "guest", "guest"]
+    assert_equal("OK", @client.do_server_proc)
+  end
+end
+
+
+end; end

data/test/soap/htpasswd

@@ -0,0 +1,2 @@
+admin:Qg266hq/YYKe2
+guest:gbPc4vPCH.h12

data/test/soap/ssl/README

@@ -1 +1 @@
-* certificates and keys in this directory is copied from http-access2 test.
+* certificates and keys in this directory is copied from httpclient test.

data/test/soap/ssl/test_ssl.rb

@@ -1,11 +1,11 @@
 require 'test/unit'
 begin
-  require 'http-access2'
+  require 'httpclient'
 rescue LoadError
 end
 require 'soap/rpc/driver'
 
-if defined?(HTTPAccess2) and defined?(OpenSSL)
+if defined?(HTTPClient) and defined?(OpenSSL)
 
 module SOAP; module SSL
 
@@ -58,7 +58,7 @@ class TestSSL < Test::Unit::TestCase
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("certificate verify failed", ssle.message)
+      assert(/certificate verify failed/ =~ ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -69,7 +69,7 @@ class TestSSL < Test::Unit::TestCase
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("certificate verify failed", ssle.message)
+      assert(/certificate verify failed/ =~ ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -79,7 +79,7 @@ class TestSSL < Test::Unit::TestCase
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("certificate verify failed", ssle.message)
+      assert(/certificate verify failed/ =~ ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -94,7 +94,7 @@ class TestSSL < Test::Unit::TestCase
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("certificate verify failed", ssle.message)
+      assert(/certificate verify failed/ =~ ssle.message)
       assert(@verify_callback_called)
     end
     #
@@ -105,7 +105,7 @@ class TestSSL < Test::Unit::TestCase
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("certificate verify failed", ssle.message)
+      assert(/certificate verify failed/ =~ ssle.message)
     end
     #
     cfg["protocol.http.ssl_config.verify_mode"] = ""
@@ -135,7 +135,7 @@ __EOP__
         @client.hello_world("ssl client")
         assert(false)
       rescue OpenSSL::SSL::SSLError => ssle
-        assert_equal("certificate verify failed", ssle.message)
+        assert(/certificate verify failed/ =~ ssle.message)
         assert(@verify_callback_called)
       end
       # NG with Integer
@@ -144,7 +144,7 @@ __EOP__
         @client.hello_world("ssl client")
         assert(false)
       rescue OpenSSL::SSL::SSLError => ssle
-        assert_equal("certificate verify failed", ssle.message)
+        assert(/certificate verify failed/ =~ ssle.message)
         assert(@verify_callback_called)
       end
       # OK with empty

data/test/soap/test_cookie.rb

@@ -0,0 +1,112 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'webrick'
+require 'logger'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
+
+
+module SOAP
+
+
+class TestCookie < Test::Unit::TestCase
+  Port = 17171
+
+  class CookieFilter < SOAP::Filter::StreamHandler
+    attr_accessor :cookie_value
+
+    def initialize
+      @cookie_value = nil
+    end
+
+    def on_http_outbound(req)
+      if @cookie_value
+        req.header.delete('Cookie')
+        req.header['Cookie'] = @cookie_value
+      end
+    end
+
+    def on_http_inbound(req, res)
+      # this sample filter only caputures the first cookie.
+      cookie = res.header['Set-Cookie'][0]
+      cookie.sub!(/;.*\z/, '') if cookie
+      @cookie_value = cookie
+      # do not save cookie value.
+    end
+  end
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::ERROR
+    @url = "http://localhost:#{Port}/"
+    @server = @client = nil
+    @server_thread = nil
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_server
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    @server.mount(
+      '/',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
+    )
+    @server_thread = TestUtil.start_server_thread(@server)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, '')
+    @client.add_method("do_server_proc")
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def do_server_proc(req, res)
+    cookie = req['Cookie'].to_s
+    cookie = "var=hello world" if cookie.empty?
+    res['content-type'] = 'text/xml'
+    res['Set-Cookie'] = cookie
+    res.body = <<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return xsi:nil="true"/>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def test_normal
+    @client.wiredump_dev = STDOUT if $DEBUG
+    filter = CookieFilter.new
+    @client.streamhandler.filterchain << filter
+    assert_nil(@client.do_server_proc)
+    assert_equal('var=hello world', filter.cookie_value)
+    filter.cookie_value = 'var=empty'
+    assert_nil(@client.do_server_proc)
+    assert_equal('var=empty', filter.cookie_value)
+  end
+end
+
+
+end