Merge pull request dgolja#17 from ajmaidak/proxy

Proxy

.gitignore

@@ -7,3 +7,5 @@ log/*
 Gemfile.lock
 junit/*
 .vagrant/
+.bundle
+vendor

README.md

@@ -166,9 +166,9 @@ before the gnupg_key resource executes.
 
 **OPTIONAL** - key type. Valid values (public|private|both). Default: public
 
-PGP key server from where to retrieve the public key. Valid URI schemes are
-*http*, *https*, *ldap* and *hkp*.
+#####`proxy`
 
+**OPTIONAL** - use a http proxy url to access the keyserver, for example: http://proxy.corp.domain:80.  Default: undef
 
 ### Tests
 

lib/puppet/provider/gnupg_key/gnupg.rb

@@ -53,7 +53,11 @@ def add_key
   end
 
   def add_key_from_key_server
-    command = "gpg --keyserver #{resource[:key_server]} --recv-keys #{resource[:key_id]}"
+    if resource[:proxy].empty?
+      command = "gpg --keyserver #{resource[:key_server]} --recv-keys #{resource[:key_id]}"
+    else
+      command = "gpg --keyserver #{resource[:key_server]} --keyserver-options http-proxy=#{resource[:proxy]} --recv-keys #{resource[:key_id]}"
+    end
     begin
       output = Puppet::Util::Execution.execute(command,  :uid => user_id, :failonfail => true)
     rescue Puppet::ExecutionFailure => e

lib/puppet/type/gnupg_key.rb

@@ -150,4 +150,18 @@
 
     defaultto :public
   end
+
+  newparam(:proxy) do
+    desc "Set the proxy to use for HTTP and HKP keyservers."
+
+    validate do |value|
+      if value
+        uri = URI.parse(URI.escape(value))   
+        unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS) 
+          raise ArgumentError, "Invalid proxy value #{value}"
+        end
+      end
+    end
+  end
+
 end

spec/unit/puppet/type/gnupg_key_spec.rb

@@ -58,6 +58,12 @@
     }.to raise_error(Puppet::Error)
   end
 
+  it "should not accept invalid formated proxy URL" do
+    expect {
+      @gnupg_key[:proxy] = 'httk://foo.bar/'
+    }.to raise_error(Puppet::Error)
+  end
+
   ['20BC0A86', 'D50582e6', '20BC0a86', '9B7D32F2D50582E6', '3CCe8BC520bc0A86'].each do |val|
     it "should allow key_id with #{val}" do
       @gnupg_key[:key_id] = val