Commit graph

18 commits

Author SHA1 Message Date
Clayton O'Neill
ea6a84f336 Fix apt_key tempfile race condition
The Ruby Tempfile class has a finalizer that removes the file when the
GC runs.  It's not predictible when the GC will run, so you have to
ensure that the instance of the class stays in scope for as long as you
need it.

Unfortunately the tempfile method is returning just the filename of the
temporary file, which means it goes out of scope when that method
returns.  This allows the GC to reap it at any time after return.

In both CI and production environments we've seen this race fail,
causing apt-key add to fail a small (2-3%) amount of the time.

This changes the tempfile and source_to_file methods to return the
underlying Tempfile object, pushing it up into the caller's scope.  Both
of the callers immediately use the object to get its filename and then
open the file, eliminating the race.

Tested this by adding 'GC.start; sleep(1)' immediately before the
command is run, to give the GC plenty of time to remove the tempfile if
it was going to.
2015-11-12 14:09:52 +00:00
Morgan Haskel
2802868f96 Iterate through multiple keys 2015-04-20 12:44:42 -07:00
Morgan Haskel
dc746734f1 Merge remote-tracking branch 'upstream/master' into merge_master_to_next 2015-03-25 18:32:09 -04:00
Morgan Haskel
c7354b90fb Actually make it possible to use apt_key
The provider wasn't updated for a parameter rename.
2015-03-18 12:51:37 -07:00
Chris Boot
a24c41247f apt_key: fix some whitespace issues 2015-03-15 22:47:15 +00:00
Chris Boot
42ab470d00 apt_key: fix parsing invalid dates when using GnuPG 2.x
If one should happen to have redirected /usr/bin/gpg to run GnuPG 2.x
rather than the more usual GnuPG 1.x, the apt_key provider fails with
the following error:

Could not prefetch apt_key provider 'apt_key': invalid date

This is because the output of "--with-colons" defaults to using
"fixed-list-mode" in 2.x but did not do so for 1.x. This new format
gives much more information about keys and also uses timestamps in
seconds from 1970-01-01 (UNIX epoch) rather than dates in the format
YYYY-MM-DD.

This patch adds "--fixed-list-mode" when calling apt-key, and adjusts
the code to parse the timestamps instead. This actually has several
advantages:

- Works the same with GnuPG 1.x and 2.x.
- More accurate expiry time tracking, not just entire days.
- No need to require 'date' any longer.
- Will allow the provider to expose more key information in future.

Tested on:
- Debian Wheezy (Puppet 2.7.23, Ruby 1.8.7p358)
- Debian Jessie (Puppet 3.7.2, Ruby 2.1.5p273)
2015-03-15 22:33:22 +00:00
tphoney
f588f2651a initial commit for gpg key checking
better attempt at gpg version checking

adding in key length warning

removing version check, adding key check

adding tests

clean up the code

small changes

use commands

documentation updates
2015-03-12 18:25:26 +00:00
Travis Fields
18fae0a516 MODULES-1661 Fix to do delete with short key not long 2015-01-13 23:45:03 -08:00
Travis Fields
f1ca76dec5 MODULES-1661 Fix issue with apt_key destroy, also added mutliple deletes 2015-01-13 17:40:18 -08:00
rfkrocktk
445ad0b6fe Allow full length GPG key fingerprints.
Also add support for ECC and ECDSA key_types
2015-01-10 00:45:57 -05:00
Morgan Haskel
e5338f2e53 Merge remote-tracking branch 'upstream/1.6.x' into merge_1.6.x
Conflicts:
	lib/facter/apt_package_updates.rb
	lib/facter/apt_security_updates.rb
	lib/facter/apt_updates.rb
2014-11-21 11:59:04 -05:00
Travis Fields
559787268a MODULES-1119 Fixed to now have username and passwords passed in again 2014-11-20 20:57:40 -05:00
Morgan Haskel
87f3f1023c Don't truncate to short keys in the type
You should be able to create/delete keys using the long key to avoid
collisions, and truncating in the type makes that not work.
2014-10-01 13:40:25 -05:00
Arkady Smirnov
f4ea10f4d8 MODULES-780 Don't blow up on unicode characters. 2014-07-09 14:06:40 +03:00
Daniele Sluijters
14b3beda74 MODULES-780 Don't blow up on unicode characters.
Gotta love the difference between Ruby 1.8.7 not caring and every
subsequent version exploding.
2014-06-26 14:35:39 +02:00
Daniele Sluijters
cc1f9c8bb9 Use File.expand_path with require.
For some reason, even though our own tests pass with `require
puppet_x/apt_key/patch_openuri` every other module that depends on
puppetlabs-apt is now breaking in tests claiming it can't load that
module.

Somewhere along the way something is probably messing with LOADPATH
causing this to trip up. This should fix the issues for everyone.

This commit affects:
 * puppetlabs/puppetlabs-apt#229
 * puppetlabs/puppetlabs-postgresql#391
2014-03-16 12:51:33 +01:00
Daniele Sluijters
c3b3f5bb42 apt_key: Support fetching keys over FTP. 2014-02-21 09:06:47 +01:00
Daniele Sluijters
374101612c Add a type and provider to manage apt keys.
This commits introduces:
 * The apt_key type;
 * The apt_key provider;
 * Unit tests for the type;
 * Beaker/acceptance tests for the type/provider.

The idea behind apt_key is that apt::key will simply become a wrapper
that uses apt_key. Being a native type/provider apt_key is a lot less
error prone than the current exec behaviour of apt::key and adds a few
nice bonuses like inventory capabilities for mcollective users.
2014-02-18 22:51:08 +01:00