puppet_webhook 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a033807d653ea6ca0e2e168285cedaa3a88b6e7e
-  data.tar.gz: a61cef2d602fe46e73628917ac1f55b6339c2211
+  metadata.gz: 8ed278f549c585151ba3bbb7b57e3e04ad14790d
+  data.tar.gz: a6d0eb7a04bb324c23b21b56badb309214206d45
 SHA512:
-  metadata.gz: ae8031b56b893d520f9264b98007609a3b18121c8ee74d795836e9d83979b5904c920dacb9d78ea3fcc1949fb7cca4dec9e3c6e991a97a03e07fa728464ee520
-  data.tar.gz: d3d0924a67612ab7231f31eca989d06981208b5a66ee7feeb7f2cc2756c46bb884a45d7aa12731c0e80c88731ee8cfac6ecdbfd13b7df63789c3a030a3673ffc
+  metadata.gz: 37d39b4ee20fd892843b639300114f908f4ab3187c5cc79b19c6f5a192dca6fa74aa32fe315ccc250d8510ac78d00a0430ccf7d2aeb2eaa1eb13e0537d367812
+  data.tar.gz: 26dd12e232e6ef9879163cafd67183f6f6b7fb1f8337a17b980ea9abc451a3c8b73240d070e79487c9f3f4cc11a5be8bdafeae9ea93dbf27cf7d02cc34ea7e69

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v1.6.1](https://github.com/voxpupuli/puppet_webhook/tree/v1.6.1) (2019-01-15)
+[Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.6.1...v1.6.1)
+
+**Fixed bugs:**
+
+- Ensure that the ssl cert/key content is sent to WEBrick, not the path [\#84](https://github.com/voxpupuli/puppet_webhook/pull/84) ([dhollinger](https://github.com/dhollinger))
+
 ## [v1.6.1](https://github.com/voxpupuli/puppet_webhook/tree/v1.6.1) (2018-12-23)
 [Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.6.0...v1.6.1)
 

data/bin/puppet_webhook

@@ -48,11 +48,11 @@ optparse = OptionParser.new do |opts| # rubocop:disable Metrics/BlockLength
   end
 
   opts.on('--ssl-cert FILE', 'Specify the SSL cert to use. Pair with --ssl-key.') do |arg|
-    ssl_opts[:ssl_cert] = OpenSSL::X509::Certificate.new(File.open(arg).read)
+    ssl_opts[:ssl_cert] = arg
   end
 
   opts.on('--ssl-key FILE', 'Specify the SSL key to use. Pair with --ssl-cert.') do |arg|
-    ssl_opts[:ssl_key] = OpenSSL::PKey::RSA.new(File.open(arg))
+    ssl_opts[:ssl_key] = arg
   end
 
   opts.on('-c FILE', '--configfile FILE', 'Specifies a configuration file to use.') do |arg|
@@ -84,7 +84,13 @@ if @server_config
   ssl_opts[:enable_ssl] = settings.enable_ssl if settings.respond_to? :enable_ssl=
   ssl_opts[:ssl_verify] = settings.ssl_verify if settings.respond_to? :ssl_verify=
   ssl_opts[:ssl_cert] = settings.ssl_cert if settings.respond_to? :ssl_cert=
-  ssl_opts[:ssl_key] = settings.enable_ssl if settings.respond_to? :ssl_key=
+  ssl_opts[:ssl_key] = settings.ssl_key if settings.respond_to? :ssl_key=
+end
+
+def ssl_verify(ssl_opts)
+  return OpenSSL::SSL::VERIFY_NONE unless ssl_opts[:ssl_verify]
+
+  OpenSSL::SSL::VERIFY_PEER
 end
 
 LOGGER = WEBrick::Log.new(options[:logfile], Object.const_get("WEBrick::Log::#{options[:loglevel]}"))
@@ -99,9 +105,9 @@ webrick_opts = {
 
 if ssl_opts[:enable_ssl]
   webrick_opts[:SSLEnable] = ssl_opts[:enable_ssl]
-  webrick_opts[:SSLVerifyClient] = ssl_opts[:ssl_verify]
-  webrick_opts[:SSLCertificate] = ssl_opts[:ssl_cert]
-  webrick_opts[:SSLPrivateKey] = ssl_opts[:ssl_key]
+  webrick_opts[:SSLVerifyClient] = ssl_verify(ssl_opts)
+  webrick_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(ssl_opts[:ssl_cert]))
+  webrick_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.read(ssl_opts[:ssl_key]))
   webrick_opts[:SSLCertName] = [['CN', WEBrick::Utils.getservername]]
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_webhook
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json