inspec 0.14.6 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22439c33205070f48e2e1f199f040ff3f4a50133
-  data.tar.gz: 12fb11787b0df75c7c3f275a5ee43bb19df94983
+  metadata.gz: e23aea3ed6f256ada21afef149fe87553f84aa17
+  data.tar.gz: 1d36f905fa6a2dae444900d01d9db522da10fdb7
 SHA512:
-  metadata.gz: 1b8fc567acb8bf86a1b9fa4ec40dab1ac50f596874cf26ed30e240612c2a32ad772e3b2166767ed4f9676aa966530bf114fb004187b6aa71dd5a436449c4ef28
-  data.tar.gz: 1e17444082f76b7c02a9590783a93c350ac12f6e039492737a3af54cd5c6f91c2a9530db2422241f971b175cbdb194bfd1903d8694c6d13dbb05ca7a81afd119
+  metadata.gz: 790db6f9584440a041282924b5e70faa2763c4b1e3dcee3f7f26d2bb29dc998ebaade90158179be869f624b9510172623641522508fb4015dad19bd9a3b6a0af
+  data.tar.gz: 220b6f09b83e99abddba71d156288ee5e1171e061d9bbc4cea33e34b9570dac3416602007ebb8982081ebcc88837eee82808d7780ff000c9cfd326fc1b049a36

data/CHANGELOG.md

@@ -1,16 +1,35 @@
 # Change Log
 
-## [0.14.6](https://github.com/chef/inspec/tree/0.14.6) (2016-03-01)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.14.5...0.14.6)
+## [0.14.7](https://github.com/chef/inspec/tree/0.14.7) (2016-03-01)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.6...0.14.7)
 
 **Fixed bugs:**
 
-- add missing supermarket loader [\#506](https://github.com/chef/inspec/pull/506) ([chris-rock](https://github.com/chris-rock))
+- `compliance` command does not work with self-signed https [\#511](https://github.com/chef/inspec/issues/511)
+
+**Closed issues:**
+
+- check error - digest: no implicit conversion of nil into String \(TypeError\) [\#509](https://github.com/chef/inspec/issues/509)
 
 **Merged pull requests:**
 
+- adds a insecure option  [\#512](https://github.com/chef/inspec/pull/512) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.14.6](https://github.com/chef/inspec/tree/v0.14.6) (2016-03-01)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.5...v0.14.6)
+
+**Implemented enhancements:**
+
 - Improve Supermarket CLI [\#508](https://github.com/chef/inspec/pull/508) ([alexpop](https://github.com/alexpop))
 
+**Fixed bugs:**
+
+- add missing supermarket loader [\#506](https://github.com/chef/inspec/pull/506) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- 0.14.6 [\#510](https://github.com/chef/inspec/pull/510) ([chris-rock](https://github.com/chris-rock))
+
 ## [v0.14.5](https://github.com/chef/inspec/tree/v0.14.5) (2016-02-29)
 [Full Changelog](https://github.com/chef/inspec/compare/v0.14.4...v0.14.5)
 

data/lib/bundles/inspec-compliance/api.rb

@@ -8,19 +8,20 @@ require 'uri'
 module Compliance
   # API Implementation does not hold any state by itself,
   # everything will be stored in local Configuration store
-  class API
+  class API # rubocop:disable Metrics/ClassLength
     # logs into the server, retrieves a token and stores it locally
-    def self.login(server, username, password)
+    def self.login(server, username, password, insecure)
       config = Compliance::Configuration.new
       config['server'] = server
       url = "#{server}/oauth/token"
 
-      success, data = Compliance::API.post(url, username, password)
+      success, data = Compliance::API.post(url, username, password, insecure)
       if !data.nil?
         tokendata = JSON.parse(data)
         if tokendata['access_token']
           config['user'] = username
           config['token'] = tokendata['access_token']
+          config['insecure'] = insecure
           config.store
           success = true
           msg = 'Successfully authenticated'
@@ -36,7 +37,7 @@ module Compliance
     def self.logout
       config = Compliance::Configuration.new
       url = "#{config['server']}/logout"
-      Compliance::API.post(url, config['token'], nil)
+      Compliance::API.post(url, config['token'], nil, config['insecure'])
       config.destroy
     end
 
@@ -45,7 +46,7 @@ module Compliance
       config = Compliance::Configuration.new
       url = "#{config['server']}/version"
 
-      _success, data = Compliance::API.get(url, nil, nil)
+      _success, data = Compliance::API.get(url, nil, nil, config['insecure'])
       if !data.nil?
         JSON.parse(data)
       else
@@ -56,9 +57,8 @@ module Compliance
     # return all compliance profiles available for the user
     def self.profiles
       config = Compliance::Configuration.new
-
       url = "#{config['server']}/user/compliance"
-      _success, data = get(url, config['token'], '')
+      _success, data = get(url, config['token'], '', config['insecure'])
 
       if !data.nil?
         profiles = JSON.parse(data)
@@ -86,28 +86,33 @@ module Compliance
       end
     end
 
-    def self.get(url, username, password)
+    def self.get(url, username, password, insecure)
       uri = URI.parse(url)
       req = Net::HTTP::Get.new(uri.path)
       req.basic_auth username, password
 
-      send_request(uri, req)
+      send_request(uri, req, insecure)
     end
 
-    def self.post(url, username, password)
+    def self.post(url, username, password, insecure)
       # form request
       uri = URI.parse(url)
       req = Net::HTTP::Post.new(uri.path)
       req.basic_auth username, password
       req.form_data={}
 
-      send_request(uri, req)
+      send_request(uri, req, insecure)
     end
 
     # upload a file
-    def self.post_file(url, username, password, file_path)
+    def self.post_file(url, username, password, file_path, insecure)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
+
+      # set connection flags
+      http.use_ssl = (uri.scheme == 'https')
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if insecure
+
       req = Net::HTTP::Post.new(uri.path)
       req.basic_auth username, password
 
@@ -123,9 +128,13 @@ module Compliance
       [res.is_a?(Net::HTTPSuccess), res.body]
     end
 
-    def self.send_request(uri, req)
-      # send request
-      res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') {|http|
+    def self.send_request(uri, req, insecure)
+      opts = {
+        use_ssl: uri.scheme == 'https',
+      }
+      opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE if insecure
+
+      res = Net::HTTP.start(uri.host, uri.port, opts) {|http|
         http.request(req)
       }
       [res.is_a?(Net::HTTPSuccess), res.body]

data/lib/bundles/inspec-compliance/cli.rb

@@ -13,8 +13,10 @@ module Compliance
       desc: 'Chef Compliance Username'
     option :password, type: :string, required: true,
       desc: 'Chef Compliance Password'
+    option :insecure, aliases: :k, type: :boolean,
+      desc: 'Explicitly allows InSpec to perform "insecure" SSL connections and transfers'
     def login(server)
-      success, msg = Compliance::API.login(server, options['user'], options['password'])
+      success, msg = Compliance::API.login(server, options['user'], options['password'], options['insecure'])
       if success
         puts 'Successfully authenticated'
       else
@@ -112,7 +114,7 @@ module Compliance
       url = "#{config['server']}/owners/#{owner}/compliance/#{profile_name}/tar"
 
       puts "Uploading to #{url}"
-      success, msg = Compliance::API.post_file(url, config['token'], '', archive_path)
+      success, msg = Compliance::API.post_file(url, config['token'], '', archive_path, config['insecure'])
       if success
         puts 'Successfully uploaded profile'
       else

data/lib/inspec/version.rb

@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.14.6'.freeze
+  VERSION = '0.14.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.14.7
 platform: ruby
 authors:
 - Dominik Richter