X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=lib%2Fpuppet%2Fprovider%2Fapt_key%2Fapt_key.rb;h=c15d826bb912097d74acbf0f132a6b31c07dff39;hb=3cff22c493a803b407f7dfd4277d33624877c69f;hp=2bcaf8d32ec87589e222da7356e1d49f18fad36c;hpb=c84e842467742f31fba17f243d4c75f9edbc14a9;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index 2bcaf8d..c15d826 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -1,14 +1,12 @@ -require 'open-uri' -require 'net/ftp' -require 'tempfile' +# frozen_string_literal: true -if RUBY_VERSION == '1.8.7' - # Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be - # monkeypatched to support passing in :ftp_passive_mode. - require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', - 'puppet_x', 'apt_key', 'patch_openuri.rb')) - OpenURI::Options[:ftp_active_mode] = false +require 'open-uri' +begin + require 'net/ftp' +rescue LoadError + # Ruby 3.0 changed net-ftp to a default gem end +require 'tempfile' Puppet::Type.type(:apt_key).provide(:apt_key) do desc 'apt-key provider for apt_key resource' @@ -51,9 +49,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do expired = false - if line_hash[:key_expiry] - expired = Time.now >= line_hash[:key_expiry] - end + expired = Time.now >= line_hash[:key_expiry] if line_hash[:key_expiry] new( name: line_hash[:key_fingerprint], @@ -100,7 +96,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do key_size: pub_split[2], key_type: nil, key_created: Time.at(pub_split[5].to_i), - key_expiry: pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i), + key_expiry: pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i) } # set key type based on types defined in /usr/share/doc/gnupg/DETAILS.gz @@ -122,6 +118,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do parsed_value = URI.parse(value) if parsed_value.scheme.nil? raise(_('The file %{_value} does not exist') % { _value: value }) unless File.exist?(value) + # Because the tempfile method has to return a live object to prevent GC # of the underlying file from occuring too early, we also have to return # a file object here. The caller can still call the #path method on the @@ -130,17 +127,24 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do f.close f else + exceptions = [OpenURI::HTTPError] + exceptions << Net::FTPPermError if defined?(Net::FTPPermError) + begin # Only send basic auth if URL contains userinfo # Some webservers (e.g. Amazon S3) return code 400 if empty basic auth is sent if parsed_value.userinfo.nil? - key = parsed_value.read + key = if parsed_value.scheme == 'https' && resource[:weak_ssl] == true + open(parsed_value, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read + else + parsed_value.read + end else user_pass = parsed_value.userinfo.split(':') parsed_value.userinfo = '' key = open(parsed_value, http_basic_authentication: user_pass).read end - rescue OpenURI::HTTPError, Net::FTPPermError => e + rescue *exceptions => e raise(_('%{_e} for %{_resource}') % { _e: e.message, _resource: resource[:source] }) rescue SocketError raise(_('could not resolve %{_resource}') % { _resource: resource[:source] }) @@ -165,12 +169,10 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do found_match = false extracted_key.each_line do |line| - if line.chomp == name - found_match = true - end + found_match = true if line.chomp == name end unless found_match - raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Metrics/LineLength + raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Layout/LineLength end else warning('/usr/bin/gpg cannot be found for verification of the id.') @@ -179,29 +181,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do file end - # Update a key if it is expired - def update_expired_key - # Return without doing anything if refresh or expired is false - return unless resource[:refresh] == true && resource[:expired] == true - - # Execute command to update key - command = [] - - unless resource[:source].nil? && resource[:content].nil? - raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] }) - end - - # Breaking up the command like this is needed because it blows up - # if --recv-keys isn't the last argument. - command.push('adv', '--no-tty', '--keyserver', resource[:server]) - unless resource[:options].nil? - command.push('--keyserver-options', resource[:options]) - end - command.push('--recv-keys', resource[:id]) - end - def exists? - update_expired_key # report expired keys as non-existing when refresh => true @property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired]) end @@ -212,9 +192,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do # Breaking up the command like this is needed because it blows up # if --recv-keys isn't the last argument. command.push('adv', '--no-tty', '--keyserver', resource[:server]) - unless resource[:options].nil? - command.push('--keyserver-options', resource[:options]) - end + command.push('--keyserver-options', resource[:options]) unless resource[:options].nil? command.push('--recv-keys', resource[:id]) elsif resource[:content] key_file = tempfile(resource[:content]) @@ -245,12 +223,6 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do mk_resource_methods - # Needed until PUP-1470 is fixed and we can drop support for Puppet versions - # before that. - def expired - @property_hash[:expired] - end - # Alias the setters of read-only properties # to the read_only function. alias_method :created=, :read_only