yaml_recrypt 0.0.1 → 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +2 -0
- data/LICENSE +22 -201
- data/README.md +2 -3
- data/exe/yaml_recrypt +36 -0
- data/lib/yaml_recrypt.rb +92 -1
- data/lib/yaml_recrypt/eyaml.rb +38 -0
- data/lib/yaml_recrypt/gpg.rb +57 -0
- data/lib/yaml_recrypt/postprocess.rb +33 -0
- data/lib/yaml_recrypt/version.rb +1 -1
- data/yaml_recrypt.gemspec +4 -1
- metadata +38 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a30e4be74e940b9c90604e9d891effdb2cf31016
|
4
|
+
data.tar.gz: 5a04d0a1cbb68392a0f48b476fe580b9b2213558
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c028c2bf60febd192258dad786327b195ec55701b1cd3aaea3b45f443a04082c87d27822379263e6ec7ed4ec43dc0655aff445691e33c8755c21e8b2960420f1
|
7
|
+
data.tar.gz: a1bb7f8c0fedbcbdebb5fdc2f039267683bb6977c39c41a38e577471cfdfe2c0b00e51e473eeab781902b5057aff5cbb12fd14d638bb82b3addedc12e4ba14e9
|
data/.gitignore
CHANGED
data/LICENSE
CHANGED
@@ -1,201 +1,22 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
"You" (or "Your") shall mean an individual or Legal Entity
|
24
|
-
exercising permissions granted by this License.
|
25
|
-
|
26
|
-
"Source" form shall mean the preferred form for making modifications,
|
27
|
-
including but not limited to software source code, documentation
|
28
|
-
source, and configuration files.
|
29
|
-
|
30
|
-
"Object" form shall mean any form resulting from mechanical
|
31
|
-
transformation or translation of a Source form, including but
|
32
|
-
not limited to compiled object code, generated documentation,
|
33
|
-
and conversions to other media types.
|
34
|
-
|
35
|
-
"Work" shall mean the work of authorship, whether in Source or
|
36
|
-
Object form, made available under the License, as indicated by a
|
37
|
-
copyright notice that is included in or attached to the work
|
38
|
-
(an example is provided in the Appendix below).
|
39
|
-
|
40
|
-
"Derivative Works" shall mean any work, whether in Source or Object
|
41
|
-
form, that is based on (or derived from) the Work and for which the
|
42
|
-
editorial revisions, annotations, elaborations, or other modifications
|
43
|
-
represent, as a whole, an original work of authorship. For the purposes
|
44
|
-
of this License, Derivative Works shall not include works that remain
|
45
|
-
separable from, or merely link (or bind by name) to the interfaces of,
|
46
|
-
the Work and Derivative Works thereof.
|
47
|
-
|
48
|
-
"Contribution" shall mean any work of authorship, including
|
49
|
-
the original version of the Work and any modifications or additions
|
50
|
-
to that Work or Derivative Works thereof, that is intentionally
|
51
|
-
submitted to Licensor for inclusion in the Work by the copyright owner
|
52
|
-
or by an individual or Legal Entity authorized to submit on behalf of
|
53
|
-
the copyright owner. For the purposes of this definition, "submitted"
|
54
|
-
means any form of electronic, verbal, or written communication sent
|
55
|
-
to the Licensor or its representatives, including but not limited to
|
56
|
-
communication on electronic mailing lists, source code control systems,
|
57
|
-
and issue tracking systems that are managed by, or on behalf of, the
|
58
|
-
Licensor for the purpose of discussing and improving the Work, but
|
59
|
-
excluding communication that is conspicuously marked or otherwise
|
60
|
-
designated in writing by the copyright owner as "Not a Contribution."
|
61
|
-
|
62
|
-
"Contributor" shall mean Licensor and any individual or Legal Entity
|
63
|
-
on behalf of whom a Contribution has been received by Licensor and
|
64
|
-
subsequently incorporated within the Work.
|
65
|
-
|
66
|
-
2. Grant of Copyright License. Subject to the terms and conditions of
|
67
|
-
this License, each Contributor hereby grants to You a perpetual,
|
68
|
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
69
|
-
copyright license to reproduce, prepare Derivative Works of,
|
70
|
-
publicly display, publicly perform, sublicense, and distribute the
|
71
|
-
Work and such Derivative Works in Source or Object form.
|
72
|
-
|
73
|
-
3. Grant of Patent License. Subject to the terms and conditions of
|
74
|
-
this License, each Contributor hereby grants to You a perpetual,
|
75
|
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
76
|
-
(except as stated in this section) patent license to make, have made,
|
77
|
-
use, offer to sell, sell, import, and otherwise transfer the Work,
|
78
|
-
where such license applies only to those patent claims licensable
|
79
|
-
by such Contributor that are necessarily infringed by their
|
80
|
-
Contribution(s) alone or by combination of their Contribution(s)
|
81
|
-
with the Work to which such Contribution(s) was submitted. If You
|
82
|
-
institute patent litigation against any entity (including a
|
83
|
-
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
84
|
-
or a Contribution incorporated within the Work constitutes direct
|
85
|
-
or contributory patent infringement, then any patent licenses
|
86
|
-
granted to You under this License for that Work shall terminate
|
87
|
-
as of the date such litigation is filed.
|
88
|
-
|
89
|
-
4. Redistribution. You may reproduce and distribute copies of the
|
90
|
-
Work or Derivative Works thereof in any medium, with or without
|
91
|
-
modifications, and in Source or Object form, provided that You
|
92
|
-
meet the following conditions:
|
93
|
-
|
94
|
-
(a) You must give any other recipients of the Work or
|
95
|
-
Derivative Works a copy of this License; and
|
96
|
-
|
97
|
-
(b) You must cause any modified files to carry prominent notices
|
98
|
-
stating that You changed the files; and
|
99
|
-
|
100
|
-
(c) You must retain, in the Source form of any Derivative Works
|
101
|
-
that You distribute, all copyright, patent, trademark, and
|
102
|
-
attribution notices from the Source form of the Work,
|
103
|
-
excluding those notices that do not pertain to any part of
|
104
|
-
the Derivative Works; and
|
105
|
-
|
106
|
-
(d) If the Work includes a "NOTICE" text file as part of its
|
107
|
-
distribution, then any Derivative Works that You distribute must
|
108
|
-
include a readable copy of the attribution notices contained
|
109
|
-
within such NOTICE file, excluding those notices that do not
|
110
|
-
pertain to any part of the Derivative Works, in at least one
|
111
|
-
of the following places: within a NOTICE text file distributed
|
112
|
-
as part of the Derivative Works; within the Source form or
|
113
|
-
documentation, if provided along with the Derivative Works; or,
|
114
|
-
within a display generated by the Derivative Works, if and
|
115
|
-
wherever such third-party notices normally appear. The contents
|
116
|
-
of the NOTICE file are for informational purposes only and
|
117
|
-
do not modify the License. You may add Your own attribution
|
118
|
-
notices within Derivative Works that You distribute, alongside
|
119
|
-
or as an addendum to the NOTICE text from the Work, provided
|
120
|
-
that such additional attribution notices cannot be construed
|
121
|
-
as modifying the License.
|
122
|
-
|
123
|
-
You may add Your own copyright statement to Your modifications and
|
124
|
-
may provide additional or different license terms and conditions
|
125
|
-
for use, reproduction, or distribution of Your modifications, or
|
126
|
-
for any such Derivative Works as a whole, provided Your use,
|
127
|
-
reproduction, and distribution of the Work otherwise complies with
|
128
|
-
the conditions stated in this License.
|
129
|
-
|
130
|
-
5. Submission of Contributions. Unless You explicitly state otherwise,
|
131
|
-
any Contribution intentionally submitted for inclusion in the Work
|
132
|
-
by You to the Licensor shall be under the terms and conditions of
|
133
|
-
this License, without any additional terms or conditions.
|
134
|
-
Notwithstanding the above, nothing herein shall supersede or modify
|
135
|
-
the terms of any separate license agreement you may have executed
|
136
|
-
with Licensor regarding such Contributions.
|
137
|
-
|
138
|
-
6. Trademarks. This License does not grant permission to use the trade
|
139
|
-
names, trademarks, service marks, or product names of the Licensor,
|
140
|
-
except as required for reasonable and customary use in describing the
|
141
|
-
origin of the Work and reproducing the content of the NOTICE file.
|
142
|
-
|
143
|
-
7. Disclaimer of Warranty. Unless required by applicable law or
|
144
|
-
agreed to in writing, Licensor provides the Work (and each
|
145
|
-
Contributor provides its Contributions) on an "AS IS" BASIS,
|
146
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
147
|
-
implied, including, without limitation, any warranties or conditions
|
148
|
-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
149
|
-
PARTICULAR PURPOSE. You are solely responsible for determining the
|
150
|
-
appropriateness of using or redistributing the Work and assume any
|
151
|
-
risks associated with Your exercise of permissions under this License.
|
152
|
-
|
153
|
-
8. Limitation of Liability. In no event and under no legal theory,
|
154
|
-
whether in tort (including negligence), contract, or otherwise,
|
155
|
-
unless required by applicable law (such as deliberate and grossly
|
156
|
-
negligent acts) or agreed to in writing, shall any Contributor be
|
157
|
-
liable to You for damages, including any direct, indirect, special,
|
158
|
-
incidental, or consequential damages of any character arising as a
|
159
|
-
result of this License or out of the use or inability to use the
|
160
|
-
Work (including but not limited to damages for loss of goodwill,
|
161
|
-
work stoppage, computer failure or malfunction, or any and all
|
162
|
-
other commercial damages or losses), even if such Contributor
|
163
|
-
has been advised of the possibility of such damages.
|
164
|
-
|
165
|
-
9. Accepting Warranty or Additional Liability. While redistributing
|
166
|
-
the Work or Derivative Works thereof, You may choose to offer,
|
167
|
-
and charge a fee for, acceptance of support, warranty, indemnity,
|
168
|
-
or other liability obligations and/or rights consistent with this
|
169
|
-
License. However, in accepting such obligations, You may act only
|
170
|
-
on Your own behalf and on Your sole responsibility, not on behalf
|
171
|
-
of any other Contributor, and only if You agree to indemnify,
|
172
|
-
defend, and hold each Contributor harmless for any liability
|
173
|
-
incurred by, or claims asserted against, such Contributor by reason
|
174
|
-
of your accepting any such warranty or additional liability.
|
175
|
-
|
176
|
-
END OF TERMS AND CONDITIONS
|
177
|
-
|
178
|
-
APPENDIX: How to apply the Apache License to your work.
|
179
|
-
|
180
|
-
To apply the Apache License to your work, attach the following
|
181
|
-
boilerplate notice, with the fields enclosed by brackets "{}"
|
182
|
-
replaced with your own identifying information. (Don't include
|
183
|
-
the brackets!) The text should be enclosed in the appropriate
|
184
|
-
comment syntax for the file format. We also recommend that a
|
185
|
-
file or class name and description of purpose be included on the
|
186
|
-
same "printed page" as the copyright notice for easier
|
187
|
-
identification within third-party archives.
|
188
|
-
|
189
|
-
Copyright {yyyy} {name of copyright owner}
|
190
|
-
|
191
|
-
Licensed under the Apache License, Version 2.0 (the "License");
|
192
|
-
you may not use this file except in compliance with the License.
|
193
|
-
You may obtain a copy of the License at
|
194
|
-
|
195
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
196
|
-
|
197
|
-
Unless required by applicable law or agreed to in writing, software
|
198
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
199
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
200
|
-
See the License for the specific language governing permissions and
|
201
|
-
limitations under the License.
|
1
|
+
The MIT License (MIT)
|
2
|
+
|
3
|
+
Copyright (c) 2017 Geoff Williams
|
4
|
+
Copyright (c) 2013 Simon Hildrew
|
5
|
+
Copyright (c) 2013 Tom Poulton
|
6
|
+
|
7
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
8
|
+
this software and associated documentation files (the "Software"), to deal in
|
9
|
+
the Software without restriction, including without limitation the rights to
|
10
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
11
|
+
the Software, and to permit persons to whom the Software is furnished to do so,
|
12
|
+
subject to the following conditions:
|
13
|
+
|
14
|
+
The above copyright notice and this permission notice shall be included in all
|
15
|
+
copies or substantial portions of the Software.
|
16
|
+
|
17
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
18
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
19
|
+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
20
|
+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
21
|
+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
22
|
+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
CHANGED
@@ -1,8 +1,8 @@
|
|
1
|
+
[![Build Status](https://travis-ci.org/GeoffWilliams/yaml_recrypt.svg?branch=master)](https://travis-ci.org/GeoffWilliams/yaml_recrypt)
|
1
2
|
# YamlRecrypt
|
2
3
|
|
3
|
-
|
4
|
+
Handy small tool for parsing YAML files and finding the keys that are encrypted with GPG. These can then be decrypted and then rencrypted with eyaml before saving the file again. This can be useful if you have 300 or so GPG encrypted hiera values and you realise that Hiera-GPG is [EOLed](https://github.com/crayfishx/hiera-gpg) and may or may not work
|
4
5
|
|
5
|
-
TODO: Delete this and the text above, and describe your gem
|
6
6
|
|
7
7
|
## Installation
|
8
8
|
|
@@ -33,4 +33,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
|
|
33
33
|
## Contributing
|
34
34
|
|
35
35
|
Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/yaml_recrypt.
|
36
|
-
|
data/exe/yaml_recrypt
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
require 'escort'
|
3
|
+
require 'yaml_recrypt'
|
4
|
+
require 'yaml_recrypt/version'
|
5
|
+
|
6
|
+
#ARGV.unshift('convert')
|
7
|
+
Escort::App.create do |app|
|
8
|
+
app.version YamlRecrypt::VERSION
|
9
|
+
app.summary "yaml_recrypt"
|
10
|
+
app.description "convert eyaml-gpg encrypted data to regular eyaml"
|
11
|
+
|
12
|
+
app.command :convert do |command|
|
13
|
+
command.summary "recursively convert all eyaml-gpg encrypted files to be regular eyaml"
|
14
|
+
command.options do |opts|
|
15
|
+
opts.opt(:eyaml_pub_key,
|
16
|
+
'Public eyaml key to re-encrypt data against',
|
17
|
+
:long => '--eyaml-pub-key',
|
18
|
+
:type => :string,
|
19
|
+
)
|
20
|
+
opts.opt(:gpg_home,
|
21
|
+
'Path to the GPG homedir (usually ~/.gpg)',
|
22
|
+
:long => '--gpg-home',
|
23
|
+
:type => :string,
|
24
|
+
)
|
25
|
+
end
|
26
|
+
command.action do |options, arguments|
|
27
|
+
eyaml_pub_key = options[:global][:commands][:convert][:options][:eyaml_pub_key]
|
28
|
+
gpg_home = options[:global][:commands][:convert][:options][:gpg_home]
|
29
|
+
if eyaml_pub_key == nil or gpg_home == nil
|
30
|
+
raise "Both --eyaml-pub-key and --gpg-private-key must be specified"
|
31
|
+
else
|
32
|
+
puts YamlRecrypt::recrypt_r(Dir.pwd, gpg_home, eyaml_pub_key)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
data/lib/yaml_recrypt.rb
CHANGED
@@ -1,5 +1,96 @@
|
|
1
1
|
require "yaml_recrypt/version"
|
2
|
+
require "yaml_recrypt/gpg"
|
3
|
+
require "yaml_recrypt/eyaml"
|
4
|
+
require "yaml_recrypt/postprocess"
|
5
|
+
require 'find'
|
6
|
+
require 'escort'
|
7
|
+
require 'yaml'
|
8
|
+
require 'fileutils'
|
9
|
+
require 'gpgme'
|
10
|
+
require 'openssl'
|
2
11
|
|
3
12
|
module YamlRecrypt
|
4
|
-
|
13
|
+
GPG_MAGIC = "-----BEGIN PGP MESSAGE-----"
|
14
|
+
BACKUP_EXT = "orig"
|
15
|
+
|
16
|
+
def self.recrypt_file(filename, gpg_home, eyaml_pub_key)
|
17
|
+
Escort::Logger.output.puts "Processing #{filename}"
|
18
|
+
|
19
|
+
# load the yaml into a hash
|
20
|
+
hash_wip = YAML.load(File.readlines(filename).join("\n"))
|
21
|
+
|
22
|
+
# descend every key until a string (or terminal) is reached
|
23
|
+
#converted =
|
24
|
+
replaced, converted = descend(gpg_home, eyaml_pub_key, hash_wip)
|
25
|
+
|
26
|
+
if replaced > 0
|
27
|
+
Escort::Logger.output.puts "*** updated #{replaced} values in #{filename} ****"
|
28
|
+
# save old file with .orig -- some fool might run this on a non-version
|
29
|
+
# controlled directory...
|
30
|
+
FileUtils.cp(filename, "#{filename}.#{BACKUP_EXT}")
|
31
|
+
|
32
|
+
# save the new data
|
33
|
+
File.open(filename, 'w') {|f| f.write hash_wip.to_yaml }
|
34
|
+
|
35
|
+
# Post-process the data to convert yaml multi-line blocks into yaml folded
|
36
|
+
# blocks
|
37
|
+
YamlRecrypt::PostProcess::postprocess(filename)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.descend(gpg_home, eyaml_pub_key, value)
|
42
|
+
replaced = 0
|
43
|
+
if value.class == Array
|
44
|
+
value = value.map { |e|
|
45
|
+
r, newvalue = process_value(e, gpg_home, eyaml_pub_key)
|
46
|
+
replaced += r
|
47
|
+
|
48
|
+
newvalue
|
49
|
+
}
|
50
|
+
elsif value.class == Hash
|
51
|
+
value.each { |k,v|
|
52
|
+
begin
|
53
|
+
r, subtree = descend(gpg_home, eyaml_pub_key, v)
|
54
|
+
value[k] = subtree
|
55
|
+
replaced += r
|
56
|
+
rescue GPGME::Error::NoData
|
57
|
+
raise("Invalid GPG data detected in key #{k}")
|
58
|
+
end
|
59
|
+
}
|
60
|
+
else
|
61
|
+
r, value = process_value(value, gpg_home, eyaml_pub_key)
|
62
|
+
replaced += r
|
63
|
+
end
|
64
|
+
|
65
|
+
return replaced, value
|
66
|
+
end
|
67
|
+
|
68
|
+
def self.process_value(value, gpg_home, eyaml_pub_key)
|
69
|
+
split = value.split("\n")
|
70
|
+
|
71
|
+
# PGP values are always broken onto newlines
|
72
|
+
if split[0].strip == '' and split[1].strip == GPG_MAGIC
|
73
|
+
value = recrypt(value, gpg_home, eyaml_pub_key)
|
74
|
+
changed = 1
|
75
|
+
else
|
76
|
+
changed = 0
|
77
|
+
end
|
78
|
+
|
79
|
+
return changed, value
|
80
|
+
end
|
81
|
+
|
82
|
+
def self.recrypt_r(dir, gpg_home, eyaml_pub_key)
|
83
|
+
Find.find(dir) do |path|
|
84
|
+
if path =~ /.*\.yaml$/
|
85
|
+
recrypt_file(path, gpg_home, eyaml_pub_key)
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
end
|
90
|
+
|
91
|
+
def self.recrypt(gpg_ct, gpg_home, eyaml_pub_key)
|
92
|
+
pt = YamlRecrypt::Gpg::decrypt(gpg_ct, gpg_home)
|
93
|
+
|
94
|
+
YamlRecrypt::Eyaml::encrypt_and_encode(pt, eyaml_pub_key).strip
|
95
|
+
end
|
5
96
|
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
# sourced from: https://github.com/voxpupuli/hiera-eyaml
|
2
|
+
# file: /hiera/backend/eyaml/encryptors/pkcs7.rb
|
3
|
+
require 'openssl'
|
4
|
+
require 'base64'
|
5
|
+
module YamlRecrypt
|
6
|
+
module Eyaml
|
7
|
+
|
8
|
+
def self.encrypt(pt, eyaml_pub_key)
|
9
|
+
public_key_pem = File.read eyaml_pub_key
|
10
|
+
public_key_x509 = OpenSSL::X509::Certificate.new( public_key_pem )
|
11
|
+
|
12
|
+
cipher = OpenSSL::Cipher::AES.new(256, :CBC)
|
13
|
+
OpenSSL::PKCS7::encrypt([public_key_x509], pt, cipher, OpenSSL::PKCS7::BINARY).to_der
|
14
|
+
end
|
15
|
+
|
16
|
+
def self.encrypt_and_encode(pt, eyaml_pub_key)
|
17
|
+
# eyaml has its own YAML encryption standard which we must cludge/copy ;-)
|
18
|
+
# basically we wedge the cyphertext inside `ENC[...]` with some metadata
|
19
|
+
# see /lib/hiera/backend/eyaml/parser/encrypted_tokens.rb (to_encrypted)
|
20
|
+
ct = encrypt(pt, eyaml_pub_key)
|
21
|
+
ct64 = Base64.encode64(ct).strip
|
22
|
+
return "ENC[PKCS7,#{ct64}]"
|
23
|
+
end
|
24
|
+
|
25
|
+
|
26
|
+
def self.decrypt(ct, eyaml_pub_key, eyaml_prv_key)
|
27
|
+
private_key_pem = File.read eyaml_prv_key
|
28
|
+
private_key_rsa = OpenSSL::PKey::RSA.new( private_key_pem )
|
29
|
+
|
30
|
+
public_key_pem = File.read eyaml_pub_key
|
31
|
+
public_key_x509 = OpenSSL::X509::Certificate.new( public_key_pem )
|
32
|
+
|
33
|
+
pkcs7 = OpenSSL::PKCS7.new( ct )
|
34
|
+
pkcs7.decrypt(private_key_rsa, public_key_x509)
|
35
|
+
end
|
36
|
+
|
37
|
+
end
|
38
|
+
end
|
@@ -0,0 +1,57 @@
|
|
1
|
+
# Sourced from https://github.com/sihil/hiera-eyaml-gpg
|
2
|
+
# file: /lib/hiera/backend/eyaml/encryptors/gpg.rb
|
3
|
+
module YamlRecrypt
|
4
|
+
module Gpg
|
5
|
+
def self.gnupghome
|
6
|
+
gnupghome = self.option :gnupghome
|
7
|
+
debug("GNUPGHOME is #{gnupghome}")
|
8
|
+
if gnupghome.nil? || gnupghome.empty?
|
9
|
+
warn("No GPG home directory configured, check gpg_gnupghome configuration value is correct")
|
10
|
+
raise ArgumentError, "No GPG home directory configured, check gpg_gnupghome configuration value is correct"
|
11
|
+
elsif !File.directory?(gnupghome)
|
12
|
+
warn("Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct")
|
13
|
+
raise ArgumentError, "Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct"
|
14
|
+
else
|
15
|
+
gnupghome
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
|
20
|
+
|
21
|
+
def self.decrypt(ciphertext, gpg_home)
|
22
|
+
gnupghome = gpg_home
|
23
|
+
|
24
|
+
GPGME::Engine.home_dir = gnupghome
|
25
|
+
|
26
|
+
ctx = GPGME::Ctx.new
|
27
|
+
# Example of how to add support for asking the passphrase
|
28
|
+
# if hiera?
|
29
|
+
# GPGME::Ctx.new
|
30
|
+
# else
|
31
|
+
# GPGME::Ctx.new(:passphrase_callback => method(:passfunc))
|
32
|
+
# end
|
33
|
+
|
34
|
+
if !ctx.keys.empty?
|
35
|
+
raw = GPGME::Data.new(ciphertext)
|
36
|
+
txt = GPGME::Data.new
|
37
|
+
|
38
|
+
begin
|
39
|
+
txt = ctx.decrypt(raw)
|
40
|
+
rescue GPGME::Error::DecryptFailed => e
|
41
|
+
warn("Fatal: Failed to decrypt ciphertext (check settings and that you are a recipient)")
|
42
|
+
raise e
|
43
|
+
rescue Exception => e
|
44
|
+
warn("Warning: General exception decrypting GPG file")
|
45
|
+
raise e
|
46
|
+
end
|
47
|
+
|
48
|
+
txt.seek 0
|
49
|
+
txt.read
|
50
|
+
else
|
51
|
+
warn("No usable keys found in #{gnupghome}. Check :gpg_gnupghome value in hiera.yaml is correct")
|
52
|
+
raise ArgumentError, "No usable keys found in #{gnupghome}. Check :gpg_gnupghome value in hiera.yaml is correct"
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
end
|
57
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
module YamlRecrypt
|
2
|
+
module PostProcess
|
3
|
+
|
4
|
+
def self.postprocess(filename)
|
5
|
+
lines = File.readlines(filename)
|
6
|
+
fix_encoding(lines)
|
7
|
+
File.open(filename, "w") do |f|
|
8
|
+
f.puts(lines)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.fix_encoding(raw_lines)
|
13
|
+
i = 0;
|
14
|
+
while i < raw_lines.size
|
15
|
+
if i+1 < raw_lines.size
|
16
|
+
# we have to lookahead 1 line so make sure we're not already at the EOF
|
17
|
+
# if we scan one line ahead
|
18
|
+
if raw_lines[i+1] =~ /ENC\[PKCS7/
|
19
|
+
# this is an eyaml block, change the pipe dash to be a chevron if needed
|
20
|
+
if ! (raw_lines[i] =~ />/)
|
21
|
+
# needs fix
|
22
|
+
raw_lines[i] = raw_lines[i].gsub(/\|-/,'>')
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
i += 1
|
27
|
+
end
|
28
|
+
|
29
|
+
# adjustments were made in-place so void
|
30
|
+
end
|
31
|
+
|
32
|
+
end
|
33
|
+
end
|
data/lib/yaml_recrypt/version.rb
CHANGED
data/yaml_recrypt.gemspec
CHANGED
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
|
|
8
8
|
spec.version = YamlRecrypt::VERSION
|
9
9
|
spec.authors = ["Geoff Williams"]
|
10
10
|
spec.email = ["geoff@geoffwilliams.me.uk"]
|
11
|
-
|
11
|
+
spec.license = "MIT"
|
12
12
|
spec.summary = %q{ Decrypt GPG encrypted yaml file keys and re-encrypt them using eyaml since GPG backend is EOLed (Puppet/Hiera) }
|
13
13
|
spec.homepage = "https://github.com/GeoffWilliams/yaml_recrypt"
|
14
14
|
|
@@ -22,4 +22,7 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.add_development_dependency "bundler", "~> 1.14"
|
23
23
|
spec.add_development_dependency "rake", "~> 10.0"
|
24
24
|
spec.add_development_dependency "rspec", "~> 3.0"
|
25
|
+
|
26
|
+
spec.add_dependency "escort", "0.4.0"
|
27
|
+
spec.add_dependency "gpgme", "2.0.12"
|
25
28
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: yaml_recrypt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0
|
4
|
+
version: 0.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Geoff Williams
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-04-
|
11
|
+
date: 2017-04-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -52,10 +52,39 @@ dependencies:
|
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '3.0'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: escort
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - '='
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 0.4.0
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - '='
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 0.4.0
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: gpgme
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - '='
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: 2.0.12
|
76
|
+
type: :runtime
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - '='
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: 2.0.12
|
55
83
|
description:
|
56
84
|
email:
|
57
85
|
- geoff@geoffwilliams.me.uk
|
58
|
-
executables:
|
86
|
+
executables:
|
87
|
+
- yaml_recrypt
|
59
88
|
extensions: []
|
60
89
|
extra_rdoc_files: []
|
61
90
|
files:
|
@@ -68,11 +97,16 @@ files:
|
|
68
97
|
- Rakefile
|
69
98
|
- bin/console
|
70
99
|
- bin/setup
|
100
|
+
- exe/yaml_recrypt
|
71
101
|
- lib/yaml_recrypt.rb
|
102
|
+
- lib/yaml_recrypt/eyaml.rb
|
103
|
+
- lib/yaml_recrypt/gpg.rb
|
104
|
+
- lib/yaml_recrypt/postprocess.rb
|
72
105
|
- lib/yaml_recrypt/version.rb
|
73
106
|
- yaml_recrypt.gemspec
|
74
107
|
homepage: https://github.com/GeoffWilliams/yaml_recrypt
|
75
|
-
licenses:
|
108
|
+
licenses:
|
109
|
+
- MIT
|
76
110
|
metadata: {}
|
77
111
|
post_install_message:
|
78
112
|
rdoc_options: []
|