hiera-eyaml-secretbox 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a12a01f63dd605258d0f023decd28fa765cf80f6
-  data.tar.gz: abc1e11037918ac10f2a8ac40265bf7b9fbedf80
+  metadata.gz: 3bdbae80427a8eb9a45d02dc6705bf24561c1190
+  data.tar.gz: b7c2ea11f4b0b6777a86ca9dd45e076edfacd99f
 SHA512:
-  metadata.gz: 73546e88b0749d3c9b9b41783eaa3c4a31554b735c1016eb8ba200d694bf2c60895464da5930a28dd93b0f6f49ea26cc3ba44f324774173a92d3fb89c0499413
-  data.tar.gz: '0179ac80e407ee6b8bdfe7e156d24cbb4f270b2994b82d772f2bd74404b317bd03ae58cc24312e621162acbd6a8cef7861e0cf4312e7c742c5b5373a8a07c304'
+  metadata.gz: c3091eadf88d86fe9a26c3f99fa828e58ee1f59e111e06a1d4d7d5eb34b5727d0042cc526cab432f6efe3caf0f8b497bdee6eabfbb35cdc7b9bdbd4ced297e13
+  data.tar.gz: ef529e9b2c288661f20e31156db18eebc0f39fd59994c74c00f8cc33e4ad8d45528676b8bfbb1bea600b6614304f1a885941e004ce94a5738220ac12d22d177a

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.0"
 
           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,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-secretbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Wijnand Modderman-Lenstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl