Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apt_key: fix parsing invalid dates when using GnuPG 2.x #465

Merged
merged 2 commits into from
Mar 16, 2015
Merged

apt_key: fix parsing invalid dates when using GnuPG 2.x #465

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42ab470
apt_key: fix parsing invalid dates when using GnuPG 2.x
bootc Mar 15, 2015
a24c412
apt_key: fix some whitespace issues
bootc Mar 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions lib/puppet/provider/apt_key/apt_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'date'
require 'open-uri'
require 'net/ftp'
require 'tempfile'
Expand All @@ -19,7 +18,7 @@
commands :gpg => '/usr/bin/gpg'

def self.instances
cli_args = ['adv','--list-keys', '--with-colons', '--fingerprint']
cli_args = ['adv','--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']

if RUBY_VERSION > '1.8.7'
key_output = apt_key(cli_args).encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
Expand All @@ -46,7 +45,7 @@ def self.instances
expired = false

if line_hash[:key_expiry]
expired = Date.today > Date.parse(line_hash[:key_expiry])
expired = Time.now >= line_hash[:key_expiry]
end

new(
Expand All @@ -57,10 +56,10 @@ def self.instances
:long => line_hash[:key_long],
:ensure => :present,
:expired => expired,
:expiry => line_hash[:key_expiry],
:expiry => line_hash[:key_expiry].nil? ? nil : line_hash[:key_expiry].strftime("%Y-%m-%d"),
:size => line_hash[:key_size],
:type => line_hash[:key_type],
:created => line_hash[:key_created]
:created => line_hash[:key_created].strftime("%Y-%m-%d")
)
end
key_array.compact!
Expand Down Expand Up @@ -96,8 +95,8 @@ def self.key_line_hash(pub_line, fpr_line)
:key_short => fingerprint[-8..-1], # last 8 characters of fingerprint
:key_size => pub_split[2],
:key_type => nil,
:key_created => pub_split[5],
:key_expiry => pub_split[6].empty? ? nil : pub_split[6],
:key_created => Time.at(pub_split[5].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
Expand Down Expand Up @@ -143,11 +142,11 @@ def tempfile(content)
extracted_key = execute(["#{command(:gpg)} --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], :failonfail => false)
extracted_key = extracted_key.chomp
if extracted_key != name
fail ("The id in your manifest #{resource[:name]} and the fingerprint from content/source do not match. Please check there is not an error in the id or check the content/source is legitimate.")
fail("The id in your manifest #{resource[:name]} and the fingerprint from content/source do not match. Please check there is not an error in the id or check the content/source is legitimate.")
end
else
warning ('/usr/bin/gpg cannot be found for verification of the id.')
end
warning('/usr/bin/gpg cannot be found for verification of the id.')
end
end
file.path
end
Expand Down