bolt 0.19.1 → 0.20.0

data/vendored/puppet/lib/puppet/ssl/certificate_request.rb

@@ -1,325 +0,0 @@
-require 'puppet/ssl/base'
-require 'puppet/ssl/certificate_signer'
-
-# This class creates and manages X509 certificate signing requests.
-#
-# ## CSR attributes
-#
-# CSRs may contain a set of attributes that includes supplementary information
-# about the CSR or information for the signed certificate.
-#
-# PKCS#9/RFC 2985 section 5.4 formally defines the "Challenge password",
-# "Extension request", and "Extended-certificate attributes", but this
-# implementation only handles the "Extension request" attribute. Other
-# attributes may be defined on a CSR, but the RFC doesn't define behavior for
-# any other attributes so we treat them as only informational.
-#
-# ## CSR Extension request attribute
-#
-# CSRs may contain an optional set of extension requests, which allow CSRs to
-# include additional information that may be included in the signed
-# certificate. Any additional information that should be copied from the CSR
-# to the signed certificate MUST be included in this attribute.
-#
-# This behavior is dictated by PKCS#9/RFC 2985 section 5.4.2.
-#
-# @see https://tools.ietf.org/html/rfc2985 "RFC 2985 Section 5.4.2 Extension request"
-#
-class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
-  wraps OpenSSL::X509::Request
-
-  extend Puppet::Indirector
-
-  # If auto-signing is on, sign any certificate requests as they are saved.
-  module AutoSigner
-    def save(instance, key = nil)
-      super
-
-      # Try to autosign the CSR.
-      if ca = Puppet::SSL::CertificateAuthority.instance
-        ca.autosign(instance)
-      end
-    end
-  end
-
-  indirects :certificate_request, :terminus_class => :file, :extend => AutoSigner, :doc => <<DOC
-    This indirection wraps an `OpenSSL::X509::Request` object, representing a certificate signing request (CSR).
-    The indirection key is the certificate CN (generally a hostname).
-DOC
-
-  # Because of how the format handler class is included, this
-  # can't be in the base class.
-  def self.supported_formats
-    [:s]
-  end
-
-  def extension_factory
-    @ef ||= OpenSSL::X509::ExtensionFactory.new
-  end
-
-  # Create a certificate request with our system settings.
-  #
-  # @param key [OpenSSL::X509::Key, Puppet::SSL::Key] The key pair associated
-  #   with this CSR.
-  # @param options [Hash]
-  # @option options [String] :dns_alt_names A comma separated list of
-  #   Subject Alternative Names to include in the CSR extension request.
-  # @option options [Hash<String, String, Array<String>>] :csr_attributes A hash
-  #   of OIDs and values that are either a string or array of strings.
-  # @option options [Array<String, String>] :extension_requests A hash of
-  #   certificate extensions to add to the CSR extReq attribute, excluding
-  #   the Subject Alternative Names extension.
-  #
-  # @raise [Puppet::Error] If the generated CSR signature couldn't be verified
-  #
-  # @return [OpenSSL::X509::Request] The generated CSR
-  def generate(key, options = {})
-    Puppet.info _("Creating a new SSL certificate request for %{name}") % { name: name }
-
-    # Support either an actual SSL key, or a Puppet key.
-    key = key.content if key.is_a?(Puppet::SSL::Key)
-
-    # If we're a CSR for the CA, then use the real ca_name, rather than the
-    # fake 'ca' name.  This is mostly for backward compatibility with 0.24.x,
-    # but it's also just a good idea.
-    common_name = name == Puppet::SSL::CA_NAME ? Puppet.settings[:ca_name] : name
-
-    csr = OpenSSL::X509::Request.new
-    csr.version = 0
-    csr.subject = OpenSSL::X509::Name.new([["CN", common_name]])
-    csr.public_key = key.public_key
-
-    if options[:csr_attributes]
-      add_csr_attributes(csr, options[:csr_attributes])
-    end
-
-    if (ext_req_attribute = extension_request_attribute(options))
-      csr.add_attribute(ext_req_attribute)
-    end
-
-    signer = Puppet::SSL::CertificateSigner.new
-    signer.sign(csr, key)
-
-    raise Puppet::Error, _("CSR sign verification failed; you need to clean the certificate request for %{name} on the server") % { name: name } unless csr.verify(key.public_key)
-
-    @content = csr
-    Puppet.info _("Certificate Request fingerprint (%{digest}): %{hex_digest}") % { digest: digest.name, hex_digest: digest.to_hex }
-    @content
-  end
-
-  def ext_value_to_ruby_value(asn1_arr)
-    # A list of ASN1 types than can't be directly converted to a Ruby type
-    @non_convertible ||= [OpenSSL::ASN1::EndOfContent,
-                          OpenSSL::ASN1::BitString,
-                          OpenSSL::ASN1::Null,
-                          OpenSSL::ASN1::Enumerated,
-                          OpenSSL::ASN1::UTCTime,
-                          OpenSSL::ASN1::GeneralizedTime,
-                          OpenSSL::ASN1::Sequence,
-                          OpenSSL::ASN1::Set]
-
-    begin
-      # Attempt to decode the extension's DER data located in the original OctetString
-      asn1_val = OpenSSL::ASN1.decode(asn1_arr.last.value)
-    rescue OpenSSL::ASN1::ASN1Error
-      # This is to allow supporting the old-style of not DER encoding trusted facts
-      return asn1_arr.last.value
-    end
-
-    # If the extension value can not be directly converted to an atomic Ruby
-    # type, use the original ASN1 value. This is needed to work around a bug
-    # in Ruby's OpenSSL library which doesn't convert the value of unknown
-    # extension OIDs properly. See PUP-3560
-    if @non_convertible.include?(asn1_val.class) then
-      # Allows OpenSSL to take the ASN1 value and turn it into something Ruby understands
-      OpenSSL::X509::Extension.new(asn1_arr.first.value, asn1_val.to_der).value
-    else
-      asn1_val.value
-    end
-  end
-
-  # Return the set of extensions requested on this CSR, in a form designed to
-  # be useful to Ruby: an array of hashes.  Which, not coincidentally, you can pass
-  # successfully to the OpenSSL constructor later, if you want.
-  #
-  # @return [Array<Hash{String => String}>] An array of two or three element
-  # hashes, with key/value pairs for the extension's oid, its value, and
-  # optionally its critical state.
-  def request_extensions
-    raise Puppet::Error, _("CSR needs content to extract fields") unless @content
-
-    # Prefer the standard extReq, but accept the Microsoft specific version as
-    # a fallback, if the standard version isn't found.
-    attribute   = @content.attributes.find {|x| x.oid == "extReq" }
-    attribute ||= @content.attributes.find {|x| x.oid == "msExtReq" }
-    return [] unless attribute
-
-    extensions = unpack_extension_request(attribute)
-
-    index = -1
-    extensions.map do |ext_values|
-      index += 1
-
-      value = ext_value_to_ruby_value(ext_values)
-
-      # OK, turn that into an extension, to unpack the content.  Lovely that
-      # we have to swap the order of arguments to the underlying method, or
-      # perhaps that the ASN.1 representation chose to pack them in a
-      # strange order where the optional component comes *earlier* than the
-      # fixed component in the sequence.
-      case ext_values.length
-      when 2
-        {"oid" => ext_values[0].value, "value" => value}
-      when 3
-        {"oid" => ext_values[0].value, "value" => value, "critical" => ext_values[1].value}
-      else
-        raise Puppet::Error, _("In %{attr}, expected extension record %{index} to have two or three items, but found %{count}") % { attr: attribute.oid, index: index, count: ext_values.length }
-      end
-    end
-  end
-
-  def subject_alt_names
-    @subject_alt_names ||= request_extensions.
-      select {|x| x["oid"] == "subjectAltName" }.
-      map {|x| x["value"].split(/\s*,\s*/) }.
-      flatten.
-      sort.
-      uniq
-  end
-
-  # Return all user specified attributes attached to this CSR as a hash. IF an
-  # OID has a single value it is returned as a string, otherwise all values are
-  # returned as an array.
-  #
-  # The format of CSR attributes is specified in PKCS#10/RFC 2986
-  #
-  # @see https://tools.ietf.org/html/rfc2986 "RFC 2986 Certification Request Syntax Specification"
-  #
-  # @api public
-  #
-  # @return [Hash<String, String>]
-  def custom_attributes
-    x509_attributes = @content.attributes.reject do |attr|
-      PRIVATE_CSR_ATTRIBUTES.include? attr.oid
-    end
-
-    x509_attributes.map do |attr|
-      {"oid" => attr.oid, "value" => attr.value.value.first.value}
-    end
-  end
-
-  private
-
-  # Exclude OIDs that may conflict with how Puppet creates CSRs.
-  #
-  # We only have nominal support for Microsoft extension requests, but since we
-  # ultimately respect that field when looking for extension requests in a CSR
-  # we need to prevent that field from being written to directly.
-  PRIVATE_CSR_ATTRIBUTES = [
-    'extReq',   '1.2.840.113549.1.9.14',
-    'msExtReq', '1.3.6.1.4.1.311.2.1.14',
-  ]
-
-  def add_csr_attributes(csr, csr_attributes)
-    csr_attributes.each do |oid, value|
-      begin
-        if PRIVATE_CSR_ATTRIBUTES.include? oid
-          raise ArgumentError, _("Cannot specify CSR attribute %{oid}: conflicts with internally used CSR attribute") % { oid: oid }
-        end
-
-        encoded = OpenSSL::ASN1::PrintableString.new(value.to_s)
-
-        attr_set = OpenSSL::ASN1::Set.new([encoded])
-        csr.add_attribute(OpenSSL::X509::Attribute.new(oid, attr_set))
-        Puppet.debug("Added csr attribute: #{oid} => #{attr_set.inspect}")
-      rescue OpenSSL::X509::AttributeError => e
-        raise Puppet::Error, _("Cannot create CSR with attribute %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
-      end
-    end
-  end
-
-  PRIVATE_EXTENSIONS = [
-    'subjectAltName', '2.5.29.17',
-  ]
-
-  # @api private
-  def extension_request_attribute(options)
-    extensions = []
-
-    if options[:extension_requests]
-      options[:extension_requests].each_pair do |oid, value|
-        begin
-          if PRIVATE_EXTENSIONS.include? oid
-            raise Puppet::Error, _("Cannot specify CSR extension request %{oid}: conflicts with internally used extension request") % { oid: oid }
-          end
-
-          ext = OpenSSL::X509::Extension.new(oid, OpenSSL::ASN1::UTF8String.new(value.to_s).to_der, false)
-          extensions << ext
-        rescue OpenSSL::X509::ExtensionError => e
-          raise Puppet::Error, _("Cannot create CSR with extension request %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
-        end
-      end
-    end
-
-    if options[:dns_alt_names]
-      names = options[:dns_alt_names].split(/\s*,\s*/).map(&:strip) + [name]
-      names = names.sort.uniq.map {|name| "DNS:#{name}" }.join(", ")
-      alt_names_ext = extension_factory.create_extension("subjectAltName", names, false)
-
-      extensions << alt_names_ext
-    end
-
-    unless extensions.empty?
-      seq = OpenSSL::ASN1::Sequence(extensions)
-      ext_req = OpenSSL::ASN1::Set([seq])
-      OpenSSL::X509::Attribute.new("extReq", ext_req)
-    end
-  end
-
-  # Unpack the extReq attribute into an array of Extensions.
-  #
-  # The extension request attribute is structured like
-  # `Set[Sequence[Extensions]]` where the outer Set only contains a single
-  # sequence.
-  #
-  # In addition the Ruby implementation of ASN1 requires that all ASN1 values
-  # contain a single value, so Sets and Sequence have to contain an array
-  # that in turn holds the elements. This is why we have to unpack an array
-  # every time we unpack a Set/Seq.
-  #
-  # @see https://tools.ietf.org/html/rfc2985#ref-10 5.4.2 CSR Extension Request structure
-  # @see https://tools.ietf.org/html/rfc5280 4.1 Certificate Extension structure
-  #
-  # @api private
-  #
-  # @param attribute [OpenSSL::X509::Attribute] The X509 extension request
-  #
-  # @return [Array<Array<Object>>] A array of arrays containing the extension
-  #   OID the critical state if present, and the extension value.
-  def unpack_extension_request(attribute)
-
-    unless attribute.value.is_a? OpenSSL::ASN1::Set
-      raise Puppet::Error, _("In %{attr}, expected Set but found %{klass}") % { attr: attribute.oid, klass: attribute.value.class }
-    end
-
-    unless attribute.value.value.is_a? Array
-      raise Puppet::Error, _("In %{attr}, expected Set[Array] but found %{klass}") % { attr: attribute.oid, klass: attribute.value.value.class }
-    end
-
-    unless attribute.value.value.size == 1
-      raise Puppet::Error, _("In %{attr}, expected Set[Array] with one value but found %{count} elements") % { attr: attribute.oid, count: attribute.value.value.size }
-    end
-
-    unless attribute.value.value.first.is_a? OpenSSL::ASN1::Sequence
-      raise Puppet::Error, _("In %{attr}, expected Set[Array[Sequence[...]]], but found %{klass}") % { attr: attribute.oid, klass: extension.class }
-    end
-
-    unless attribute.value.value.first.value.is_a? Array
-      raise Puppet::Error, _("In %{attr}, expected Set[Array[Sequence[Array[...]]]], but found %{klass}") % { attr: attribute.oid, klass: extension.value.class }
-    end
-
-    extensions = attribute.value.value.first.value
-
-    extensions.map(&:value)
-  end
-end

data/vendored/puppet/lib/puppet/ssl/certificate_request_attributes.rb

@@ -1,37 +0,0 @@
-require 'puppet/ssl'
-require 'puppet/util/yaml'
-
-# This class transforms simple key/value pairs into the equivalent ASN1
-# structures. Values may be strings or arrays of strings.
-#
-# @api private
-class Puppet::SSL::CertificateRequestAttributes
-
-  attr_reader :path, :custom_attributes, :extension_requests
-
-  def initialize(path)
-    @path = path
-    @custom_attributes = {}
-    @extension_requests = {}
-  end
-
-  # Attempt to load a yaml file at the given @path.
-  # @return true if we are able to load the file, false otherwise
-  # @raise [Puppet::Error] if there are unexpected attribute keys
-  def load
-    Puppet.info(_("csr_attributes file loading from %{path}") % { path: path })
-    if Puppet::FileSystem.exist?(path)
-      hash = Puppet::Util::Yaml.load_file(path, {})
-      if ! hash.is_a?(Hash)
-        raise Puppet::Error, _("invalid CSR attributes, expected instance of Hash, received instance of %{klass}") % { klass: hash.class }
-      end
-      @custom_attributes = hash.delete('custom_attributes') || {}
-      @extension_requests = hash.delete('extension_requests') || {}
-      if not hash.keys.empty?
-        raise Puppet::Error, _("unexpected attributes %{keys} in %{path}") % { keys: hash.keys.inspect, path: @path.inspect }
-      end
-      return true
-    end
-    return false
-  end
-end

data/vendored/puppet/lib/puppet/ssl/certificate_revocation_list.rb

@@ -1,111 +0,0 @@
-require 'puppet/ssl/base'
-require 'puppet/indirector'
-require 'puppet/ssl/certificate_signer'
-
-# Manage the CRL.
-class Puppet::SSL::CertificateRevocationList < Puppet::SSL::Base
-  FIVE_YEARS = 5 * 365*24*60*60
-
-  wraps OpenSSL::X509::CRL
-
-  extend Puppet::Indirector
-  indirects :certificate_revocation_list, :terminus_class => :file, :doc => <<DOC
-    This indirection wraps an `OpenSSL::X509::CRL` object, representing a certificate revocation list (CRL).
-    The indirection key is the CA name (usually literally `ca`).
-DOC
-
-  # Convert a string into an instance.
-  def self.from_s(string)
-    super(string, 'foo') # The name doesn't matter
-  end
-
-  # Because of how the format handler class is included, this
-  # can't be in the base class.
-  def self.supported_formats
-    [:s]
-  end
-
-  # Knows how to create a CRL with our system defaults.
-  def generate(cert, cakey)
-    Puppet.info _("Creating a new certificate revocation list")
-
-    create_crl_issued_by(cert)
-    start_at_initial_crl_number
-    update_valid_time_range_to_start_at(Time.now)
-    sign_with(cakey)
-
-    @content
-  end
-
-  # The name doesn't actually matter; there's only one CRL.
-  # We just need the name so our Indirector stuff all works more easily.
-  def initialize(fakename)
-    @name = "crl"
-  end
-
-  # Revoke the certificate with serial number SERIAL issued by this
-  # CA, then write the CRL back to disk. The REASON must be one of the
-  # OpenSSL::OCSP::REVOKED_* reasons
-  def revoke(serial, cakey, reason = OpenSSL::OCSP::REVOKED_STATUS_KEYCOMPROMISE)
-    Puppet.notice _("Revoked certificate with serial %{serial}") % { serial: serial }
-    time = Time.now
-
-    add_certificate_revocation_for(serial, reason, time)
-    update_to_next_crl_number
-    update_valid_time_range_to_start_at(time)
-    sign_with(cakey)
-
-    Puppet::SSL::CertificateRevocationList.indirection.save(self)
-  end
-
-private
-
-  def create_crl_issued_by(cert)
-    ef = OpenSSL::X509::ExtensionFactory.new(cert)
-    @content = wrapped_class.new
-    @content.issuer = cert.subject
-    @content.add_extension(ef.create_ext("authorityKeyIdentifier", "keyid:always"))
-    @content.version = 1
-  end
-
-  def start_at_initial_crl_number
-    @content.add_extension(crl_number_of(0))
-  end
-
-  def add_certificate_revocation_for(serial, reason, time)
-    revoked = OpenSSL::X509::Revoked.new
-    revoked.serial = serial
-    revoked.time = time
-    enum = OpenSSL::ASN1::Enumerated(reason)
-    ext = OpenSSL::X509::Extension.new("CRLReason", enum)
-    revoked.add_extension(ext)
-    @content.add_revoked(revoked)
-  end
-
-  def update_valid_time_range_to_start_at(time)
-    # The CRL is not valid if the time of checking == the time of last_update.
-    # So to have it valid right now we need to say that it was updated one second ago.
-    @content.last_update = time - 1
-    @content.next_update = time + FIVE_YEARS
-  end
-
-  def update_to_next_crl_number
-    @content.extensions = with_next_crl_number_from(@content.extensions)
-  end
-
-  def with_next_crl_number_from(existing_extensions)
-    existing_crl_num = existing_extensions.find { |e| e.oid == 'crlNumber' }
-    new_crl_num = existing_crl_num ? existing_crl_num.value.to_i + 1 : 0
-
-    extensions_without_crl_num = existing_extensions.reject { |e| e.oid == 'crlNumber' }
-    extensions_without_crl_num + [crl_number_of(new_crl_num)]
-  end
-
-  def crl_number_of(number)
-    OpenSSL::X509::Extension.new('crlNumber', OpenSSL::ASN1::Integer(number))
-  end
-
-  def sign_with(cakey)
-    Puppet::SSL::CertificateSigner.new.sign(@content, cakey)
-  end
-end