knife-openvpn 0.0.3 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop.yml +1 -1
- data/CHANGELOG.md +2 -0
- data/knife-openvpn.gemspec +1 -1
- data/lib/chef/knife/openvpn.rb +12 -3
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3420ef260442e7bf370736590957bd1e2596a5f1
|
4
|
+
data.tar.gz: ddcfca24dc03205f9f6024baf6209b5337327c9e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 401d1fbf55caafa2f63533b987b339fcb3116e92196a683af199b49fe923eb68ed55df1f5481aa017f4b58e990a4cf120c643777335bc09f380fe2f8f1e47ee3
|
7
|
+
data.tar.gz: acbfcac04453bc4bba63cc7aa68d4aefe3550ea55e3138d86ac127c0f219b2185c167f6d8fcb0755ecc6cf0f87e70132c9b7913f1822f2958db0ea98f3a5bc51
|
data/.rubocop.yml
CHANGED
data/CHANGELOG.md
ADDED
data/knife-openvpn.gemspec
CHANGED
@@ -3,7 +3,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
|
|
3
3
|
|
4
4
|
Gem::Specification.new do |gem|
|
5
5
|
gem.name = 'knife-openvpn'
|
6
|
-
gem.version = '0.0.
|
6
|
+
gem.version = '0.0.4'
|
7
7
|
gem.summary = 'A knife plugin for Express 42 openvpn cookbook'
|
8
8
|
gem.description = gem.summary
|
9
9
|
gem.authors = ['LLC Express 42']
|
data/lib/chef/knife/openvpn.rb
CHANGED
@@ -161,9 +161,13 @@ module OpenvpnPlugin
|
|
161
161
|
crl
|
162
162
|
end
|
163
163
|
|
164
|
-
def load_cert_and_key(cert_str, key_str)
|
164
|
+
def load_cert_and_key(cert_str, key_str, force = false)
|
165
165
|
cert = OpenSSL::X509::Certificate.new cert_str
|
166
|
-
key =
|
166
|
+
key = if force
|
167
|
+
key_str
|
168
|
+
else
|
169
|
+
OpenSSL::PKey::RSA.new key_str
|
170
|
+
end
|
167
171
|
[cert, key]
|
168
172
|
end
|
169
173
|
|
@@ -438,6 +442,11 @@ module OpenvpnPlugin
|
|
438
442
|
description: 'Specifies path to encrypred data bag secret file.',
|
439
443
|
default: '.chef/encrypted_data_bag_secret'
|
440
444
|
|
445
|
+
option :force,
|
446
|
+
long: '--force',
|
447
|
+
description: 'Force a user revoke without the key passphrase.',
|
448
|
+
default: false
|
449
|
+
|
441
450
|
def run
|
442
451
|
check_arguments
|
443
452
|
server_name = name_args[0]
|
@@ -461,7 +470,7 @@ module OpenvpnPlugin
|
|
461
470
|
revoke_info = []
|
462
471
|
end
|
463
472
|
user_item = load_databag_item(databag_name, user_name)
|
464
|
-
user_cert, _user_key = load_cert_and_key user_item['cert'], user_item['key']
|
473
|
+
user_cert, _user_key = load_cert_and_key user_item['cert'], user_item['key'], config[:force]
|
465
474
|
user_revoke_info = [[user_cert.serial, now, 0]]
|
466
475
|
new_revoke_info = revoke_info + user_revoke_info
|
467
476
|
new_crl = add_user_to_crl ca_cert, ca_key, old_crl, new_revoke_info
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-openvpn
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- LLC Express 42
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-09-
|
11
|
+
date: 2015-09-24 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: A knife plugin for Express 42 openvpn cookbook
|
14
14
|
email: cookbooks@express42.com
|
@@ -19,6 +19,7 @@ files:
|
|
19
19
|
- ".gitignore"
|
20
20
|
- ".rubocop.yml"
|
21
21
|
- ".travis.yml"
|
22
|
+
- CHANGELOG.md
|
22
23
|
- Gemfile
|
23
24
|
- LICENSE
|
24
25
|
- README.md
|