vagrant-trellis-cert 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a80cecdab393ada97a1447baafb77d3a170d50e
-  data.tar.gz: 8f08f111c4bc44256828e310ad1e2de232e0c74c
+SHA256:
+  metadata.gz: 8426ab246fa36b2b07c36c0580576787c028f4428eb27f767f726b311e348399
+  data.tar.gz: dc29f4b02bc9e74d5ca740dd86621b78bbe088fb501eb7f639a36a589df9be45
 SHA512:
-  metadata.gz: 6bc2665f000b8b0056d7882dede8363cf4d62359cd455ec337a14dd824260f904abc3a8362af9fa259279cc754144db0ee78e35135382f62692bff20b34b19a9
-  data.tar.gz: 9c47bd2770f4f0218cd9f9e601cbc232d68666494cadd3273b570c1c2339230ba57c8dc7f5b665c3c0133ad9c832423d64ff291e43adc411e4f2d6eac8584271
+  metadata.gz: f6a69f37d240c0aa67ea3c92fc8056823bbe0bcd19a941c98342bab2c3e3561aa00e02ace43948a4864f5e815e560aec2f93e821433c397cae651294a2403c8b
+  data.tar.gz: e035a9c43f9eaae751ce34a60cb4eff15d930011bd79871322744bd2d8067c6b68dd4b6ac6e34bc7e074b62eece73d909cf76ee4cf48c749f1107693a2d25e8b

data/.github_changelog_generator

@@ -1,2 +1,2 @@
 unreleased=true
-future-release=v0.4.0
+future-release=v0.5.0

data/.gitignore

@@ -11,5 +11,5 @@
 .rbenv-gemsets
 .ruby-version
 /.gems/
-
+/vagrant-trellis-cert-*.gem
 .rubocop-http*

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Change Log
 
-## [v0.4.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.4.0) (2017-10-05)
+## [v0.5.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.5.0) (2018-03-29)
+[Full Changelog](https://github.com/TypistTech/vagrant-trellis-cert/compare/v0.4.0...v0.5.0)
+
+**Implemented enhancements:**
+
+- Download cert via ruby's openssl gem [\#41](https://github.com/TypistTech/vagrant-trellis-cert/issues/41)
+
+**Closed issues:**
+
+- No certificate is added to keychain [\#44](https://github.com/TypistTech/vagrant-trellis-cert/issues/44)
+
+**Merged pull requests:**
+
+- Download certificate via Ruby's default openssl wrapper [\#45](https://github.com/TypistTech/vagrant-trellis-cert/pull/45) ([TangRufus](https://github.com/TangRufus))
+- Readme: Warn about `vagrant-triggers` stale development [\#43](https://github.com/TypistTech/vagrant-trellis-cert/pull/43) ([TangRufus](https://github.com/TangRufus))
+
+## [v0.4.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.4.0) (2017-10-04)
 [Full Changelog](https://github.com/TypistTech/vagrant-trellis-cert/compare/v0.3.0...v0.4.0)
 
 **Implemented enhancements:**
@@ -9,6 +25,7 @@
 
 **Merged pull requests:**
 
+- Version bump 0.4.0 [\#39](https://github.com/TypistTech/vagrant-trellis-cert/pull/39) ([TangRufus](https://github.com/TangRufus))
 - Add `distrust` subcommand [\#37](https://github.com/TypistTech/vagrant-trellis-cert/pull/37) ([TangRufus](https://github.com/TangRufus))
 
 ## [v0.3.0](https://github.com/TypistTech/vagrant-trellis-cert/tree/v0.3.0) (2017-09-18)

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem](https://img.shields.io/gem/v/vagrant-trellis-cert.svg)](https://rubygems.org/gems/vagrant-trellis-cert)
 [![Gem](https://img.shields.io/gem/dt/vagrant-trellis-cert.svg)](https://rubygems.org/gems/vagrant-trellis-cert)
-[![Dependency Status](https://gemnasium.com/badges/github.com/TypistTech/vagrant-trellis-cert.svg)](https://gemnasium.com/github.com/TypistTech/vagrant-trellis-cert)
 [![license](https://img.shields.io/github/license/TypistTech/vagrant-trellis-cert.svg)](https://github.com/TypistTech/vagrant-trellis-cert/blob/master/LICENSE)
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.typist.tech/donate/vagrant-trellis-cert/)
 [![Hire Typist Tech](https://img.shields.io/badge/Hire-Typist%20Tech-ff69b4.svg)](https://www.typist.tech/contact/)
@@ -13,12 +12,12 @@ Trust Trellis self-signed certificates with a single command
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
+- [Minimum Requirements](#minimum-requirements)
 - [Installation](#installation)
 - [Usage](#usage)
-- [Going super lazy](#going-super-lazy)
-- [Limitations](#limitations)
+- [It looks awesome. Where can I find some more goodies like this?](#it-looks-awesome-where-can-i-find-some-more-goodies-like-this)
 - [Support!](#support)
-  - [Donate via PayPal *](#donate-via-paypal-)
+  - [Donate](#donate)
   - [Why don't you hire me?](#why-dont-you-hire-me)
   - [Want to help in other way? Want to be a sponsor?](#want-to-help-in-other-way-want-to-be-a-sponsor)
 - [Feedback](#feedback)
@@ -29,6 +28,11 @@ Trust Trellis self-signed certificates with a single command
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## Minimum Requirements
+
+- macOS 10.13.3
+- Vagrant 2.0.3
+
 ## Installation
 
 ```bash
@@ -57,43 +61,24 @@ $ vagrant trellis-cert trust fb90ab5
 $ vagrant trellis-cert distrust fb90ab5
 ```
 
-## Going super lazy
-
-If the [vagrant-triggers](https://github.com/emyl/vagrant-triggers) plugin is installed, we can run the command on Vagrant state changes like `vagrant provision`. Add these lines into Trellis' `Vagrantfile`:
-
-```ruby
-# Vagrantfile
-
-# Some lines of code...
-
-Vagrant.configure('2') do |config|
-  # Some more lines of code later...
-
-  config.trigger.after :provision, :stdout => true do
-    run "vagrant trellis-cert trust"
-  end
-
-  config.trigger.after :destroy, :stdout => true do
-    run "vagrant trellis-cert distrust"
-  end
-end
-```
-
-## Limitations
-
-Pull requests are welcome!
+## It looks awesome. Where can I find some more goodies like this?
 
-- Only works on macOS
+* Articles on Typist Tech's [blog](https://typist.tech)
+* [Tang Rufus' WordPress plugins](https://profiles.wordpress.org/tangrufus#content-plugins) on wp.org
+* More projects on [Typist Tech's GitHub profile](https://github.com/TypistTech)
+* Stay tuned on [Typist Tech's newsletter](https://typist.tech/go/newsletter)
+* Follow [Tang Rufus' Twitter account](https://twitter.com/TangRufus)
+* Hire [Tang Rufus](https://typist.tech/contact) to build your next awesome site
 
 ## Support!
 
-### Donate via PayPal [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.typist.tech/donate/vagrant-trellis-cert/)
+### Donate
 
-Love Vagrant Trellis Cert? Help me maintain it, a [donation here](https://www.typist.tech/donate/vagrant-trellis-cert/) can help with it.
+Love Vagrant Trellis Cert? Help me maintain it, a [donation here](https://typist.tech/donation/) can help with it.
 
 ### Why don't you hire me?
 
-Ready to take freelance WordPress jobs. Contact me via the contact form [here](https://www.typist.tech/contact/) or, via email [info@typist.tech](mailto:info@typist.tech)
+Ready to take freelance WordPress jobs. Contact me via the contact form [here](https://typist.tech/contact/) or, via email [info@typist.tech](mailto:info@typist.tech)
 
 ### Want to help in other way? Want to be a sponsor?
 

data/lib/vagrant-trellis-cert.rb

@@ -8,9 +8,9 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-# Requiring 1.9.6 or later because of Ruby 2.3
-if Vagrant::VERSION < '1.9.6'
-  raise 'The Vagrant Trellis Cert plugin is only compatible with Vagrant 1.9.6 or later'
+# Requiring 2.0.3 or later because of Ruby 2.4.2
+if Vagrant::VERSION < '2.0.3'
+  raise 'The Vagrant Trellis Cert plugin is only compatible with Vagrant 2.0.3 or later'
 end
 
 require 'vagrant_plugins/trellis_cert/identity'

data/lib/vagrant_plugins/trellis_cert/certificate.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'socket'
+require 'openssl'
+
+module VagrantPlugins
+  module TrellisCert
+    class Certificate
+      def initialize(host:, tmp_dir:)
+        @host = host
+        @tmp_dir = tmp_dir
+      end
+
+      def download
+        fetch
+
+        File.open(path, 'w') do |file|
+          file.write(@cert.to_der)
+        end
+      end
+
+      def path
+        "#{@tmp_dir}/#{@host}.der"
+      end
+
+      private
+
+      def fetch
+        tcp_client = TCPSocket.new(@host, 443)
+        ssl_client = OpenSSL::SSL::SSLSocket.new(tcp_client)
+        ssl_client.hostname = @host
+        ssl_client.connect
+        @cert = OpenSSL::X509::Certificate.new(ssl_client.peer_cert)
+      ensure
+        ssl_client.sysclose
+        tcp_client.close
+      end
+    end
+  end
+end

data/lib/vagrant_plugins/trellis_cert/command/distrust.rb

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
 
 require 'vagrant_plugins/trellis_cert/ssl_config'
-require 'vagrant_plugins/trellis_cert/system'
+require 'vagrant_plugins/trellis_cert/result'
 
 module VagrantPlugins
   module TrellisCert
     module Command
       class Distrust < Vagrant.plugin('2', :command)
+        KEYCHAIN = '~/Library/Keychains/login.keychain'
+
         def execute
           _options, argv = parse_options!
 
           @env.ui.info('Removing certificates...')
 
-          hosts = SSLConfig.new(root_path: machine_root_path(argv))
-                           .canonicals
-          result = System.build
-                         .distrust(hosts)
+          ssl_config = SSLConfig.new(root_path: machine_root_path(argv))
+
+          result = distrust(ssl_config.canonicals)
 
           result.print(ui: @env.ui)
 
@@ -43,6 +44,16 @@ module VagrantPlugins
             return machine.env.root_path
           end
         end
+
+        def distrust(hosts)
+          Result.new.tap do |result|
+            hosts.map do |host|
+              is_success = system("security delete-certificate -c #{host} #{KEYCHAIN} >/dev/null 2>/dev/null")
+
+              result.add(host: host, is_success: is_success)
+            end
+          end
+        end
       end
     end
   end

data/lib/vagrant_plugins/trellis_cert/command/trust.rb

@@ -1,20 +1,23 @@
 # frozen_string_literal: true
 
+require 'vagrant_plugins/trellis_cert/certificate'
 require 'vagrant_plugins/trellis_cert/ssl_config'
-require 'vagrant_plugins/trellis_cert/system'
+require 'vagrant_plugins/trellis_cert/result'
 
 module VagrantPlugins
   module TrellisCert
     module Command
       class Trust < Vagrant.plugin('2', :command)
+        KEYCHAIN = '~/Library/Keychains/login.keychain'
+
         def execute
           _options, argv = parse_options!
 
           @env.ui.info('Importing certificates...')
 
-          hosts = SSLConfig.new(root_path: machine_root_path(argv))
-                           .canonicals
-          result = trust(hosts)
+          ssl_config = SSLConfig.new(root_path: machine_root_path(argv))
+
+          result = trust(ssl_config.canonicals)
 
           result.print(ui: @env.ui)
 
@@ -47,10 +50,20 @@ module VagrantPlugins
         end
 
         def trust(hosts)
+          result = Result.new
+
           Dir.mktmpdir do |tmp_dir|
-            return System.build
-                         .trust(hosts: hosts, tmp_dir: tmp_dir)
+            hosts.map do |host|
+              certificate = Certificate.new(host: host, tmp_dir: tmp_dir)
+              certificate.download
+
+              is_success = system("security add-trusted-cert -k #{KEYCHAIN} #{certificate.path} >/dev/null 2>/dev/null")
+
+              result.add(host: host, is_success: is_success)
+            end
           end
+
+          result
         end
       end
     end

data/lib/vagrant_plugins/trellis_cert/identity.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       end
 
       def self.version
-        '0.4.0'
+        '0.5.0'
       end
 
       def self.description

data/vagrant-trellis-cert.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://www.typist.tech/projects/vagrant-trellis-cert'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '~> 2.3'
+  spec.required_ruby_version = '~> 2.4.2'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rubocop', '~> 0.50.0'
+  spec.add_development_dependency 'rubocop', '~> 0.54.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-trellis-cert
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tang Rufus
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
 description: 
 email:
 - tangrufus@gmail.com
@@ -72,6 +72,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-trellis-cert.rb
+- lib/vagrant_plugins/trellis_cert/certificate.rb
 - lib/vagrant_plugins/trellis_cert/command/distrust.rb
 - lib/vagrant_plugins/trellis_cert/command/root.rb
 - lib/vagrant_plugins/trellis_cert/command/trust.rb
@@ -80,8 +81,6 @@ files:
 - lib/vagrant_plugins/trellis_cert/plugin.rb
 - lib/vagrant_plugins/trellis_cert/result.rb
 - lib/vagrant_plugins/trellis_cert/ssl_config.rb
-- lib/vagrant_plugins/trellis_cert/system.rb
-- lib/vagrant_plugins/trellis_cert/system/darwin.rb
 - vagrant-trellis-cert.gemspec
 homepage: https://www.typist.tech/projects/vagrant-trellis-cert
 licenses:
@@ -95,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -103,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Trust all Trellis self-signed certificates with single command

data/lib/vagrant_plugins/trellis_cert/system.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'vagrant_plugins/trellis_cert/system/darwin'
-
-module VagrantPlugins
-  module TrellisCert
-    module System
-      def self.build
-        unless Vagrant::Util::Platform.darwin?
-          raise 'vagrant-trellis-cert only works on macOS. Pull requests are welcome.'
-        end
-
-        Darwin.new
-      end
-    end
-  end
-end

data/lib/vagrant_plugins/trellis_cert/system/darwin.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'vagrant_plugins/trellis_cert/result'
-
-module VagrantPlugins
-  module TrellisCert
-    module System
-      class Darwin
-        KEYCHAIN = '~/Library/Keychains/login.keychain'
-
-        def trust(hosts:, tmp_dir:)
-          Result.new.tap do |result|
-            hosts.map do |host|
-              cert_path = "#{tmp_dir}/#{host}.pem"
-
-              # Download cert
-              system("openssl s_client -showcerts -connect #{host}:443 </dev/null 2>/dev/null | \
-              openssl x509 -outform PEM > #{cert_path} 2>/dev/null")
-
-              is_success = system("security add-trusted-cert -k #{KEYCHAIN} #{cert_path} >/dev/null 2>/dev/null")
-
-              result.add(host: host, is_success: is_success)
-            end
-          end
-        end
-
-        def distrust(hosts)
-          Result.new.tap do |result|
-            hosts.map do |host|
-              is_success = system("security delete-certificate -c #{host} #{KEYCHAIN} >/dev/null 2>/dev/null")
-
-              result.add(host: host, is_success: is_success)
-            end
-          end
-        end
-      end
-    end
-  end
-end