hiera-eyaml-secretbox 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a12a01f63dd605258d0f023decd28fa765cf80f6
-  data.tar.gz: abc1e11037918ac10f2a8ac40265bf7b9fbedf80
+SHA256:
+  metadata.gz: 8f0b5b4ae3edf34c85a8a499bfdbb834fe72c741a557c1965b1ac3b53bfedefa
+  data.tar.gz: d629de2c29f1582e9d4dc3b1e842c8a5f3386a2c529d726c26bd1610d9be6877
 SHA512:
-  metadata.gz: 73546e88b0749d3c9b9b41783eaa3c4a31554b735c1016eb8ba200d694bf2c60895464da5930a28dd93b0f6f49ea26cc3ba44f324774173a92d3fb89c0499413
-  data.tar.gz: '0179ac80e407ee6b8bdfe7e156d24cbb4f270b2994b82d772f2bd74404b317bd03ae58cc24312e621162acbd6a8cef7861e0cf4312e7c742c5b5373a8a07c304'
+  metadata.gz: 12e1c5078f614c0d86f7787a7c53e2fb2a87b2cd12cae476592ee2c77be248e59e38e509c9d791296912b7b874e3c577da2f898e2a41064545f9bbc1bb93b131
+  data.tar.gz: 69448ade0742ab01373ebd32c6f86375648732a118dad780237c06adb9bcb7c8689e661d9cc1463b12332920dcf41e2e3d4f8f979444df5d14f8672b8465fdcf

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org/'
 
-gem 'hiera-eyaml', ">=2.1.0"
+gem 'hiera-eyaml', ">=3.2.0"
 gem 'rbnacl'
 
 group :development do

data/hiera-eyaml-secretbox.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'rbnacl', '~> 3.0'
-  gem.add_runtime_dependency 'hiera-eyaml', '~> 2.1'
+  gem.add_runtime_dependency 'hiera-eyaml', '< 4.0'
 end

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

@@ -11,7 +11,7 @@ class Hiera
       module Encryptors
 
         class SecretBox < Encryptor
-          VERSION = "0.3.0"
+          VERSION = "0.4.2"
 
           self.options = {
             :private_key => { :desc => "Path to private key",
@@ -25,13 +25,8 @@ class Hiera
           self.tag = 'SecretBox'
 
           def self.encrypt plaintext
-            public_key = self.option :public_key
-            raise StandardError, "secretbox_public_key is not defined" unless public_key
-
             # Receivers public key
-            public_key_b64 = File.read public_key
-            public_key_bin = Base64.decode64 public_key_b64
-            pub = RbNaCl::PublicKey.new(public_key_bin)
+            pub = RbNaCl::PublicKey.new(public_key)
 
             # Senders private key
             key = RbNaCl::PrivateKey.generate
@@ -45,13 +40,8 @@ class Hiera
             public_key_bin = message.byteslice(0, RbNaCl::PublicKey::BYTES)
             ciphertext = message.byteslice(RbNaCl::PublicKey::BYTES, message.length)
 
-            private_key = self.option :private_key
-            raise StandardError, "secretbox_private_key is not defined" unless private_key
-
             # Receivers private key
-            private_key_b64 = File.read private_key
-            private_key_bin = Base64.decode64 private_key_b64
-            key = RbNaCl::PrivateKey.new(private_key_bin)
+            key = RbNaCl::PrivateKey.new(private_key)
 
             # Senders public key
             pub = RbNaCl::PublicKey.new(public_key_bin)
@@ -80,6 +70,29 @@ class Hiera
 
           end
 
+          def self.public_key
+            if ENV['SECRETBOX_PUBLIC_KEY']
+              public_key_b64 = ENV['SECRETBOX_PUBLIC_KEY']
+            elsif option(:public_key)
+              public_key_b64 = File.read(option(:public_key))
+            else
+              raise StandardError, "secretbox_public_key is not defined"
+            end
+            Base64.decode64(public_key_b64)
+          end
+          private_class_method :public_key
+
+          def self.private_key
+            if ENV['SECRETBOX_PRIVATE_KEY']
+              private_key_b64 = ENV['SECRETBOX_PRIVATE_KEY']
+            elsif option(:private_key)
+              private_key_b64 = File.read(option(:private_key))
+            else
+              raise StandardError, "secretbox_private_key is not defined"
+            end
+            Base64.decode64(private_key_b64)
+          end
+          private_class_method :private_key
         end
 
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-secretbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Wijnand Modderman-Lenstra
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl
@@ -28,16 +27,16 @@ dependencies:
   name: hiera-eyaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
 description: NaCl encryptor for use with hiera-eyaml
 email: maze@pyth0n.org
 executables: []
@@ -57,7 +56,6 @@ homepage: http://github.com/tehmaze/hiera-eyaml-secretbox
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,9 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Encryption plugin for hiera-eyaml backend for Hiera
 test_files: []