cyclid-client 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0ed4474b3e654888e5af98ce8651e7185c86c4
-  data.tar.gz: ec58a0848ac45a46b4958491b1da1b6dc90e5b89
+  metadata.gz: eb286d1fdb3a5a900ad24f35c41fff997b9403eb
+  data.tar.gz: d62a803b0a9597605906bedc394a1277d9e9bf45
 SHA512:
-  metadata.gz: 8b84d6e3bf1b4debc7848d9e75a5b311a361cd94ad5856c175619cdae694a7e456e2854d24a1abd2925bf9fa99121bd2fb9d0160e2386d7ef7efbbf760615c71
-  data.tar.gz: 825e9d50626ce58d262f8e3b01a17c0c59684467dc209b4538c000d676466f97ba8956b87501c33451aef267fe75f8e4773c282eab0ee810bf87357944d85c6a
+  metadata.gz: 8f5a28f869c93715ff81ff3e25da32bf088f9a2ca417a78708a9845aa6ab7312a8decafd3dd8e688888bc1a2ed70e99f0b3e66b909172843dc626614489f3916
+  data.tar.gz: 614077b06d871c421644adc3ccd0ad10af187521a6afb6a35bfcfe84d697fe46183750d1f4490b7f9568266a4e2176b5c0f79c86b57fa9aa648c178a10e9d1cb

data/lib/cyclid/client/user.rb

@@ -49,7 +49,8 @@ module Cyclid
       # @param username [String] User name of the new user.
       # @param name [String] Users real name.
       # @param email [String] Users email address.
-      # @param password [String] Unencrypted initial password
+      # @param password [String] Unencrypted initial password OR a BCrypt2
+      #   encrypted password string.
       # @param secret [String] Initial HMAC signing secret
       # @return [Hash] Decoded server response object.
       # @see #user_modify
@@ -64,8 +65,14 @@ module Cyclid
         # Add the HMAC secret if one was supplied
         user['secret'] = secret unless secret.nil?
 
-        # Encrypt & add the password if one was supplied
-        user['password'] = BCrypt::Password.create(password).to_s unless password.nil?
+        # Add the password if one was supplied
+        user['password'] = if password =~ /\A\$2a\$.+\z/
+                             # Password is already encrypted
+                             password
+                           else
+                             # Encrypt the plaintext password
+                             BCrypt::Password.create(password).to_s
+                           end unless password.nil?
 
         @logger.debug user
 
@@ -84,6 +91,8 @@ module Cyclid
       # @option args [String] email Users email address.
       # @option args [String] secret Initial HMAC signing secret
       # @option args [String] password Unencrypted initial password
+      # @option args [String] password Unencrypted initial password OR a
+      #   BCrypt2 encrypted password string.
       # @return [Hash] Decoded server response object.
       # @see #user_add
       # @see #user_delete
@@ -104,9 +113,14 @@ module Cyclid
         # Add the HMAC secret if one was supplied
         user['secret'] = args[:secret] if args.key? :secret and args[:secret]
 
-        # Encrypt & add the password if one was supplied
-        user['password'] = BCrypt::Password.create(args[:password]).to_s \
-          if args.key? :password and args[:password]
+        # Add the password if one was supplied
+        user['password'] = if args[:password] =~ /\A\$2a\$.+\z/
+                             # Password is already encrypted
+                             args[:password]
+                           else
+                             # Encrypt the plaintext password
+                             BCrypt::Password.create(args[:password]).to_s
+                           end if args.key? :password and args[:password]
 
         @logger.debug user
 

data/lib/cyclid/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module Client
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-client
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor