knife-openvpn 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d0e8a8e3cbc7fc159f7319c7579af86f97ce04
-  data.tar.gz: 14cf40403d89c4347c9041133e5c181b92b1019d
+  metadata.gz: aff7e11b6411be2b86730f40fd83dcbce657bd51
+  data.tar.gz: e0ca84c8956e28d8afd1fc0fffbbf7790d091261
 SHA512:
-  metadata.gz: 5480342506ce0996291557aae9091d972032968f17d7e4ac0e6de96f35155e62299f43b6fe64e50a7d5c8a6a0371f1066aefad8987eb071c0a4c0ab50176f691
-  data.tar.gz: df9a18c14f29f87cf50c67ac75ff2b47ee0e666eded5bff7d0e1fc53b4b9ce258ef9ce993cd10968f546d1e29bdb8c9eb74a0f8f13691ad9982668f8fc17252a
+  metadata.gz: acd8bceffc2342824622ac68f109eef5b2b2a2d93b0049d43a8abe1f3d5e5fa7f7a48c11753b8c5c3def78885ea9aa17dd7aeca5adc9b716ad3de7582c2ec816
+  data.tar.gz: 24898768d4ef2e448aba8667c6427db3578febe7023df299b365d74333bc2d18faa9f71a4b7c3a96f97edbb95ea3c7ccb5a917c5172ecdae470b7a382c0e52a0

data/.rubocop.yml

@@ -1,3 +1,5 @@
+AllCops:
+  DisplayCopNames: true
 Metrics/AbcSize:
   Enabled: false
 Style/GuardClause:
@@ -12,3 +14,5 @@ Metrics/ClassLength:
   Max: 200
 Metrics/ParameterLists:
   Enabled: false
+Style/NumericLiteralPrefix:
+  EnforcedOctalStyle: zero_only

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## 0.0.6 (Sep 12, 2016)
+* New "remote" attribute for multiple servers in client config
+
 ## 0.0.4 (Sep 24, 2015)
 * add --force option for user certificate revokation

data/knife-openvpn.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'knife-openvpn'
-  gem.version     = '0.0.5'
+  gem.version     = '0.0.6'
   gem.summary     = 'A knife plugin for Express 42 openvpn cookbook'
   gem.description = gem.summary
   gem.authors     = ['LLC Express 42']

data/lib/chef/knife/openvpn.rb

@@ -135,24 +135,27 @@ module OpenvpnPlugin
     end
 
     def issue_crl(revoke_info, serial, lastup, nextup, extensions,
-                 issuer, issuer_key, digest)
+                  issuer, issuer_key, digest)
       crl = OpenSSL::X509::CRL.new
       crl.issuer = issuer.subject
       crl.version = 1
       crl.last_update = lastup
       crl.next_update = nextup
-      revoke_info.each do|rserial, time, reason_code|
+      revoke_info.each do |rserial, time, reason_code|
         revoked = OpenSSL::X509::Revoked.new
-        if rserial.is_a? OpenSSL::BN
-          revoked.serial = rserial
-        else
-          revoked.serial = OpenSSL::BN.new(rserial)
-        end
-        if time.is_a? Time
-          revoked.time = time
-        else
-          revoked.time = Time.parse(time)
-        end
+
+        revoked.serial = if rserial.is_a? OpenSSL::BN
+                           rserial
+                         else
+                           OpenSSL::BN.new(rserial)
+                         end
+
+        revoked.time = if time.is_a?
+                         time
+                       else
+                         Time.parse(time)
+                       end
+
         enum = OpenSSL::ASN1::Enumerated(reason_code)
         ext = OpenSSL::X509::Extension.new('CRLReason', enum)
         revoked.add_extension(ext)
@@ -163,7 +166,7 @@ module OpenvpnPlugin
       ef.crl = crl
       crlnum = OpenSSL::ASN1::Integer(serial)
       crl.add_extension(OpenSSL::X509::Extension.new('crlNumber', crlnum))
-      extensions.each do|oid, value, critical|
+      extensions.each do |oid, value, critical|
         crl.add_extension(ef.create_extension(oid, value, critical))
       end
       crl.sign(issuer_key, digest)
@@ -374,11 +377,9 @@ module OpenvpnPlugin
       user_item = load_databag_item(databag_name, user_name)
       user_cert, _user_key = load_cert_and_key user_item['cert'], user_item['key']
       tmpdir = Dir.mktmpdir
-      ui.msg "created tmpdir: #{tmpdir}"
       begin
         user_dir = "#{tmpdir}/#{user_name}-vpn"
         Dir.mkdir user_dir
-        ui.msg "created userdir: #{user_dir}"
         export_file "#{user_dir}/ca.crt", ca_cert.to_pem
         export_file "#{user_dir}/#{user_name}.crt", user_cert.to_pem
         export_file "#{user_dir}/#{user_name}.key", user_item['key'].to_s
@@ -405,8 +406,8 @@ module OpenvpnPlugin
       query = "openvpn_server_name:#{server_name}"
       query_nodes = Chef::Search::Query.new
       search_result = query_nodes.search('node', query)[0]
-      if search_result.length < 1
-        fail_with "Cant find vpn server named '#{server_name}'"
+      if search_result.empty?
+        fail_with "Cant find vpn server named '#{server_name}', chef search for node with attribute openvpn.server_name:#{server_name} return no result"
       end
       config_content = ''
       newline = "\n"
@@ -416,8 +417,14 @@ module OpenvpnPlugin
       config_content << "dev  #{config['dev']}" << newline
       config_content << "proto  #{config['proto']}" << newline
       search_result.each do |result|
-        config_content << "remote  #{result['openvpn'][server_name]['remote_host']} "
-        config_content << "#{config['port']}" << newline
+        if result['openvpn'][server_name]['remote'].nil?
+          config_content << "remote  #{result['openvpn'][server_name]['remote_host']} "
+          config_content << config['port'].to_s << newline
+        else
+          result['openvpn'][server_name]['remote'].each do |remote|
+            config_content << "remote  #{remote}" << newline
+          end
+        end
       end
       config_content << "verb  #{config['verb']}" << newline
       config_content << 'comp-lzo' << newline

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-openvpn
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - LLC Express 42
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies: []
 description: A knife plugin for Express 42 openvpn cookbook
 email: cookbooks@express42.com
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A knife plugin for Express 42 openvpn cookbook