puppet 0.23.2 → 0.24.0

data/lib/puppet/network/http/handler.rb

@@ -0,0 +1,109 @@
+class Puppet::Network::HTTP::Handler
+    def initialize(args = {})
+        raise ArgumentError unless @server = args[:server]
+        raise ArgumentError unless @handler = args[:handler]
+        @model = find_model_for_handler(@handler)
+        register_handler
+    end
+    
+    # handle an HTTP request
+    def process(request, response)
+        return do_find(request, response)       if get?(request)    and singular?(request)
+        return do_search(request, response)     if get?(request)    and plural?(request)
+        return do_destroy(request, response)    if delete?(request) and singular?(request)
+        return do_save(request, response)       if put?(request) and singular?(request)
+        raise ArgumentError, "Did not understand HTTP #{http_method(request)} request for '#{path(request)}'"
+    rescue Exception => e
+        return do_exception(request, response, e)
+    end
+    
+  private
+    
+    def do_find(request, response)
+        key = request_key(request) || raise(ArgumentError, "Could not locate lookup key in request path [#{path}]")
+        args = params(request)
+        result = @model.find(key, args).to_yaml
+        encode_result(request, response, result)
+    end
+
+    def do_search(request, response)
+        args = params(request)
+        result = @model.search(args).collect {|obj| obj.to_yaml }
+        encode_result(request, response, result) 
+    end
+
+    def do_destroy(request, response)
+        key = request_key(request) || raise(ArgumentError, "Could not locate lookup key in request path [#{path}]")
+        args = params(request)
+        result = @model.destroy(key, args)
+        encode_result(request, response, YAML.dump(result))
+    end
+
+    def do_save(request, response)
+        data = body(request)
+        raise ArgumentError, "No data to save" if !data or data.empty?
+        args = params(request)
+        obj = @model.new
+        result = obj.save(args.merge(:data => data)).to_yaml
+        encode_result(request, response, result)
+    end
+  
+    def do_exception(request, response, exception, status=404)
+        encode_result(request, response, exception.to_s, status)
+    end
+  
+    def find_model_for_handler(handler)
+        Puppet::Indirector::Indirection.model(handler) || 
+            raise(ArgumentError, "Cannot locate indirection [#{handler}].")
+    end
+    
+    def get?(request)
+        http_method(request) == 'GET'
+    end
+    
+    def put?(request)
+        http_method(request) == 'PUT'
+    end
+    
+    def delete?(request)
+        http_method(request) == 'DELETE'
+    end
+    
+    def singular?(request)
+        %r{/#{@handler.to_s}$}.match(path(request))
+    end
+    
+    def plural?(request)
+        %r{/#{@handler.to_s}s$}.match(path(request))
+    end
+    
+  # methods specific to a given web server
+    
+    def register_handler
+        raise NotImplementedError
+    end
+    
+    def http_method(request)
+        raise NotImplementedError
+    end
+    
+    def path(request)
+        raise NotImplementedError
+    end    
+    
+    def request_key(request)
+        raise NotImplementedError
+    end
+    
+    def body(request)
+        raise NotImplementedError
+    end
+    
+    def params(request)
+        raise NotImplementedError
+    end
+    
+    def encode_result(request, response, result, status = 200)
+        raise NotImplementedError
+    end
+end

data/lib/puppet/network/http/mongrel.rb

@@ -0,0 +1,54 @@
+require 'mongrel' if Puppet.features.mongrel?
+
+require 'puppet/network/http/mongrel/rest'
+require 'puppet/network/http/mongrel/xmlrpc'
+
+class Puppet::Network::HTTP::Mongrel
+    def initialize(args = {})
+        @listening = false
+    end
+    
+    def listen(args = {})
+        raise ArgumentError, ":handlers must be specified." if !args[:handlers] or args[:handlers].empty?
+        raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty?
+        raise ArgumentError, ":address must be specified." unless args[:address]
+        raise ArgumentError, ":port must be specified." unless args[:port]
+        raise "Mongrel server is already listening" if listening?
+        
+        @protocols = args[:protocols]
+        @handlers = args[:handlers]
+        @server = Mongrel::HttpServer.new(args[:address], args[:port])
+
+        setup_handlers
+
+        @server.run
+        @listening = true
+    end
+    
+    def unlisten
+        raise "Mongrel server is not listening" unless listening?
+        @server.graceful_shutdown
+        @listening = false
+    end
+    
+    def listening?
+        @listening
+    end
+    
+  private
+  
+    def setup_handlers
+        @protocols.each do |protocol|
+            @handlers.each do |handler|
+                class_for_protocol(protocol).new(:server => @server, :handler => handler)
+            end
+        end
+    end
+  
+    # TODO/FIXME: need a spec which forces delegation to the real class
+    def class_for_protocol(protocol)
+        return Puppet::Network::HTTP::MongrelREST if protocol.to_sym == :rest
+        return Puppet::Network::HTTP::MongrelXMLRPC if protocol.to_sym == :xmlrpc
+        raise ArgumentError, "Unknown protocol [#{protocol}]."
+    end
+end

data/lib/puppet/network/http/mongrel/rest.rb

@@ -0,0 +1,37 @@
+require 'puppet/network/http/handler'
+
+class Puppet::Network::HTTP::MongrelREST < Puppet::Network::HTTP::Handler
+
+  private
+    
+    def register_handler
+        @server.register('/' + @handler.to_s, self)
+        @server.register('/' + @handler.to_s + 's', self)
+    end
+    
+    def http_method(request)
+        request.params[Mongrel::Const::REQUEST_METHOD]
+    end
+    
+    def path(request)
+        '/' + request.params[Mongrel::Const::REQUEST_PATH].split('/')[1]
+    end
+    
+    def request_key(request)
+        request.params[Mongrel::Const::REQUEST_PATH].split('/')[2]        
+    end
+    
+    def body(request)
+        request.body
+    end
+    
+    def params(request)
+        Mongrel::HttpRequest.query_parse(request.params["QUERY_STRING"])
+    end
+    
+    def encode_result(request, response, result, status = 200)
+        response.start(status) do |head, body|
+            body.write(result)
+        end
+    end
+end

data/lib/puppet/network/http/mongrel/xmlrpc.rb

@@ -0,0 +1,4 @@
+class Puppet::Network::HTTP::MongrelXMLRPC
+    def initialize(args = {})
+    end
+end

data/lib/puppet/network/http/webrick.rb

@@ -0,0 +1,51 @@
+require 'webrick'
+require 'webrick/https'
+require 'puppet/network/http/webrick/rest'
+require 'puppet/network/http/webrick/xmlrpc'
+
+class Puppet::Network::HTTP::WEBrick
+    def initialize(args = {})
+        @listening = false
+    end
+    
+    def listen(args = {})
+        raise ArgumentError, ":handlers must be specified." if !args[:handlers] or args[:handlers].empty?
+        raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty?
+        raise ArgumentError, ":address must be specified." unless args[:address]
+        raise ArgumentError, ":port must be specified." unless args[:port]
+        raise "WEBrick server is already listening" if listening?
+        
+        @protocols = args[:protocols]
+        @handlers = args[:handlers]        
+        @server = WEBrick::HTTPServer.new(:BindAddress => args[:address], :Port => args[:port])
+        setup_handlers
+        @server.start
+        @listening = true
+    end
+    
+    def unlisten
+        raise "WEBrick server is not listening" unless listening?
+        @server.shutdown
+        @listening = false
+    end
+    
+    def listening?
+        @listening
+    end
+    
+  private
+    
+    def setup_handlers
+        @protocols.each do |protocol|
+            @handlers.each do |handler|
+                class_for_protocol(protocol).new(:server => @server, :handler => handler)
+            end
+        end
+    end
+    
+    def class_for_protocol(protocol)
+        return Puppet::Network::HTTP::WEBrickREST if protocol.to_sym == :rest
+        return Puppet::Network::HTTP::WEBrickXMLRPC if protocol.to_sym == :xmlrpc
+        raise ArgumentError, "Unknown protocol [#{protocol}]."
+    end
+end

data/lib/puppet/network/http/webrick/rest.rb

@@ -0,0 +1,41 @@
+require 'puppet/network/http/handler'
+
+class Puppet::Network::HTTP::WEBrickREST < Puppet::Network::HTTP::Handler
+
+    # WEBrick uses a service() method to respond to requests.  Simply delegate to the handler response() method.
+    def service(request, response)
+        process(request, response)
+    end
+
+  private
+    
+    def register_handler
+        @server.mount('/' + @handler.to_s, self)
+        @server.mount('/' + @handler.to_s + 's', self)
+    end
+
+    def http_method(request)
+        request.request_method
+    end
+    
+    def path(request)
+        '/' + request.path.split('/')[1]
+    end
+    
+    def request_key(request)
+        request.path.split('/')[2]
+    end
+    
+    def body(request)
+        request.body
+    end
+    
+    def params(request)
+        request.query
+    end
+    
+    def encode_result(request, response, result, status = 200)
+        response.status = status
+        response.body = result
+    end
+end

data/lib/puppet/network/http/webrick/xmlrpc.rb

@@ -0,0 +1,4 @@
+class Puppet::Network::HTTP::WEBrickXMLRPC
+    def initialize(args = {})
+    end
+end

data/lib/puppet/network/http_server.rb

@@ -0,0 +1,3 @@
+# Just a stub, so we can correctly scope other classes.
+module Puppet::Network::HTTPServer # :nodoc:
+end

data/lib/puppet/network/{server → http_server}/mongrel.rb

@@ -31,7 +31,7 @@ require 'rubygems'
 require 'mongrel'
 require 'xmlrpc/server'
 require 'puppet/network/xmlrpc/server'
-require 'puppet/network/server'
+require 'puppet/network/http_server'
 require 'puppet/network/client_request'
 require 'puppet/daemon'
 
@@ -49,11 +49,15 @@ require 'resolv'
 # handler.xmlrpc_server.add_handler("my.add") { |a, b| a.to_i + b.to_i }
 # </pre>
 module Puppet::Network
-    class Server::Mongrel < ::Mongrel::HttpHandler
+    class HTTPServer::Mongrel < ::Mongrel::HttpHandler
         include Puppet::Daemon
         attr_reader :xmlrpc_server
 
         def initialize(handlers)
+            if Puppet[:debug]
+                $mongrel_debug_client = true
+                Puppet.debug 'Mongrel client debugging enabled. [$mongrel_debug_client = true].'
+            end
             # Create a new instance of BasicServer. We are supposed to subclass it
             # but that does not make sense since we would not introduce any new
             # behaviour and we have to subclass Mongrel::HttpHandler so our handler
@@ -116,8 +120,11 @@ module Puppet::Network
         def client_info(request)
             params = request.params
             ip = params["REMOTE_ADDR"]
-            if dn = params[Puppet[:ssl_client_header]] and dn.include?("/CN=")
-                client = dn.sub("/CN=", '')
+            # JJM #906 The following dn.match regular expression is forgiving
+            # enough to match the two Distinguished Name string contents
+            # coming from Apache, Pound or other reverse SSL proxies.
+            if dn = params[Puppet[:ssl_client_header]] and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
+                client = dn_matchdata[1].to_str
                 valid = (params[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
             else
                 client = Resolv.getname(ip)
@@ -137,4 +144,3 @@ module Puppet::Network
     end
 end
 
-# $Id: mongrel.rb 2752 2007-08-06 20:05:28Z luke $

data/lib/puppet/network/{server → http_server}/webrick.rb

@@ -6,7 +6,7 @@ require 'fcntl'
 
 require 'puppet/sslcertificates/support'
 require 'puppet/network/xmlrpc/webrick_servlet'
-require 'puppet/network/server'
+require 'puppet/network/http_server'
 require 'puppet/network/client'
 
 module Puppet
@@ -14,7 +14,7 @@ module Puppet
     module Network
         # The old-school, pure ruby webrick server, which is the default serving
         # mechanism.
-        class Server::WEBrick < WEBrick::HTTPServer
+        class HTTPServer::WEBrick < WEBrick::HTTPServer
             include Puppet::Daemon
             include Puppet::SSLCertificates::Support
 
@@ -48,7 +48,7 @@ module Puppet
 
                 # yuck; separate http logs
                 file = nil
-                Puppet.config.use(:main, :ssl, Puppet[:name])
+                Puppet.settings.use(:main, :ssl, Puppet[:name])
                 if Puppet[:name] == "puppetmasterd"
                     file = Puppet[:masterhttplog]
                 else
@@ -91,7 +91,12 @@ module Puppet
 
                 setup_webrick(hash)
 
-                super(hash)
+                begin
+                    super(hash)
+                rescue => detail
+                    puts detail.backtrace if Puppet[:trace]
+                    raise Puppet::Error, "Could not start WEBrick: %s" % detail
+                end
 
                 # make sure children don't inherit the sockets
                 listeners.each { |sock|
@@ -161,4 +166,3 @@ module Puppet
     end
 end
 
-# $Id: webrick.rb 2553 2007-06-05 18:12:42Z luke $

data/lib/puppet/network/rest_controller.rb

@@ -0,0 +1,2 @@
+class Puppet::Network::RESTController # :nodoc:
+end

data/lib/puppet/network/rights.rb

@@ -71,4 +71,3 @@ class Puppet::Network::Rights < Hash
     end
 end
 
-# $Id: rights.rb 2180 2007-02-08 02:22:57Z luke $

data/lib/puppet/network/server.rb

@@ -1,5 +1,65 @@
-# Just a stub, so we can correctly scope other classes.
-module Puppet::Network::Server # :nodoc:
+class Puppet::Network::Server
+	attr_reader :server_type, :protocols, :address, :port
+
+    def initialize(args = {})
+        @server_type = Puppet[:servertype] or raise "No servertype configuration found."  # e.g.,  WEBrick, Mongrel, etc.
+        http_server_class || raise(ArgumentError, "Could not determine HTTP Server class for server type [#{@server_type}]")
+        @address = args[:address] || Puppet[:bindaddress] || 
+            raise(ArgumentError, "Must specify :address or configure Puppet :bindaddress.")
+        @port = args[:port] || Puppet[:masterport] ||
+            raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
+	    @protocols = []
+	    @listening = false
+	    @routes = {}
+	    self.register(args[:handlers]) if args[:handlers]
+    end
+
+    def register(*indirections)
+	    raise ArgumentError, "Indirection names are required." if indirections.empty?
+	    indirections.flatten.each { |i| @routes[i.to_sym] = true }
+    end
+  
+    def unregister(*indirections)
+        raise "Cannot unregister indirections while server is listening." if listening?
+	    indirections = @routes.keys if indirections.empty?
+	    
+	    indirections.flatten.each do |i|
+	        raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
+        end
+        
+        indirections.flatten.each do |i|
+	        @routes.delete(i.to_sym)
+	    end
+    end
+
+    def listening?
+	    @listening
+    end
+  
+    def listen
+	    raise "Cannot listen -- already listening." if listening?
+	    http_server.listen(@routes.dup)
+	    @listening = true
+    end
+  
+    def unlisten
+	    raise "Cannot unlisten -- not currently listening." unless listening?
+	    http_server.unlisten   
+	    @listening = false
+    end
+    
+    def http_server_class
+        http_server_class_by_type(@server_type)
+    end
+
+  private
+  
+    def http_server
+        @http_server ||= http_server_class.new
+    end
+    
+    def http_server_class_by_type(kind)
+        Puppet::Network::HTTP.server_class_by_type(kind)
+    end
 end
 
-# $Id: server.rb 2259 2007-03-06 19:03:05Z luke $