hiera-eyaml 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678588aef70424addfe72a90edea53713e702cd2a55c4f707c19b1eb513f435e
-  data.tar.gz: 7ee2ee82496e760e298181a5109b43da47b260628f5934f950e60db0d67d50e4
+  metadata.gz: 9eb7f6a848fd49e92f95073ea457a181427bf20e47ba869515a6510d43cc893d
+  data.tar.gz: cc69d4fa0b0b197c25cd873b30f6974dd669e136e39525fddd6813b72504010b
 SHA512:
-  metadata.gz: '029e218037fb48bea447bed3c046272a5a6932b1741a1b456092951940fd3c39e5a85d3b3593a87f5a76bf3ed4fbaa10b6d4ab72a20e05ee28fe4b55d2bbbc2d'
-  data.tar.gz: ef8d842be54361731abca7a3d2ff953a63cb42174f6746d4079ce124d28f1b7a0801a0043f74f110ac8b450586e1a9ea55148f73bfa4aceb376393b444d61956
+  metadata.gz: fe9b09b8ee6c02c20680851b8468336ed4c415987c70c19d1ceb3ec61c97898dbeee0b6cf1df1ad7b807f8797104897d75e497dadb21c52d68614028c9a3bf48
+  data.tar.gz: e6a29c5b00b2da302a6e621c0bde65809713391aa827a329ee29b890d244d4c75ecc7718f7179b29b0691580a50a2ecff0bdda598a7c00eeb88392fd83238fee

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-05-02 19:12:37 UTC using RuboCop version 1.62.1.
+# on 2024-10-20 14:24:21 UTC using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -94,6 +94,7 @@ Naming/ClassAndModuleCamelCase:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/hiera/backend/eyaml/CLI.rb'
 
 # Offense count: 3
@@ -127,13 +128,6 @@ Naming/VariableNumber:
   Exclude:
     - 'lib/hiera/backend/eyaml/utils.rb'
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/Casecmp:
-  Exclude:
-    - 'lib/hiera/backend/eyaml/highlinehelper.rb'
-    - 'lib/hiera/backend/eyaml/utils.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/Detect:
@@ -270,6 +264,12 @@ Style/IfWithBooleanLiteralBranches:
     - 'lib/hiera/backend/eyaml/highlinehelper.rb'
     - 'lib/hiera/backend/eyaml_backend.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapIntoArray:
+  Exclude:
+    - 'lib/hiera/backend/eyaml_backend.rb'
+
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.2.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.2.0) (2024-10-21)
+
+[Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v4.1.0...v4.2.0)
+
+**Implemented enhancements:**
+
+- highline: Allow 3.x [\#385](https://github.com/voxpupuli/hiera-eyaml/pull/385) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- voxpupuli-rubocop: Fix version pinning, update 2.6-\>2.8 [\#384](https://github.com/voxpupuli/hiera-eyaml/pull/384) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v4.1.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.1.0) (2024-05-13)
+
+[Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v4.0.0...v4.1.0)
+
+**Implemented enhancements:**
+
+- Remove public key requirement to decrypt [\#378](https://github.com/voxpupuli/hiera-eyaml/pull/378) ([cmd-ntrf](https://github.com/cmd-ntrf))
+
 ## [v4.0.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.0.0) (2024-05-10)
 
 [Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v3.4.0...v4.0.0)

data/README.md

@@ -143,9 +143,9 @@ Use the -l parameter to pass in a label for the encrypted value,
 
 ### Decryption
 
-To decrypt something, you need the public_key and the private_key.
+To decrypt something, you need the private_key.
 
-To test decryption you can also use the eyaml tool if you have both keys
+To test decryption you can use the eyaml tool
 
     $ eyaml decrypt -f filename               # Decrypt a file
     $ eyaml decrypt -s 'ENC[PKCS7,.....]'     # Decrypt a string

data/hiera-eyaml.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'highline', '~> 2.1'
+  gem.add_runtime_dependency 'highline', '>= 2.1', '< 4'
   gem.add_runtime_dependency 'optimist', '~> 3.1'
 
   gem.add_development_dependency 'rake', '~> 13.2', '>= 13.2.1'
   gem.add_development_dependency 'rspec-expectations', '~> 3.13'
-  gem.add_development_dependency 'voxpupuli-rubocop', '2.6.0'
+  gem.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
 
   gem.required_ruby_version = '>= 2.7', ' < 4'
 end

data/lib/hiera/backend/eyaml/encryptors/pkcs7.rb

@@ -51,10 +51,13 @@ class Hiera
             private_key_pem = load_private_key_pem
             private_key_rsa = OpenSSL::PKey::RSA.new(private_key_pem)
 
-            public_key_pem = load_public_key_pem
-            public_key_x509 = OpenSSL::X509::Certificate.new(public_key_pem)
-
             pkcs7 = OpenSSL::PKCS7.new(ciphertext)
+
+            public_key_x509 = OpenSSL::X509::Certificate.new
+            public_key_x509.serial = pkcs7.recipients[0].serial
+            public_key_x509.issuer = pkcs7.recipients[0].issuer
+            public_key_x509.public_key = private_key_rsa.public_key
+
             pkcs7.decrypt(private_key_rsa, public_key_x509)
           end
 

data/lib/hiera/backend/eyaml/parser/token.rb

@@ -37,7 +37,7 @@ class Hiera
 
         class NonMatchToken < Token
           def initialize(non_match)
-            super(non_match)
+            super
           end
 
           def to_encrypted(_args = {})

data/lib/hiera/backend/eyaml.rb

@@ -1,7 +1,7 @@
 class Hiera
   module Backend
     module Eyaml
-      VERSION = '4.0.0'
+      VERSION = '4.2.0'
       DESCRIPTION = 'Hiera-eyaml is a backend for Hiera which provides OpenSSL encryption/decryption for Hiera properties'
 
       class RecoverableError < StandardError

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +82,16 @@ dependencies:
   name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.8.0
 description: Hiera backend for decrypting encrypted yaml properties
 email: voxpupuli@groups.io
 executables: