dtk_crd_parser 0.0.80 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71949ad1f509c9f71bd4f3bc88a3aa5a069e950d65345e9b8db98dc9b05b3440
-  data.tar.gz: 470246a3fd230abd398ad8c0a2f9ddd9efe00bd589f4e0a961d3add18918867d
+  metadata.gz: 66891d974d019a7f8758c4ec38ca87a5a2b6dc4b2c71dff163a077ce42907348
+  data.tar.gz: 4bfaf3ab7be2aec69e7a009daea2dae417b6c2da53eb174a6464b2b5de61b9e3
 SHA512:
-  metadata.gz: 11eddad18adac1f60dfcf7cd749f127850752b65728213915995ca2fb253ade53c76477b72519de3d1ca6314632b86f2ad97c3b1b3c34621db549c24256e5933
-  data.tar.gz: d34e2cd4a844abb1ed0d174ce781c778e4b0d8ea240140e2df76b22745226f6f23e81f96512417ca470be99589b5271cf9e963c7862c4c45d6b4d633314c7fd8
+  metadata.gz: 59afab5ec67f519c064ff685d282ce0853ada04ed312e474a4279cd1956049a5bbf8d39d86f8d25e4e3a1eb37ea9080898596ef9e6a672536c69f9fdab88bbcb
+  data.tar.gz: 74edd0ad3c9b0df55decb62d5ca4985e97b7aca168107d9849928ef088e0b630006b7e7a1862f57cdbc8d5d2eba1fefac16c52e13079445df290a749f23eb888

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -34,21 +34,20 @@ module DTK::CrdParser
 
           decipher = OpenSSL::Cipher::AES256.new :CBC
           decipher.decrypt
-          ### THIS IS FOR NOW HARDCODED  
-          decipher.iv = Base64.decode64('6aU8K0GsLXQcaDZP+bOMjw==') # previously saved
-          decipher.key = 'ThisPasswordIsReallyHardToGuess!'
-          ###
+          secret = secret()
+          decipher.iv = Base64.decode64(secret.iv) 
+          decipher.key = secret.key
           plain_text = decipher.update(Base64.decode64(data_to_decrypt)) + decipher.final
+          Logger.new('/proc/1/fd/1').info "Plaintext: #{plain_text}"
           plain_text
         end   
 
-        def secret
-          key = File.read('/var/secret/encrypt_key')
-          iv = File.read('/var/secret/iv')
-          Logger.new('/proc/1/fd/1').info key
-          Logger.new('/proc/1/fd/1').info iv
+        def secret(mountPath)
+          mountPath = '/var/secret' unless mountPath
+          encrypt_key = File.read("#{mountPath}/encrypt_key")
+          iv = File.read("#{mountPath}/iv")
           {
-            key: key,
+            key: encrypt_key,
             iv: iv
           }
         end

data/lib/crd_parser/component_def.rb

@@ -34,12 +34,8 @@ module DTK::CrdParser
           componentDefAction     = componentDefSpec[:actions]
         end
         componentDefAttributes = []
-        Logger.new('/proc/1/fd/1').info "BEFORE SECRET"
-        secret = secret()
-        Logger.new('/proc/1/fd/1').info "SECRET IS"
-        Logger.new('/proc/1/fd/1').info secret
 
-        (componentDefSpec[:attributes] || []).each do |attribute| 
+        (componentDefSpec[:attributes] || []).each do |attribute|
           componentDefAttributes.push AttributeTypeInfo.resolveAttr(attribute)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtk_crd_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - DTK