Ticket #2685 (Type error in ssh_authorized_keys)

In post processing a Symbol was being passed to StringScanner.
StringScanner was not happy with this.  The error message lost
backtrace information and the test coverage was both inadequate
and broken (see #2745).

To be fully effective, this patch needs/assumes the patch for

Signed-off-by: Markus Roberts <Markus@reality.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/lib/puppet/provider/ssh_authorized_key/parsed.rb b/lib/puppet/provider/ssh_authorized_key/parsed.rb
index 28a68b364..69eec9fde 100644
--- a/lib/puppet/provider/ssh_authorized_key/parsed.rb
+++ b/lib/puppet/provider/ssh_authorized_key/parsed.rb
@@ -15,19 +15,13 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
         :optional => %w{options},
         :rts => /^\s+/,
         :match    => /^(?:(.+) )?(ssh-dss|ssh-rsa) ([^ ]+)(?: (.+))?$/,
-        :post_parse => proc { |record|
-            if record[:options].nil?
-                record[:options] = [:absent]
-            else
-                record[:options] = Puppet::Type::Ssh_authorized_key::ProviderParsed.parse_options(record[:options])
-            end
+        :post_parse => proc { |h|
+            h[:options] ||= [:absent]
+            h[:options] = Puppet::Type::Ssh_authorized_key::ProviderParsed.parse_options(h[:options]) if h[:options].is_a? String
         },
-        :pre_gen => proc { |record|
-            if record[:options].include?(:absent)
-                record[:options] = ""
-            else
-                record[:options] = record[:options].join(',')
-            end
+        :pre_gen => proc { |h|
+            h[:options] = [] if h[:options].include?(:absent)
+            h[:options] = h[:options].join(',')
         }
 
     record_line :key_v1,