mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
df731e37a1
* lib/soap/header/* * lib/soap/rpc/httpserver.rb * lib/wsdl/soap/cgiStubCreator.rb * lib/wsdl/soap/classDefCreator.rb * lib/wsdl/soap/classDefCreatorSupport.rb * lib/wsdl/soap/clientSkeltonCreator.rb * lib/wsdl/soap/driverCreator.rb * lib/wsdl/soap/mappingRegistryCreator.rb * lib/wsdl/soap/methodDefCreator.rb * lib/wsdl/soap/servantSkeltonCreator.rb * lib/wsdl/soap/standaloneServerStubCreator.rb * lib/wsdl/xmlSchema/enumeration.rb * lib/wsdl/xmlSchema/simpleRestriction.rb * lib/wsdl/xmlSchema/simpleType.rb * lib/xsd/codegen/* * lib/xsd/codegen.rb * sample/soap/authheader/* * sample/soap/raa2.4/* * sample/soap/ssl/* * sample/soap/swa/* * sample/soap/whois.rb * sample/wsdl/raa2.4/* * test/soap/header/* * test/soap/ssl/* * test/soap/struct/* * test/soap/swa/* * test/soap/wsdlDriver/* * test/wsdl/multiplefault.wsdl * test/wsdl/simpletype/* * test/wsdl/test_multiplefault.rb * modified files: * lib/soap/baseData.rb * lib/soap/element.rb * lib/soap/generator.rb * lib/soap/netHttpClient.rb * lib/soap/parser.rb * lib/soap/property.rb * lib/soap/soap.rb * lib/soap/streamHandler.rb * lib/soap/wsdlDriver.rb * lib/soap/wsdlDriver.rb * lib/soap/encodingstyle/handler.rb * lib/soap/encodingstyle/literalHandler.rb * lib/soap/encodingstyle/soapHandler.rb * lib/soap/mapping/factory.rb * lib/soap/mapping/mapping.rb * lib/soap/mapping/registry.rb * lib/soap/mapping/rubytypeFactory.rb * lib/soap/mapping/wsdlRegistry.rb * lib/soap/rpc/cgistub.rb * lib/soap/rpc/driver.rb * lib/soap/rpc/proxy.rb * lib/soap/rpc/router.rb * lib/soap/rpc/soaplet.rb * lib/soap/rpc/standaloneServer.rb * lib/wsdl/data.rb * lib/wsdl/definitions.rb * lib/wsdl/operation.rb * lib/wsdl/parser.rb * lib/wsdl/soap/definitions.rb * lib/wsdl/xmlSchema/complexContent.rb * lib/wsdl/xmlSchema/complexType.rb * lib/wsdl/xmlSchema/data.rb * lib/wsdl/xmlSchema/parser.rb * lib/wsdl/xmlSchema/schema.rb * lib/xsd/datatypes.rb * lib/xsd/qname.rb * sample/soap/sampleStruct/server.rb * sample/wsdl/amazon/AmazonSearch.rb * sample/wsdl/amazon/AmazonSearchDriver.rb * test/soap/test_property.rb * test/soap/calc/test_calc_cgi.rb * test/wsdl/test_emptycomplextype.rb * summary * add SOAP Header mustUnderstand support. * add HTTP client SSL configuration and Cookies support (works completely with http-access2). * add header handler for handling sending/receiving SOAP Header. * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object Model. it caused error. * add WSDL simpleType support to restrict lexical value space. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
212 lines
6.3 KiB
Ruby
212 lines
6.3 KiB
Ruby
require 'test/unit'
|
|
begin
|
|
require 'http-access2'
|
|
rescue LoadError
|
|
end
|
|
require 'soap/rpc/driver'
|
|
|
|
if defined?(HTTPAccess2)
|
|
|
|
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 streamhandler
|
|
@client.instance_eval("@servant").instance_eval("@streamhandler").client
|
|
end
|
|
|
|
def test_options
|
|
cfg = streamhandler.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
|
|
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
|
|
#
|
|
@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)
|
|
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
|
|
Process.kill('INT', @serverpid)
|
|
end
|
|
|
|
def teardown_client
|
|
@client.reset_stream
|
|
end
|
|
|
|
def verify_callback(ok, cert)
|
|
@verify_callback_called = true
|
|
p ["client", ok, cert] if $DEBUG
|
|
ok
|
|
end
|
|
end
|
|
|
|
|
|
end; end
|
|
|
|
end
|