forj 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86bafd8e907ea87422d3ffe34ee5d64030530de9
-  data.tar.gz: d129b3a2b79f4c4217730078c135c32ca25e6c96
+  metadata.gz: cc168384e8283de3099794ba3fb85759286de890
+  data.tar.gz: 216c1d4e25503388473f88a2cce2db26674dc0d2
 SHA512:
-  metadata.gz: 82ededa706f07e22540a5563e567ff78f0631cb3c5b5779113382d93c755880080cece6f8e2ffc367aea45b8f91147a1daf273b1dde7fa10036bffbb72b980df
-  data.tar.gz: 48abdf7a3e8b2efdecccd488fb2a67eba44d607709d5d29899ef75f0628d28e7757178e3490b977a740f5d502f753f48eef60cb4c07d9ab8c7776cacc89fe1d7
+  metadata.gz: 5c5edfe564a87533f683f25137a4cca65ad6fe642c160d729d73efcf66656614ba26e53d76fda270811c5b64a59715eadd795699bfbe1854b1f6b4ac651e7fa5
+  data.tar.gz: e0c005a6db73411311b85cece7979536cd56709d25644d182128a63eca8355f724fea32c39a3052f41fa2559f62b39419d3e10666ccd2cfe42928bc400d15a1b

data/lib/forj-account.rb

@@ -81,7 +81,11 @@ class ForjAccount
       key = key.to_sym if key.class == String
       section = rhGet(@oConfig.getAppDefault(:account_section_mapping, key), :section)
       yInterm = nil
-      yInterm = rhGet(@hAccountData, section) if section
+      if section
+         yInterm = rhGet(@hAccountData, section)
+      else
+         Logging.debug("ForjAccount.get: No section found for key '%s'." % [key])
+      end
       @oConfig.get(key, yInterm , default )
    end
 
@@ -430,12 +434,15 @@ class ForjAccount
          q.default = forj_user if forj_user
       end
 
-
       # Checking key file used to encrypt/decrypt passwords
       key_file = File.join($FORJ_CREDS_PATH, '.key')
       if not File.exists?(key_file)
          # Need to create a random key.
-         entr = { :key => rand(36**10).to_s(36), :salt => Time.now.to_i.to_s, :iv => OpenSSL::Cipher::Cipher.new('aes-256-cbc').random_iv}
+         entr = {
+            :key => rand(36**10).to_s(36),
+            :salt => Time.now.to_i.to_s,
+            :iv => Base64::strict_encode64(OpenSSL::Cipher::Cipher.new('aes-256-cbc').random_iv)
+         }
 
          Logging.debug("Writing '%s' key file" % key_file)
          File.open(key_file, 'w') do |out|
@@ -448,14 +455,20 @@ class ForjAccount
       end
 
       if enc_hpcloud_os_key
-         hpcloud_os_key_hidden = '*' * Encryptor.decrypt(
-             :value => Base64::strict_decode64(enc_hpcloud_os_key),
-             :key   => entr[:key],
-             :iv    => entr[:iv],
-             :salt  => entr[:salt]
+         begin
+            hpcloud_os_key_hidden = '*' * Encryptor.decrypt(
+               :value => Base64::strict_decode64(enc_hpcloud_os_key),
+               :key   => entr[:key],
+               :iv    => Base64::strict_decode64(entr[:iv]),
+               :salt  => entr[:salt]
             ).length
-         hpcloud_os_key_hidden="[%s]" % hpcloud_os_key_hidden
-         Logging.message("A password is already set for '%s'. If you want to keep it, just press Enter" %  [hpcloud_os_user])
+         rescue => e
+            Logging.error("Unable to decrypt your password. You will need to re-enter it.")
+            enc_hpcloud_os_key = ""
+         else
+            hpcloud_os_key_hidden="[%s]" % hpcloud_os_key_hidden
+            Logging.message("A password is already set for '%s'. If you want to keep it, just press Enter" %  [hpcloud_os_user])
+         end
       else
          hpcloud_os_key_hidden = ""
       end
@@ -467,12 +480,24 @@ class ForjAccount
             q.echo = '*'
          end
          if hpcloud_os_key == "" and enc_hpcloud_os_key
-            hpcloud_os_key = Encryptor.decrypt(:value => Base64::strict_decode64(enc_hpcloud_os_key), :key => entr[:key], :iv => entr[:iv], :salt => entr[:salt])
+            hpcloud_os_key = Encryptor.decrypt(
+               :value => Base64::strict_decode64(enc_hpcloud_os_key),
+               :key => entr[:key],
+               :iv => Base64::strict_decode64(entr[:iv]),
+               :salt => entr[:salt]
+            )
          else
             Logging.message("The password cannot be empty.") if hpcloud_os_key == ""
          end
       end
-      enc_hpcloud_os_key = Base64::strict_encode64(Encryptor.encrypt(:value => hpcloud_os_key, :key => entr[:key], :iv => entr[:iv], :salt => entr[:salt]))
+      enc_hpcloud_os_key = Base64::strict_encode64(
+         Encryptor.encrypt(
+            :value => hpcloud_os_key,
+            :key => entr[:key],
+            :iv => Base64::strict_decode64(entr[:iv]),
+            :salt => entr[:salt]
+         )
+      )
 
       cloud_fog = File.join($FORJ_CREDS_PATH, @sAccountName+'.g64')
 

data/lib/security.rb

@@ -173,7 +173,7 @@ module SecurityGroup
   def hpc_import_key(oForjAccount)
 
     keys = keypair_detect(oForjAccount.get('keypair_name'), oForjAccount.get('keypair_path'))
-    account = oForjAccount.get(:name)
+    account = oForjAccount.getAccountData(:account, :name)
 
     Logging.fatal(1, "'keypair_path' undefined. check your config.yaml file.") if not keys[:keypair_path]
     Logging.fatal(1, "'keypair_name' undefined. check your config.yaml file.") if not keys[:keypair_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor