From 810a605c34d97fa878cb5b615b9e95a2fee84ca8 Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 22 May 2005 13:03:38 +0000 Subject: * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4. == 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#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: http://svn.ruby-lang.org/repos/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- sample/soap/authheader/authmgr.rb | 41 ------------------- sample/soap/authheader/client.rb | 40 ------------------- sample/soap/authheader/client2.rb | 42 -------------------- sample/soap/authheader/server.rb | 73 ---------------------------------- sample/soap/authheader/server2.rb | 83 --------------------------------------- 5 files changed, 279 deletions(-) delete mode 100644 sample/soap/authheader/authmgr.rb delete mode 100644 sample/soap/authheader/client.rb delete mode 100644 sample/soap/authheader/client2.rb delete mode 100644 sample/soap/authheader/server.rb delete mode 100644 sample/soap/authheader/server2.rb (limited to 'sample/soap/authheader') diff --git a/sample/soap/authheader/authmgr.rb b/sample/soap/authheader/authmgr.rb deleted file mode 100644 index a4d3b66c0..000000000 --- a/sample/soap/authheader/authmgr.rb +++ /dev/null @@ -1,41 +0,0 @@ -class Authmgr - def initialize - @users = { - 'NaHi' => 'passwd', - 'HiNa' => 'wspass' - } - @sessions = {} - end - - def login(userid, passwd) - userid and passwd and @users[userid] == passwd - end - - # returns userid - def auth(sessionid) - @sessions[sessionid] - end - - def create_session(userid) - while true - key = create_sessionkey - break unless @sessions[key] - end - @sessions[key] = userid - key - end - - def get_session(userid) - @sessions.index(userid) - end - - def destroy_session(sessionkey) - @sessions.delete(sessionkey) - end - -private - - def create_sessionkey - Time.now.usec.to_s - end -end diff --git a/sample/soap/authheader/client.rb b/sample/soap/authheader/client.rb deleted file mode 100644 index 4055fe63f..000000000 --- a/sample/soap/authheader/client.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'soap/rpc/driver' -require 'soap/header/simplehandler' - -server = ARGV.shift || 'http://localhost:7000/' - -class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler - MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth") - - def initialize(userid, passwd) - super(MyHeaderName) - @sessionid = nil - @userid = userid - @passwd = passwd - @mustunderstand = true - end - - def on_simple_outbound - if @sessionid - { "sessionid" => @sessionid } - else - { "userid" => @userid, "passwd" => @passwd } - end - end - - def on_simple_inbound(my_header, mustunderstand) - @sessionid = my_header["sessionid"] - end -end - -ns = 'http://tempuri.org/authHeaderPort' -serv = SOAP::RPC::Driver.new(server, ns) -serv.add_method('deposit', 'amt') -serv.add_method('withdrawal', 'amt') - -serv.headerhandler << ClientAuthHeaderHandler.new('NaHi', 'passwd') - -serv.wiredump_dev = STDOUT - -p serv.deposit(150) -p serv.withdrawal(120) diff --git a/sample/soap/authheader/client2.rb b/sample/soap/authheader/client2.rb deleted file mode 100644 index aa5172a5b..000000000 --- a/sample/soap/authheader/client2.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'soap/rpc/driver' -require 'soap/header/simplehandler' - -server = ARGV.shift || 'http://localhost:7000/' - -class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler - MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth") - - attr_accessor :sessionid - - def initialize - super(MyHeaderName) - @sessionid = nil - end - - def on_simple_outbound - if @sessionid - { "sessionid" => @sessionid } - end - end - - def on_simple_inbound(my_header, mustunderstand) - @sessionid = my_header["sessionid"] - end -end - -ns = 'http://tempuri.org/authHeaderPort' -serv = SOAP::RPC::Driver.new(server, ns) -serv.add_method('login', 'userid', 'passwd') -serv.add_method('deposit', 'amt') -serv.add_method('withdrawal', 'amt') - -h = ClientAuthHeaderHandler.new - -serv.headerhandler << h - -serv.wiredump_dev = STDOUT - -sessionid = serv.login('NaHi', 'passwd') -h.sessionid = sessionid -p serv.deposit(150) -p serv.withdrawal(120) diff --git a/sample/soap/authheader/server.rb b/sample/soap/authheader/server.rb deleted file mode 100644 index 9c6adf280..000000000 --- a/sample/soap/authheader/server.rb +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env ruby - -require 'soap/rpc/standaloneServer' -require 'soap/header/simplehandler' -require 'authmgr' - -class AuthHeaderPortServer < SOAP::RPC::StandaloneServer - class AuthHeaderService - def self.create - new - end - - def deposit(amt) - "deposit #{amt} OK" - end - - def withdrawal(amt) - "withdrawal #{amt} OK" - end - end - - Name = 'http://tempuri.org/authHeaderPort' - def initialize(*arg) - super - add_rpc_servant(AuthHeaderService.new, Name) - # header handler must be a per request handler. - add_rpc_request_headerhandler(ServerAuthHeaderHandler) - end - - class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler - MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth") - - @authmgr = Authmgr.new - def self.create - new(@authmgr) - end - - def initialize(authmgr) - super(MyHeaderName) - @authmgr = authmgr - @userid = @sessionid = nil - end - - def on_simple_outbound - { "sessionid" => @sessionid } - end - - def on_simple_inbound(my_header, mu) - auth = false - userid = my_header["userid"] - passwd = my_header["passwd"] - if @authmgr.login(userid, passwd) - auth = true - elsif sessionid = my_header["sessionid"] - if userid = @authmgr.auth(sessionid) - @authmgr.destroy_session(sessionid) - auth = true - end - end - raise RuntimeError.new("authentication failed") unless auth - @userid = userid - @sessionid = @authmgr.create_session(userid) - end - end -end - -if $0 == __FILE__ - svr = AuthHeaderPortServer.new('AuthHeaderPortServer', nil, '0.0.0.0', 7000) - trap(:INT) do - svr.shutdown - end - status = svr.start -end diff --git a/sample/soap/authheader/server2.rb b/sample/soap/authheader/server2.rb deleted file mode 100644 index 8a0eaafc8..000000000 --- a/sample/soap/authheader/server2.rb +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env ruby - -require 'soap/rpc/standaloneServer' -require 'soap/header/simplehandler' -require 'authmgr' - -class AuthHeaderPortServer < SOAP::RPC::StandaloneServer - class AuthHeaderService - def initialize(authmgr) - @authmgr = authmgr - end - - def login(userid, passwd) - if @authmgr.login(userid, passwd) - @authmgr.create_session(userid) - else - raise RuntimeError.new("authentication failed") - end - end - - def deposit(amt) - "deposit #{amt} OK" - end - - def withdrawal(amt) - "withdrawal #{amt} OK" - end - end - - Name = 'http://tempuri.org/authHeaderPort' - def initialize(*arg) - super - authmgr = Authmgr.new - add_rpc_servant(AuthHeaderService.new(authmgr), Name) - ServerAuthHeaderHandler.init(authmgr) - # header handler must be a per request handler. - add_rpc_request_headerhandler(ServerAuthHeaderHandler) - end - - class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler - MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth") - - def self.init(authmgr) - @authmgr = authmgr - end - - def self.create - new(@authmgr) - end - - def initialize(authmgr) - super(MyHeaderName) - @authmgr = authmgr - @sessionid = nil - end - - def on_simple_outbound - if @sessionid - { "sessionid" => @sessionid } - end - end - - def on_simple_inbound(my_header, mu) - auth = false - if sessionid = my_header["sessionid"] - if userid = @authmgr.auth(sessionid) - @authmgr.destroy_session(sessionid) - @sessionid = @authmgr.create_session(userid) - auth = true - end - end - raise RuntimeError.new("authentication failed") unless auth - end - end -end - -if $0 == __FILE__ - svr = AuthHeaderPortServer.new('AuthHeaderPortServer', nil, '0.0.0.0', 7000) - trap(:INT) do - svr.shutdown - end - status = svr.start -end -- cgit