unidom-common 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb89444016240132128a60d0665118f9c4cf44d
-  data.tar.gz: 66dbb7bf981e7036b5fe87fb24786c74d784bb5a
+  metadata.gz: 28a8fc2b74ee9eec8f6e875a18e986da12400624
+  data.tar.gz: f1834cc03640dffc69917c2e14e44677355ca9ef
 SHA512:
-  metadata.gz: 658852f3c1b108d6767cffaf141db6a7a8e1b2c4c577b452cff75716979733479205e5f200e8b5c675661afc06bb2d990eda5b200eb1a259436f0d10785dc088
-  data.tar.gz: 6b228c16f1a451dfc870dfe76c4f3641d76f227848d7e041516eca4676cbc28776c8ba26b4900e47bb34c80ca63b3a14efce43b5f1ee5ba53b8833eee0f9b4bd
+  metadata.gz: d12d9206fe0ebd406d80df3184380081407a7bde2bc32a6f4cf7fb9da495379c968f1e3c3f17cff6c9153c56c2467b51f86c3050ba928ff93c12a81c5467a494
+  data.tar.gz: 327c616410e7d17a5d5afbb1caad676f85c833e236b72f2755a88272ed4651882a1223f872a28bc72517a2fc237831329c83ee4e274cda4bd690afb156009754

data/app/models/unidom/common/concerns/secure_column.rb

@@ -8,14 +8,43 @@ module Unidom::Common::Concerns::SecureColumn
 
     cattr_accessor :secure_columns
 
+    def do_encrypt_secure_column(name)
+      name    = name.to_s
+      content = { 'nonce' => SecureRandom.hex(8), 'timestamp' => Time.now.to_i }
+      secure_columns[name].each do |field| content[field.to_s] = send(field) end
+      content = content.sort.to_h.to_json
+      aes_key = Digest::SHA512::digest self.class.exact_signature(self.class, name, '')
+      encoded = hex_encrypt content, key: aes_key
+      json = {
+          encoded:   encoded,
+          signature: Unidom::Common::Numeration.hex(self.class.exact_signature self.class, name, content),
+          encryption_algorithm: self.class.encryption_algorithm
+        }
+      send "#{name}=", json
+    end
+
+    def do_decrypt_secure_column(name)
+      name = name.to_sym
+      return unless respond_to? name
+      json = send(name)
+      return if json['encoded'].blank?||json['signature'].blank?||json['encryption_algorithm'].blank?
+      return if self.class.encryption_algorithm!=json['encryption_algorithm']
+      aes_key = Digest::SHA512::digest self.class.exact_signature(self.class, name, '')
+      content = decrypt Unidom::Common::Numeration.rev_hex(json['encoded']), key: aes_key
+      actual_signature = self.class.exact_signature(self.class, name, content)
+      return if Unidom::Common::Numeration.rev_hex(json['signature'])!=actual_signature
+      parsed = JSON.parse content
+      parsed.each do |key, value| send "#{key}=", value unless [ 'nonce', 'timestamp' ].include? key end
+    end
+
   end
 
   module ClassMethods
 
     def secure_column(name, fields: [])
 
-      name           = name.to_s
-      secure_columns = secure_columns||{}
+      name                = name.to_s
+      self.secure_columns = self.secure_columns||{}
       if secure_columns[name].present?
         raise ArgumentError.new("The #{name} column was defined as a secure column already.")
       else
@@ -24,33 +53,8 @@ module Unidom::Common::Concerns::SecureColumn
       fields.each do |field| attr_accessor field.to_sym if columns_hash[field.to_s].blank? end
 
       instance_eval do
-
-        before_save do
-          content = { 'nonce' => SecureRandom.hex(8), 'timestamp' => Time.now.to_i }
-          secure_columns[name].each do |field| content[field.to_s] = send(field) end
-          content = content.sort.to_h.to_json
-          aes_key = Digest::SHA512::digest self.class.exact_signature(self.class, name, '')
-          encoded = hex_encrypt content, key: aes_key
-          json = {
-              encoded:   encoded,
-              signature: Unidom::Common::Numeration.hex(self.class.exact_signature self.class, name, content),
-              encryption_algorithm: self.class.encryption_algorithm
-            }
-          send "#{name}=", json
-        end
-
-        after_find do
-          json = send(name)
-          return if json['encoded'].blank?||json['signature'].blank?||json['encryption_algorithm'].blank?
-          return if self.class.encryption_algorithm!=json['encryption_algorithm']
-          aes_key = Digest::SHA512::digest self.class.exact_signature(self.class, name, '')
-          content = decrypt Unidom::Common::Numeration.rev_hex(json['encoded']), key: aes_key
-          actual_signature = self.class.exact_signature(self.class, name, content)
-          return if Unidom::Common::Numeration.rev_hex(json['signature'])!=actual_signature
-          parsed = JSON.parse content
-          parsed.each do |key, value| send "#{key}=", value unless [ 'nonce', 'timestamp' ].include? key end
-        end
-
+        before_save do do_encrypt_secure_column name        end
+        after_find  do do_decrypt_secure_column name.to_sym end
       end
 
     end

data/lib/unidom/common/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Common
-    VERSION = '1.7.1'.freeze
+    VERSION = '1.7.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-common
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails