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
236 lines
7.4 KiB
Ruby
236 lines
7.4 KiB
Ruby
require 'test/unit'
|
|
begin
|
|
require 'http-access2'
|
|
rescue LoadError
|
|
end
|
|
require 'soap/rpc/driver'
|
|
|
|
if defined?(HTTPAccess2) and defined?(OpenSSL)
|
|
|
|
module SOAP; module SSL
|
|
|
|
|
|
class TestSSL < Test::Unit::TestCase
|
|
PORT = 17171
|
|
|
|
DIR = File.dirname(File.expand_path(__FILE__))
|
|
require 'rbconfig'
|
|
RUBY = File.join(
|
|
Config::CONFIG["bindir"],
|
|
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
|
|
)
|
|
|
|
def setup
|
|
@url = "https://localhost:#{PORT}/hello"
|
|
@serverpid = @client = nil
|
|
@verify_callback_called = false
|
|
setup_server
|
|
setup_client
|
|
end
|
|
|
|
def teardown
|
|
teardown_client
|
|
teardown_server
|
|
end
|
|
|
|
def test_options
|
|
cfg = @client.streamhandler.client.ssl_config
|
|
assert_nil(cfg.client_cert)
|
|
assert_nil(cfg.client_key)
|
|
assert_nil(cfg.client_ca)
|
|
assert_equal(OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT, cfg.verify_mode)
|
|
assert_nil(cfg.verify_callback)
|
|
assert_nil(cfg.timeout)
|
|
assert_equal(OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2, cfg.options)
|
|
assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", cfg.ciphers)
|
|
assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
|
|
# dummy call to ensure sslsvr initialization finished.
|
|
assert_raise(OpenSSL::SSL::SSLError) do
|
|
@client.hello_world("ssl client")
|
|
end
|
|
end
|
|
|
|
def test_verification
|
|
cfg = @client.options
|
|
cfg["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
|
|
begin
|
|
@verify_callback_called = false
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, "client.cert")
|
|
cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, "client.key")
|
|
@verify_callback_called = false
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
|
|
@verify_callback_called = false
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
|
|
@verify_callback_called = false
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
assert(@verify_callback_called)
|
|
#
|
|
cfg["protocol.http.ssl_config.verify_depth"] = "1"
|
|
@verify_callback_called = false
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.verify_depth"] = ""
|
|
cfg["protocol.http.ssl_config.cert_store"] = OpenSSL::X509::Store.new
|
|
cfg["protocol.http.ssl_config.verify_mode"] = OpenSSL::SSL::VERIFY_PEER.to_s
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.verify_mode"] = ""
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
end
|
|
|
|
def test_property
|
|
testpropertyname = File.join(DIR, 'soapclient.properties')
|
|
File.open(testpropertyname, "w") do |f|
|
|
f <<<<__EOP__
|
|
protocol.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
|
|
# depth: 1 causes an error (intentional)
|
|
protocol.http.ssl_config.verify_depth = 1
|
|
protocol.http.ssl_config.client_cert = #{File.join(DIR, 'client.cert')}
|
|
protocol.http.ssl_config.client_key = #{File.join(DIR, 'client.key')}
|
|
protocol.http.ssl_config.ca_file = #{File.join(DIR, 'ca.cert')}
|
|
protocol.http.ssl_config.ca_file = #{File.join(DIR, 'subca.cert')}
|
|
protocol.http.ssl_config.ciphers = ALL
|
|
__EOP__
|
|
end
|
|
begin
|
|
@client.loadproperty(testpropertyname)
|
|
@client.options["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
|
|
@verify_callback_called = false
|
|
# NG with String
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
# NG with Integer
|
|
@client.options["protocol.http.ssl_config.verify_depth"] = 0
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("certificate verify failed", ssle.message)
|
|
assert(@verify_callback_called)
|
|
end
|
|
# OK with empty
|
|
@client.options["protocol.http.ssl_config.verify_depth"] = ""
|
|
@verify_callback_called = false
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
assert(@verify_callback_called)
|
|
# OK with nil
|
|
@client.options["protocol.http.ssl_config.verify_depth"] = nil
|
|
@verify_callback_called = false
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
assert(@verify_callback_called)
|
|
# OK with String
|
|
@client.options["protocol.http.ssl_config.verify_depth"] = "3"
|
|
@verify_callback_called = false
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
assert(@verify_callback_called)
|
|
# OK with Integer
|
|
@client.options["protocol.http.ssl_config.verify_depth"] = 3
|
|
@verify_callback_called = false
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
assert(@verify_callback_called)
|
|
ensure
|
|
File.unlink(testpropertyname)
|
|
end
|
|
end
|
|
|
|
def test_ciphers
|
|
cfg = @client.options
|
|
cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, 'client.cert')
|
|
cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, 'client.key')
|
|
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
|
|
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
|
|
#cfg.timeout = 123
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
#
|
|
cfg["protocol.http.ssl_config.ciphers"] = "!ALL"
|
|
begin
|
|
@client.hello_world("ssl client")
|
|
assert(false)
|
|
rescue OpenSSL::SSL::SSLError => ssle
|
|
assert_equal("no ciphers available", ssle.message)
|
|
end
|
|
#
|
|
cfg["protocol.http.ssl_config.ciphers"] = "ALL"
|
|
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
|
|
end
|
|
|
|
private
|
|
|
|
def q(str)
|
|
%Q["#{str}"]
|
|
end
|
|
|
|
def setup_server
|
|
svrcmd = "#{q(RUBY)} "
|
|
svrcmd << "-d " if $DEBUG
|
|
svrcmd << File.join(DIR, "sslsvr.rb")
|
|
svrout = IO.popen(svrcmd)
|
|
@serverpid = Integer(svrout.gets.chomp)
|
|
end
|
|
|
|
def setup_client
|
|
@client = SOAP::RPC::Driver.new(@url, 'urn:ssltst')
|
|
@client.add_method("hello_world", "from")
|
|
end
|
|
|
|
def teardown_server
|
|
if @serverpid
|
|
Process.kill('KILL', @serverpid)
|
|
Process.waitpid(@serverpid)
|
|
end
|
|
end
|
|
|
|
def teardown_client
|
|
@client.reset_stream if @client
|
|
end
|
|
|
|
def verify_callback(ok, cert)
|
|
@verify_callback_called = true
|
|
p ["client", ok, cert] if $DEBUG
|
|
ok
|
|
end
|
|
end
|
|
|
|
|
|
end; end
|
|
|
|
end
|