encrypt_attr 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0eff7d819ff9893c446ee56eef2ca21e98ea2ba1
-  data.tar.gz: 0233923144bd0cbc85d7adbb13a2fa8816adfd0c
+SHA256:
+  metadata.gz: 0b805ac4e240904c7de37c0d3ed5efbb32412e2f6ee297c89dbd2836b99328b2
+  data.tar.gz: 184ff8078f6cecc0fbff2ddde38686776a0259334f31062841290d98554aa5aa
 SHA512:
-  metadata.gz: 3a5954e6af6377c2f73b81440cf2b0841d5f23a4eeaed8128e473ad3e5dc217f19e7b71fbce7f315363c26f014e1b154951670c3d7ce9ac28a6476d7ddb85350
-  data.tar.gz: a1d0045a75942ad4ced0caa3816ec18d0c0b8dd51ee6cb921c156fe5d8429b15e7d843d512e679362cca82eb306f258bdfd68f882d472b817aa15861f9e6bb18
+  metadata.gz: f55ea50b43482b30e7d85dc7e2de3acbcc8b53d2c055854a379b81d5ae58eb885eccd025e00f60bccfd6badd87419468ce721f13ee4211bd04783b964608728e
+  data.tar.gz: db6b9e840f8631a831b7b35186498bbf78624ddca46cb39d3af85115016c0060765d2004e622d7df6b538b195a6f320892fd4c8f993db29f23f7d713e6d2065b

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 cache: bundler
 sudo: false
+notifications:
+  email: false
 rvm:
-  - '2.4.0-preview1'
-  - '2.3'
-  - '2.2'
-  - '2.1'
-  - '2.0'
-addons:
-  code_climate:
-    repo_token:
-      secure: "4vr2TYLMkquEL3/7mnnmE9diuQ98ug3iNw3eXB69JCC5OIW8DGRlL20/44+dh6xEImkkvp6bKQQrikvYTMpqrDi4MeAYFHzAWw2p7Oc+A5bGERamByTakM0wyl9ypnwHGzpleBoHShk7TP/Dpl6w25ME1QPb67qF8uPeeIQJQzE="
+- 2.5.1
+before_script:
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
+- "./cc-test-reporter before-build"
+after_script:
+- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
+env:
+  global:
+    secure: Qr1hys7KWk6pxd9Vgxuged9iDIEw/UbHPpED4PhI3HLY/cCJF2k3Sr5zGnW4LHfWA3olmI1AlFsCuojul44V+tvb5pNAe7ZnzJp23ikhEFBjBvoJCnYrD01wD96sSD3m5bnT4+I6SEeHdMJwAvqM6bNXQaMJwJLyZHdAYK9DQnY=

data/README.md

@@ -143,6 +143,24 @@ class User
 end
 ```
 
+Your encryptor may validate the secret token.
+
+```ruby
+module ReverseEncryptor
+  def self.validate_secret_token(secret_token)
+    warn "=> You don't have to define a secret token with ReverseEncryptor" if secret_token
+  end
+
+  def self.encrypt(secret_token, value)
+    value.to_s.reverse
+  end
+
+  def self.decrypt(secret_token, value)
+    value.to_s.reverse
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -9,4 +9,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
-

data/lib/encrypt_attr/base.rb

@@ -15,29 +15,20 @@ module EncryptAttr
     end
 
     def self.secret_token=(secret_token)
-      validate_secret_token(secret_token.to_s)
+      encryptor.validate_secret_token(secret_token.to_s) if encryptor.respond_to?(:validate_secret_token)
       @secret_token = secret_token.to_s
     end
 
-    def self.validate_secret_token(secret_token)
-      if secret_token.size < 100
-        offending_line = caller
-                          .reject {|entry| entry.include?(__dir__) || entry.include?("forwardable.rb") }
-                          .first[/^(.*?:\d+)/, 1]
-        warn "[encrypt_attribute] secret token must have at least 100 characters (called from #{offending_line})"
-      end
-    end
-
     # Set initial token value to empty string.
     # Cannot assign through writer method because of size warning.
-    @secret_token = ''
+    @secret_token = ""
 
     # Set initial encryptor engine.
     self.encryptor = Encryptor
 
     module ClassMethods
       def encrypt_attr(*args, secret_token: EncryptAttr.secret_token, encryptor: EncryptAttr.encryptor)
-        EncryptAttr.validate_secret_token(secret_token)
+        encryptor.validate_secret_token(secret_token) if encryptor.respond_to?(:validate_secret_token)
 
         args.each do |attribute|
           define_encrypted_attribute(attribute, secret_token, encryptor)

data/lib/encrypt_attr/encryptor.rb

@@ -2,6 +2,16 @@ module EncryptAttr
   class Encryptor
     CIPHER = "AES-256-CBC".freeze
 
+    def self.validate_secret_token(secret_token)
+      return unless secret_token.size < 100
+
+      offending_line = caller
+                        .reject {|entry| entry.include?(__dir__) || entry.include?("forwardable.rb") }
+                        .first[/^(.*?:\d+)/, 1]
+
+      warn "[encrypt_attribute] secret token must have at least 100 characters (called from #{offending_line})"
+    end
+
     def self.encrypt(secret_token, value)
       new(secret_token).encrypt(value)
     end
@@ -18,18 +28,33 @@ module EncryptAttr
     end
 
     def encrypt(value)
-      encode cipher(:encrypt, value)
+      cipher = OpenSSL::Cipher.new(CIPHER).encrypt
+      key = Digest::SHA256.digest(secret_token)
+      iv = SecureRandom.random_bytes(cipher.iv_len).unpack("H*").first[0...cipher.iv_len]
+
+      cipher.key = key
+      cipher.iv = iv
+
+      iv + ";" + encode(cipher.update(value) + cipher.final)
     end
 
     def decrypt(value)
-      cipher(:decrypt, decode(value))
-    end
+      cipher = OpenSSL::Cipher.new(CIPHER).decrypt
+      key = Digest::SHA256.digest(secret_token)
+
+      parts = value.split(";")
+
+      if parts.size == 1
+        value = decode(value)
+        iv = key[0...cipher.iv_len]
+      else
+        iv = parts.first
+        value = decode(parts.last)
+      end
+
+      cipher.key = key
+      cipher.iv = iv
 
-    def cipher(mode, value)
-      cipher = OpenSSL::Cipher.new(CIPHER).public_send(mode)
-      digest = Digest::SHA256.digest(secret_token)
-      cipher.key = digest
-      cipher.iv = digest[0...cipher.iv_len]
       cipher.update(value) + cipher.final
     end
 

data/lib/encrypt_attr/version.rb

@@ -1,3 +1,3 @@
 module EncryptAttr
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypt_attr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Encrypt attributes using AES-256-CBC (or your custom encryption strategy).