Adding the event-loop stuff to the repository and switching to using it. Also, breaking many classes out into their own class files.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@848 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 141 insertions, 0 deletions

diff --git a/lib/puppet/networkclient.rb b/lib/puppet/networkclient.rb
new file mode 100644
index 000000000..31bc9a9dd
--- /dev/null
+++ b/lib/puppet/networkclient.rb
@@ -0,0 +1,141 @@
+require 'puppet'
+require 'puppet/sslcertificates'
+require 'puppet/type'
+require 'facter'
+require 'openssl'
+require 'puppet/transaction'
+require 'puppet/transportable'
+require 'puppet/metric'
+require 'puppet/daemon'
+require 'puppet/server'
+require 'puppet/base64'
+
+$noclientnetworking = false
+begin
+    require 'webrick'
+    require 'cgi'
+    require 'xmlrpc/client'
+    require 'xmlrpc/server'
+    require 'yaml'
+rescue LoadError => detail
+    $noclientnetworking = detail
+    raise Puppet::Error, "You must have the Ruby XMLRPC, CGI, and Webrick libraries installed"
+end
+
+module Puppet
+    class NetworkClientError < RuntimeError; end
+    class ClientError < RuntimeError; end
+    #---------------------------------------------------------------
+    if $noclientnetworking
+        Puppet.err "Could not load client network libs: %s" % $noclientnetworking
+    else
+        class NetworkClient < XMLRPC::Client
+            #include Puppet::Daemon
+
+            # add the methods associated with each namespace
+            Puppet::Server::Handler.each { |handler|
+                interface = handler.interface
+                namespace = interface.prefix
+
+                interface.methods.each { |ary|
+                    method = ary[0]
+                    Puppet.info "Defining %s.%s" % [namespace, method]
+                    self.send(:define_method,method) { |*args|
+                        #Puppet.info "Calling %s" % method
+                        #Puppet.info "peer cert is %s" % @http.peer_cert
+                        #Puppet.info "cert is %s" % @http.cert
+                        begin
+                            call("%s.%s" % [namespace, method.to_s],*args)
+                        rescue OpenSSL::SSL::SSLError => detail
+                            #Puppet.err "Could not call %s.%s: Untrusted certificates" %
+                            #    [namespace, method]
+                            raise NetworkClientError,
+                                "Certificates were not trusted"
+                        rescue XMLRPC::FaultException => detail
+                            #Puppet.err "Could not call %s.%s: %s" %
+                            #    [namespace, method, detail.faultString]
+                            #raise NetworkClientError,
+                            #    "XMLRPC Error: %s" % detail.faultString
+                            raise NetworkClientError, detail.faultString
+                        rescue Errno::ECONNREFUSED => detail
+                            msg = "Could not connect to %s on port %s" % [@host, @port]
+                            #Puppet.err msg
+                            raise NetworkClientError, msg
+                        rescue SocketError => detail
+                            Puppet.err "Could not find server %s" % @puppetserver
+                            exit(12)
+                        rescue => detail
+                            Puppet.err "Could not call %s.%s: %s" %
+                                [namespace, method, detail.inspect]
+                            #raise NetworkClientError.new(detail.to_s)
+                            raise
+                        end
+                    }
+                }
+            }
+
+            def ca_file=(cafile)
+                @http.ca_file = cafile
+                store = OpenSSL::X509::Store.new
+                cacert = OpenSSL::X509::Certificate.new(
+                    File.read(cafile)
+                )
+                store.add_cert(cacert) 
+                store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+                @http.cert_store = store
+            end
+
+            def cert=(cert)
+                #Puppet.debug "Adding certificate"
+                @http.cert = cert
+                @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            end
+
+            def key=(key)
+                @http.key = key
+            end
+
+            def initialize(hash)
+                hash[:Path] ||= "/RPC2"
+                hash[:Server] ||= "localhost"
+                hash[:Port] ||= Puppet[:masterport]
+
+                @puppetserver = hash[:Server]
+
+                super(
+                    hash[:Server],
+                    hash[:Path],
+                    hash[:Port],
+                    nil, # proxy_host
+                    nil, # proxy_port
+                    nil, # user
+                    nil, # password
+                    true # use_ssl
+                )
+
+                if hash[:Certificate]
+                    self.cert = hash[:Certificate]
+                else
+                    Puppet.err "No certificate; running with reduced functionality."
+                end
+
+                if hash[:Key]
+                    self.key = hash[:Key]
+                end
+
+                if hash[:CAFile]
+                    self.ca_file = hash[:CAFile]
+                end
+
+                # from here, i need to add the key, cert, and ca cert
+                # and reorgize how i start the client
+            end
+
+            def local
+                false
+            end
+        end
+    end
+end
+
+# $Id$