puppet 2.7.5 → 2.7.6

data/test/lib/puppettest/exetest.rb

@@ -50,7 +50,7 @@ module PuppetTest::ExeTest
     args += " --confdir #{Puppet[:confdir]}"
     args += " --rundir #{File.join(Puppet[:vardir], "run")}"
     args += " --vardir #{Puppet[:vardir]}"
-    args += " --certdnsnames #{Puppet[:certdnsnames]}"
+    args += " --dns_alt_names #{Puppet[:master_dns_alt_names]}"
     args += " --masterport #{@@port}"
     args += " --user #{Puppet::Util::SUIDManager.uid}"
     args += " --group #{Puppet::Util::SUIDManager.gid}"

data/test/lib/puppettest/servertest.rb

@@ -1,5 +1,4 @@
 require 'puppettest'
-require 'puppet/network/http_server/webrick'
 
 module PuppetTest::ServerTest
   include PuppetTest

data/test/rails/rails.rb

@@ -5,7 +5,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/parser'
-require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'

data/test/ral/type/filesources.rb

@@ -226,66 +226,6 @@ class TestFileSources < Test::Unit::TestCase
     file
   end
 
-  def test_unmountedNetworkSources
-    server = nil
-    mounts = {
-      "/" => "root",
-      "/noexistokay" => "noexist"
-    }
-
-    fileserverconf = mkfileserverconf(mounts)
-
-    Puppet[:autosign] = true
-    Puppet[:masterport] = @port
-    Puppet[:certdnsnames] = "localhost"
-
-    serverpid = nil
-    assert_nothing_raised("Could not start on port #{@port}") {
-
-            server = Puppet::Network::HTTPServer::WEBrick.new(
-                
-        :Port => @port,
-        
-        :Handlers => {
-          :CA => {}, # so that certs autogenerate
-          :FileServer => {
-            :Config => fileserverconf
-          }
-        }
-      )
-
-    }
-
-    serverpid = fork {
-      assert_nothing_raised {
-        #trap(:INT) { server.shutdown; Kernel.exit! }
-        trap(:INT) { server.shutdown }
-        server.start
-      }
-    }
-    @@tmppids << serverpid
-
-    sleep(1)
-
-    name = File.join(tmpdir, "nosourcefile")
-
-          file = Puppet::Type.type(:file).new(
-                
-      :source => "puppet://localhost/noexist/file",
-        
-      :name => name
-    )
-
-    assert_raise Puppet::Error do
-      file.retrieve
-    end
-
-    comp = mk_catalog(file)
-    comp.apply
-
-    assert(!FileTest.exists?(name), "File with no source exists anyway")
-  end
-
   def test_sourcepaths
     files = []
     3.times {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 7
-  - 5
-  version: 2.7.5
+  - 6
+  version: 2.7.6
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2011-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
@@ -278,13 +278,6 @@ files:
 - lib/puppet/network/authconfig.rb
 - lib/puppet/network/authorization.rb
 - lib/puppet/network/authstore.rb
-- lib/puppet/network/client/ca.rb
-- lib/puppet/network/client/file.rb
-- lib/puppet/network/client/proxy.rb
-- lib/puppet/network/client/report.rb
-- lib/puppet/network/client/runner.rb
-- lib/puppet/network/client/status.rb
-- lib/puppet/network/client.rb
 - lib/puppet/network/client_request.rb
 - lib/puppet/network/format.rb
 - lib/puppet/network/format_handler.rb
@@ -311,15 +304,11 @@ files:
 - lib/puppet/network/http/webrick.rb
 - lib/puppet/network/http.rb
 - lib/puppet/network/http_pool.rb
-- lib/puppet/network/http_server/mongrel.rb
-- lib/puppet/network/http_server/webrick.rb
-- lib/puppet/network/http_server.rb
 - lib/puppet/network/rest_authconfig.rb
 - lib/puppet/network/rest_authorization.rb
 - lib/puppet/network/rest_controller.rb
 - lib/puppet/network/rights.rb
 - lib/puppet/network/server.rb
-- lib/puppet/network/xmlrpc/client.rb
 - lib/puppet/network/xmlrpc/processor.rb
 - lib/puppet/network/xmlrpc/server.rb
 - lib/puppet/network/xmlrpc/webrick_servlet.rb
@@ -428,7 +417,7 @@ files:
 - lib/puppet/provider/exec/windows.rb
 - lib/puppet/provider/exec.rb
 - lib/puppet/provider/file/posix.rb
-- lib/puppet/provider/file/win32.rb
+- lib/puppet/provider/file/windows.rb
 - lib/puppet/provider/group/aix.rb
 - lib/puppet/provider/group/directoryservice.rb
 - lib/puppet/provider/group/groupadd.rb
@@ -571,11 +560,6 @@ files:
 - lib/puppet/ssl/inventory.rb
 - lib/puppet/ssl/key.rb
 - lib/puppet/ssl.rb
-- lib/puppet/sslcertificates/ca.rb
-- lib/puppet/sslcertificates/certificate.rb
-- lib/puppet/sslcertificates/inventory.rb
-- lib/puppet/sslcertificates/support.rb
-- lib/puppet/sslcertificates.rb
 - lib/puppet/status.rb
 - lib/puppet/transaction/event.rb
 - lib/puppet/transaction/event_manager.rb
@@ -725,6 +709,9 @@ files:
 - lib/puppet/util/tagging.rb
 - lib/puppet/util/user_attr.rb
 - lib/puppet/util/warnings.rb
+- lib/puppet/util/windows/error.rb
+- lib/puppet/util/windows/security.rb
+- lib/puppet/util/windows.rb
 - lib/puppet/util/zaml.rb
 - lib/puppet/util.rb
 - lib/puppet.rb
@@ -886,9 +873,6 @@ files:
 - tasks/rake/sign.rake
 - tasks/rake/testbranch.rake
 - tasks/rake/yard.rake
-- test/certmgr/certmgr.rb
-- test/certmgr/inventory.rb
-- test/certmgr/support.rb
 - test/data/failers/badclassnoparam
 - test/data/failers/badclassparam
 - test/data/failers/badcompnoparam
@@ -1007,18 +991,12 @@ files:
 - test/network/authconfig.rb
 - test/network/authorization.rb
 - test/network/authstore.rb
-- test/network/client/ca.rb
-- test/network/client/dipper.rb
 - test/network/client_request.rb
-- test/network/handler/ca.rb
 - test/network/handler/fileserver.rb
 - test/network/handler/master.rb
 - test/network/handler/report.rb
 - test/network/handler/runner.rb
 - test/network/rights.rb
-- test/network/server/mongrel_test.rb
-- test/network/server/webrick.rb
-- test/network/xmlrpc/client.rb
 - test/network/xmlrpc/processor.rb
 - test/network/xmlrpc/server.rb
 - test/network/xmlrpc/webrick_servlet.rb
@@ -1167,7 +1145,6 @@ files:
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
 - spec/integration/indirector/node/ldap_spec.rb
-- spec/integration/network/client_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/handler_spec.rb
 - spec/integration/network/rest_authconfig_spec.rb
@@ -1206,6 +1183,7 @@ files:
 - spec/integration/util/file_locking_spec.rb
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
+- spec/integration/util/windows/security_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/puppet/face/1.0.0/huzzah.rb
@@ -1380,6 +1358,7 @@ files:
 - spec/unit/network/format_handler_spec.rb
 - spec/unit/network/format_spec.rb
 - spec/unit/network/formats_spec.rb
+- spec/unit/network/handler/ca_spec.rb
 - spec/unit/network/handler/fileserver_spec.rb
 - spec/unit/network/http/api/v1_spec.rb
 - spec/unit/network/http/compression_spec.rb
@@ -1398,7 +1377,6 @@ files:
 - spec/unit/network/rest_authconfig_spec.rb
 - spec/unit/network/rights_spec.rb
 - spec/unit/network/server_spec.rb
-- spec/unit/network/xmlrpc/client_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/node_spec.rb
@@ -1481,6 +1459,8 @@ files:
 - spec/unit/provider/exec/posix_spec.rb
 - spec/unit/provider/exec/shell_spec.rb
 - spec/unit/provider/exec/windows_spec.rb
+- spec/unit/provider/file/posix_spec.rb
+- spec/unit/provider/file/windows_spec.rb
 - spec/unit/provider/group/groupadd_spec.rb
 - spec/unit/provider/group/ldap_spec.rb
 - spec/unit/provider/group/windows_adsi_spec.rb
@@ -1570,7 +1550,6 @@ files:
 - spec/unit/ssl/host_spec.rb
 - spec/unit/ssl/inventory_spec.rb
 - spec/unit/ssl/key_spec.rb
-- spec/unit/sslcertificates/ca_spec.rb
 - spec/unit/status_spec.rb
 - spec/unit/transaction/event_manager_spec.rb
 - spec/unit/transaction/event_spec.rb
@@ -1588,6 +1567,7 @@ files:
 - spec/unit/type/file/ctime.rb
 - spec/unit/type/file/ensure_spec.rb
 - spec/unit/type/file/group_spec.rb
+- spec/unit/type/file/mode_spec.rb
 - spec/unit/type/file/mtime.rb
 - spec/unit/type/file/owner_spec.rb
 - spec/unit/type/file/selinux_spec.rb

data/lib/puppet/network/client.rb

@@ -1,174 +0,0 @@
-# the available clients
-
-require 'puppet'
-require 'puppet/network/xmlrpc/client'
-require 'puppet/util/subclass_loader'
-require 'puppet/util/methodhelper'
-require 'puppet/sslcertificates/support'
-
-require 'puppet/network/handler'
-
-require 'net/http'
-
-# Some versions of ruby don't have this method defined, which basically causes
-# us to never use ssl.  Yay.
-class Net::HTTP
-  def use_ssl?
-    if defined?(@use_ssl)
-      @use_ssl
-    else
-      false
-    end
-  end
-
-  # JJM: This is a "backport" of sorts to older ruby versions which
-  # do not have this accessor.  See #896 for more information.
-  attr_accessor :enable_post_connection_check unless Net::HTTP.method_defined? "enable_post_connection_check"
-end
-
-# The base class for all of the clients.  Many clients just directly
-# call methods, but some of them need to do some extra work or
-# provide a different interface.
-class Puppet::Network::Client
-  Client = self
-  include Puppet::Util
-  extend Puppet::Util::SubclassLoader
-  include Puppet::Util::MethodHelper
-
-  # This handles reading in the key and such-like.
-  include Puppet::SSLCertificates::Support
-
-  attr_accessor :schedule, :lastrun, :local, :stopping
-
-  attr_reader :driver
-
-  # Set up subclass loading
-  handle_subclasses :client, "puppet/network/client"
-
-  # Determine what clients look for when being passed an object for local
-  # client/server stuff.  E.g., you could call Client::CA.new(:CA => ca).
-  def self.drivername
-    @drivername ||= self.name
-  end
-
-  # Figure out the handler for our client.
-  def self.handler
-    @handler ||= Puppet::Network::Handler.handler(self.name)
-  end
-
-  # The class that handles xmlrpc interaction for us.
-  def self.xmlrpc_client
-    @xmlrpc_client ||= Puppet::Network::XMLRPCClient.handler_class(self.handler)
-  end
-
-  # Create our client.
-  def initialize(hash)
-    # to whom do we connect?
-    @server = nil
-
-    if hash.include?(:Cache)
-      @cache = hash[:Cache]
-    else
-      @cache = true
-    end
-
-    driverparam = self.class.drivername
-    if hash.include?(:Server)
-      args = {:Server => hash[:Server]}
-      @server = hash[:Server]
-      args[:Port] = hash[:Port] || Puppet[:masterport]
-
-      @driver = self.class.xmlrpc_client.new(args)
-
-      self.read_cert
-
-      @local = false
-    elsif hash.include?(driverparam)
-      @driver = hash[driverparam]
-      if @driver == true
-        @driver = self.class.handler.new
-      end
-      @local = true
-    else
-      raise Puppet::Network::ClientError, "#{self.class} must be passed a Server or #{driverparam}"
-    end
-  end
-
-  # Are we a local client?
-  def local?
-    if @local
-      true
-    else
-      false
-    end
-  end
-
-  # Make sure we set the driver up when we read the cert in.
-  def recycle_connection
-    @driver.recycle_connection if @driver.respond_to?(:recycle_connection)
-  end
-
-  # A wrapper method to run and then store the last run time
-  def runnow
-    if self.stopping
-      Puppet.notice "In shutdown progress; skipping run"
-      return
-    end
-    begin
-      self.run
-      self.lastrun = Time.now.to_i
-    rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      Puppet.err "Could not run #{self.class}: #{detail}"
-    end
-  end
-
-  def run
-    raise Puppet::DevError, "Client type #{self.class} did not override run"
-  end
-
-  def scheduled?
-    if sched = self.schedule
-      return sched.match?(self.lastrun)
-    else
-      return true
-    end
-  end
-
-  def shutdown
-    if self.stopping
-      Puppet.notice "Already in shutdown"
-    else
-      self.stopping = true
-      Puppet::Util::Storage.store if self.respond_to? :running? and self.running?
-      rmpidfile
-    end
-  end
-
-  # Start listening for events.  We're pretty much just listening for
-  # timer events here.
-  def start
-    # Create our timer.  Puppet will handle observing it and such.
-
-          timer = Puppet.newtimer(
-                
-      :interval => Puppet[:runinterval],
-      :tolerance => 1,
-        
-      :start? => true
-    ) do
-      begin
-        self.runnow if self.scheduled?
-      rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        Puppet.err "Could not run client; got otherwise uncaught exception: #{detail}"
-      end
-    end
-
-    # Run once before we start following the timer
-    self.runnow
-  end
-
-  require 'puppet/network/client/proxy'
-end
-

data/lib/puppet/network/client/ca.rb

@@ -1,56 +0,0 @@
-require 'puppet/network/client'
-
-# Request a certificate from the remote system.
-class Puppet::Network::Client::CA < Puppet::Network::Client
-  class InvalidCertificate < Puppet::Error; end
-
-  def initialize(options = {})
-    options = symbolize_options(options)
-    unless options.include?(:Server) or options.include?(:CA)
-      options[:Server] = Puppet[:ca_server]
-      options[:Port] = Puppet[:ca_port]
-    end
-    super(options)
-  end
-
-  # This client is really only able to request certificates for the
-  # current host.  It uses the Puppet.settings settings to figure everything out.
-  def request_cert
-    Puppet.settings.use(:main, :ssl)
-
-    if cert = read_cert
-      return cert
-    end
-
-    begin
-      cert, cacert = @driver.getcert(csr.to_pem)
-    rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      raise Puppet::Error.new("Certificate retrieval failed: #{detail}")
-    end
-
-    if cert.nil? or cert == ""
-      return nil
-    end
-
-    begin
-      @cert = OpenSSL::X509::Certificate.new(cert)
-      @cacert = OpenSSL::X509::Certificate.new(cacert)
-    rescue => detail
-      raise InvalidCertificate.new(
-        "Invalid certificate: #{detail}"
-      )
-    end
-
-    unless @cert.check_private_key(key)
-      raise InvalidCertificate, "Certificate does not match private key.  Try 'puppetca --clean #{Puppet[:certname]}' on the server."
-    end
-
-    # Only write the cert out if it passes validating.
-    Puppet.settings.write(:hostcert) do |f| f.print cert end
-    Puppet.settings.write(:localcacert) do |f| f.print cacert end
-
-    @cert
-  end
-end
-