knife-openvpn 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3420ef260442e7bf370736590957bd1e2596a5f1
-  data.tar.gz: ddcfca24dc03205f9f6024baf6209b5337327c9e
+  metadata.gz: f6d0e8a8e3cbc7fc159f7319c7579af86f97ce04
+  data.tar.gz: 14cf40403d89c4347c9041133e5c181b92b1019d
 SHA512:
-  metadata.gz: 401d1fbf55caafa2f63533b987b339fcb3116e92196a683af199b49fe923eb68ed55df1f5481aa017f4b58e990a4cf120c643777335bc09f380fe2f8f1e47ee3
-  data.tar.gz: acbfcac04453bc4bba63cc7aa68d4aefe3550ea55e3138d86ac127c0f219b2185c167f6d8fcb0755ecc6cf0f87e70132c9b7913f1822f2958db0ea98f3a5bc51
+  metadata.gz: 5480342506ce0996291557aae9091d972032968f17d7e4ac0e6de96f35155e62299f43b6fe64e50a7d5c8a6a0371f1066aefad8987eb071c0a4c0ab50176f691
+  data.tar.gz: df9a18c14f29f87cf50c67ac75ff2b47ee0e666eded5bff7d0e1fc53b4b9ce258ef9ce993cd10968f546d1e29bdb8c9eb74a0f8f13691ad9982668f8fc17252a

data/.rubocop.yml

@@ -9,6 +9,6 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Enabled: false
 Metrics/ClassLength:
-  Max: 153
+  Max: 200
 Metrics/ParameterLists:
   Enabled: false

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.4'
+  gem.version     = '0.0.5'
   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

@@ -34,6 +34,7 @@ module OpenvpnPlugin
       require 'chef/encrypted_data_bag_item'
       require 'json'
       require 'openssl'
+      require 'time'
     end
 
     def check_databag_secret
@@ -142,8 +143,16 @@ module OpenvpnPlugin
       crl.next_update = nextup
       revoke_info.each do|rserial, time, reason_code|
         revoked = OpenSSL::X509::Revoked.new
-        revoked.serial = rserial
-        revoked.time = time
+        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
         enum = OpenSSL::ASN1::Enumerated(reason_code)
         ext = OpenSSL::X509::Extension.new('CRLReason', enum)
         revoked.add_extension(ext)
@@ -181,16 +190,16 @@ module OpenvpnPlugin
       databag_name
     end
 
-    def save_databag_item(id, server_name, item_hash)
+    def save_databag_item(id, server_name, item_hash, force = false)
       databag_path = get_databag_path server_name
       item_hash['id'] = id
       item_path = File.join(databag_path, "#{id}.json")
       secret = load_databag_secret
       encrypted_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(item_hash, secret)
-      if File.exist? item_path
-        fail_with "#{item_path} already exists"
-      else
+      if force || !File.exist?(item_path)
         File.write item_path, JSON.pretty_generate(encrypted_data)
+      else
+        fail_with "#{item_path} already exists"
       end
     end
 
@@ -474,7 +483,7 @@ module OpenvpnPlugin
       user_revoke_info = [[user_cert.serial, now, 0]]
       new_revoke_info = revoke_info + user_revoke_info
       new_crl = add_user_to_crl ca_cert, ca_key, old_crl, new_revoke_info
-      save_databag_item('openvpn-crl', server_name, 'crl' => new_crl.to_pem, 'revoke_info' => new_revoke_info)
+      save_databag_item('openvpn-crl', server_name, { 'crl' => new_crl.to_pem, 'revoke_info' => new_revoke_info }, true)
       ui.info "revoked #{user_name}, do not forget to upload CRL databag item"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-openvpn
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - LLC Express 42
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies: []
 description: A knife plugin for Express 42 openvpn cookbook
 email: cookbooks@express42.com