Index: lib/xmlrpc/server.rb
===================================================================
RCS file: /var/cvs/src/ruby/lib/xmlrpc/server.rb,v
retrieving revision 1.2.2.1
diff -u -p -F^[^A-Za-z0-9_+-]*\(class\|module\|def\)[^A-Za-z0-9_+-] -r1.2.2.1 server.rb
--- lib/xmlrpc/server.rb 13 Aug 2004 04:24:16 -0000 1.2.2.1
+++ lib/xmlrpc/server.rb 31 Oct 2005 09:16:02 -0000
@@ -145,7 +145,6 @@ the same class.
require "xmlrpc/parser"
require "xmlrpc/create"
require "xmlrpc/config"
-require "xmlrpc/httpserver"
require "xmlrpc/utils" # ParserWriterChooseMixin
@@ -607,7 +606,7 @@ Implements a standalone XML-RPC server.
program.
== Superclass
-((<XMLRPC::BasicServer>))
+((<XMLRPC::WEBrickServlet>))
== Class Methods
--- XMLRPC::Server.new( port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a )
@@ -615,8 +614,7 @@ program.
port ((|port|)) and accepts requests for the host ((|host|)), which is by default only the localhost.
The server is not started, to start it you have to call ((<serve|XMLRPC::Server#serve>)).
- The parameters ((|maxConnections|)), ((|stdlog|)), ((|audit|)) and ((|debug|)) are passed to the HTTP server and
- specify it's behaviour more precise.
+ Parameters ((|audit|)) and ((|debug|)) are obsolete!
All additionally given parameters in ((|*a|)) are by-passed to ((<XMLRPC::BasicServer.new>)).
@@ -628,23 +626,19 @@ program.
--- XMLRPC::Server#shutdown
Stops and shuts the server down.
-
---- XMLRPC::Server#set_valid_ip( *ip_addr )
- Specifies the valid IP addresses that are allowed to connect to the server.
- Each IP is either a (({String})) or a (({Regexp})).
-
---- XMLRPC::Server#get_valid_ip
- Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
- valid IP addresses.
=end
-class Server < BasicServer
+class WEBrickServlet < BasicServer; end # forward declaration
+
+class Server < WEBrickServlet
def initialize(port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a)
super(*a)
- @server = ::HttpServer.new(self, port, host, maxConnections, stdlog, audit, debug)
- @valid_ip = nil
+ require 'webrick'
+ @server = WEBrick::HTTPServer.new(:Port => port, :BindAddress => host, :MaxClients => maxConnections,
+ :Logger => WEBrick::Log.new(stdlog))
+ @server.mount("/", self)
end
def serve
@@ -655,87 +649,15 @@ def serve
end
trap(signal) { @server.shutdown }
- @server.start.join
+ @server.start
end
def shutdown
@server.shutdown
end
-
- def set_valid_ip(*ip_addr)
- if ip_addr.size == 1 and ip_addr[0].nil?
- @valid_ip = nil
- else
- @valid_ip = ip_addr
- end
- end
-
- def get_valid_ip
- @valid_ip
- end
-
- # methods that get called by HttpServer ------------------------------------------
-
- def request_handler(request, response)
- $stderr.puts "in request_handler" if $DEBUG
-
- if request.method != "POST"
- # Method not allowed
- response.status = 405
- return
- end
-
- if parse_content_type(request.header['Content-type']).first != "text/xml"
- # Bad request
- response.status = 400
- return
- end
-
- length = request.content_length || 0
-
- unless length > 0
- # Length required
- response.status = 411
- return
- end
-
- data = request.data.read(length)
-
- if data.nil? or data.size != length
- # Bad request
- response.status = 400
- return
- end
-
- resp = process(data)
- raise if resp.nil? or resp.size <= 0 # => Internal Server Error
-
- response.status = 200
- response.header['Content-Length'] = resp.size
- response.header['Content-Type'] = "text/xml"
- response.body = resp
-
- end
-
- ##
- # Is called before request_handler and should return true if
- # the client is allowed to connect to the server.
- # `io' is a Socket object.
- def ip_auth_handler(io)
- if @valid_ip
- client_ip = io.peeraddr[3]
- @valid_ip.each { |ip|
- return true if client_ip =~ ip
- }
- false
- else
- true
- end
- end
-
+
end
-
=begin
= XMLRPC::WEBrickServlet
== Synopsis
@@ -765,6 +687,17 @@ end
httpserver.mount("/RPC2", s)
trap("HUP") { httpserver.shutdown } # use 1 instead of "HUP" on Windows
httpserver.start
+
+== Instance Methods
+
+--- XMLRPC::WEBrickServlet#set_valid_ip( *ip_addr )
+ Specifies the valid IP addresses that are allowed to connect to the server.
+ Each IP is either a (({String})) or a (({Regexp})).
+
+--- XMLRPC::WEBrickServlet#get_valid_ip
+ Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
+ valid IP addresses.
+
== Description
Implements a servlet for use with WEBrick, a pure Ruby (HTTP-) server framework.
@@ -777,6 +710,7 @@ class WEBrickServlet < BasicServer
def initialize(*a)
super
require "webrick/httpstatus"
+ @valid_ip = nil
end
# deprecated from WEBrick/1.2.2.
@@ -790,29 +724,46 @@ def get_instance(config, *options)
self
end
+ def set_valid_ip(*ip_addr)
+ if ip_addr.size == 1 and ip_addr[0].nil?
+ @valid_ip = nil
+ else
+ @valid_ip = ip_addr
+ end
+ end
+
+ def get_valid_ip
+ @valid_ip
+ end
+
def service(request, response)
+
+ if @valid_ip
+ raise WEBrick::HTTPStatus::Forbidden unless @valid_ip.any? { |ip| request.peeraddr[3] =~ ip }
+ end
+
if request.request_method != "POST"
- raise HTTPStatus::MethodNotAllowed,
+ raise WEBrick::HTTPStatus::MethodNotAllowed,
"unsupported method `#{request.request_method}'."
end
if parse_content_type(request['Content-type']).first != "text/xml"
- raise HTTPStatus::BadRequest
+ raise WEBrick::HTTPStatus::BadRequest
end
length = (request['Content-length'] || 0).to_i
- raise HTTPStatus::LengthRequired unless length > 0
+ raise WEBrick::HTTPStatus::LengthRequired unless length > 0
data = request.body
if data.nil? or data.size != length
- raise HTTPStatus::BadRequest
+ raise WEBrick::HTTPStatus::BadRequest
end
resp = process(data)
if resp.nil? or resp.size <= 0
- raise HTTPStatus::InternalServerError
+ raise WEBrick::HTTPStatus::InternalServerError
end
response.status = 200
