mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eb3f829be9
== SOAP client and server == === for both client side and server side === * improved document/literal service support. style(rpc,document)/use(encoding, literal) combination are all supported. for the detail about combination, see test/soap/test_style.rb. * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to WSDL as well as obj2soap. closes #70. * let SOAP::Mapping::Object handle XML attribute for doc/lit service. you can set/get XML attribute via accessor methods which as a name 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name). === client side === * WSDLDriver capitalized name operation bug fixed. from 1.5.3-ruby1.8.2, operation which has capitalized name (such as KeywordSearchRequest in AWS) is defined as a method having uncapitalized name. (converted with GenSupport.safemethodname to handle operation name 'foo-bar'). it introduced serious incompatibility; in the past, it was defined as a capitalized. define capitalized method as well under that circumstance. * added new factory interface 'WSDLDriverFactory#create_rpc_driver' to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver are merged). 'WSDLDriverFactory#create_driver' still creates WSDLDriver for compatibility but it warns that the method is deprecated. please use create_rpc_driver instead of create_driver. * allow to use an URI object as an endpoint_url even with net/http, not http-access2. === server side === * added mod_ruby support to SOAP::CGIStub. rename a CGI script server.cgi to server.rb and let mod_ruby's RubyHandler handles the script. CGIStub detects if it's running under mod_ruby environment or not. * added fcgi support to SOAP::CGIStub. see the sample at sample/soap/calc/server.fcgi. (almost same as server.cgi but has fcgi handler at the bottom.) * allow to return a SOAPFault object to respond customized SOAP fault. * added the interface 'generate_explicit_type' for server side (CGIStub, HTTPServer). call 'self.generate_explicit_type = true' if you want to return simplified XML even if it's rpc/encoded service. == WSDL == === WSDL definition === * improved XML Schema support such as extension, restriction, simpleType, complexType + simpleContent, ref, length, import, include. * reduced "unknown element/attribute" warnings (warn only 1 time for each QName). * importing XSD file at schemaLocation with xsd:import. === code generation from WSDL === * generator crashed when there's '-' in defined element/attribute name. * added ApacheMap WSDL definition. * sample/{soap,wsdl}: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
209 lines
5.2 KiB
Ruby
209 lines
5.2 KiB
Ruby
require 'test/unit'
|
|
require 'soap/rpc/driver'
|
|
require 'webrick'
|
|
require 'webrick/httpproxy'
|
|
require 'logger'
|
|
|
|
|
|
module SOAP
|
|
|
|
|
|
class TestStreamHandler < 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__))
|
|
)
|
|
@server.mount(
|
|
'/',
|
|
WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
|
|
)
|
|
@server_thread = start_server_thread(@server)
|
|
end
|
|
|
|
def setup_proxyserver
|
|
@proxyserver = WEBrick::HTTPProxyServer.new(
|
|
:BindAddress => "0.0.0.0",
|
|
:Logger => @logger,
|
|
:Port => ProxyPort,
|
|
:AccessLog => []
|
|
)
|
|
@proxyserver_thread = 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 start_server_thread(server)
|
|
t = Thread.new {
|
|
Thread.current.abort_on_exception = true
|
|
server.start
|
|
}
|
|
t
|
|
end
|
|
|
|
def do_server_proc(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 xsi:nil="true"/>
|
|
</n1:do_server_proc>
|
|
</env:Body>
|
|
</env:Envelope>
|
|
__EOX__
|
|
end
|
|
|
|
def parse_req_header(str)
|
|
if ::SOAP::StreamHandler::Client.to_s == 'SOAP::NetHttpClient'
|
|
str = eval(str.split(/\r?\n/)[4][3..-1])
|
|
end
|
|
parse_req_header_http_access2(str)
|
|
end
|
|
|
|
def parse_req_header_http_access2(str)
|
|
headerp = false
|
|
headers = {}
|
|
req = nil
|
|
str.split(/(?:\r?\n)/).each do |line|
|
|
if headerp and /^$/ =~line
|
|
headerp = false
|
|
break
|
|
end
|
|
if headerp
|
|
k, v = line.scan(/^([^:]+):\s*(.*)$/)[0]
|
|
headers[k.downcase] = v
|
|
end
|
|
if /^POST/ =~ line
|
|
req = line
|
|
headerp = true
|
|
end
|
|
end
|
|
return req, headers
|
|
end
|
|
|
|
def test_normal
|
|
str = ""
|
|
@client.wiredump_dev = str
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_match(%r"POST / HTTP/1.", r)
|
|
assert(/^text\/xml;/ =~ h["content-type"])
|
|
end
|
|
|
|
def test_uri
|
|
# initialize client with URI object
|
|
@client = SOAP::RPC::Driver.new(URI.parse(@url), '')
|
|
@client.add_method("do_server_proc")
|
|
# same as test_normal
|
|
str = ""
|
|
@client.wiredump_dev = str
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_match(%r"POST / HTTP/1.", r)
|
|
assert(/^text\/xml;/ =~ h["content-type"])
|
|
end
|
|
|
|
def test_basic_auth
|
|
unless Object.const_defined?('HTTPAccess2')
|
|
# soap4r + net/http + basic_auth is not supported.
|
|
# use http-access2 instead.
|
|
assert(true)
|
|
return
|
|
end
|
|
str = ""
|
|
@client.wiredump_dev = str
|
|
@client.options["protocol.http.basic_auth"] << [@url, "foo", "bar"]
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_equal("Basic Zm9vOmJhcg==", h["authorization"])
|
|
end
|
|
|
|
def test_proxy
|
|
if Object.const_defined?('HTTPAccess2')
|
|
backup = HTTPAccess2::Client::NO_PROXY_HOSTS.dup
|
|
HTTPAccess2::Client::NO_PROXY_HOSTS.clear
|
|
else
|
|
backup = SOAP::NetHttpClient::NO_PROXY_HOSTS.dup
|
|
SOAP::NetHttpClient::NO_PROXY_HOSTS.clear
|
|
end
|
|
setup_proxyserver
|
|
str = ""
|
|
@client.wiredump_dev = str
|
|
@client.options["protocol.http.proxy"] = @proxyurl
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_match(%r"POST http://localhost:17171/ HTTP/1.", r)
|
|
# illegal proxy uri
|
|
assert_raise(ArgumentError) do
|
|
@client.options["protocol.http.proxy"] = 'ftp://foo:8080'
|
|
end
|
|
ensure
|
|
if Object.const_defined?('HTTPAccess2')
|
|
HTTPAccess2::Client::NO_PROXY_HOSTS.replace(backup)
|
|
else
|
|
SOAP::NetHttpClient::NO_PROXY_HOSTS.replace(backup)
|
|
end
|
|
end
|
|
|
|
def test_charset
|
|
str = ""
|
|
@client.wiredump_dev = str
|
|
@client.options["protocol.http.charset"] = "iso-8859-8"
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_equal("text/xml; charset=iso-8859-8", h["content-type"])
|
|
#
|
|
str.replace("")
|
|
@client.options["protocol.http.charset"] = "iso-8859-3"
|
|
assert_nil(@client.do_server_proc)
|
|
r, h = parse_req_header(str)
|
|
assert_equal("text/xml; charset=iso-8859-3", h["content-type"])
|
|
end
|
|
end
|
|
|
|
|
|
end
|