just-encrypt 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beff4b7cfe1691be48d32eb5ba98b5c34fbcd5ca6a81276d45e11224ca3a0d0a
-  data.tar.gz: 2b4f19f6d72bc81a243e7ca7d32079d24f25f25849f090e188fc88e1712f1391
+  metadata.gz: d098863785faeea95dd4205e6cf623a8f543137716bfc007868ef19703a356d8
+  data.tar.gz: 4610a38974c0b379ce10978c26e49e2b51fb4ed5e155987dd0c0d196fa5979e9
 SHA512:
-  metadata.gz: ab9a10269d80812e06af0c83d778a6c51772d14c1e2ead18c0b591e62b0d69a792dec1b6e7834ac99a2e3d6dbee022204da24e03a16b53bf3f8d59fa55afce12
-  data.tar.gz: e5ff6273057c09298b6eb046a72f7a5d5cfed9c7db9360286e7f11982eb8b2a7e0662334d93df284ab699568aae11c7ef59c0683fbc493ecbc89bfacec522f75
+  metadata.gz: e3ec12b4be15f5bb2d128ff4cbf32e5d967b70b75f3e9b3c51149bc56697112c0d903676fbabdeb6a81075d46506eee4e336d7f37d0599ba1095ec166b52df50
+  data.tar.gz: eba123531b8270d4658cc86056d458ec329d5510ac5946b573e4fe7e68c679b4ba09528db3bb8e0100e93540233315f43bf86940966496a61bf5429f8cdd9308

data/lib/just-encrypt.rb

@@ -1,36 +1,39 @@
 class JustEncrypt
   require 'base64'
   require 'openssl'
-
-  def self.decrypt(data, cipher_key = nil)
-    cipher = OpenSSL::Cipher.new 'aes-256-cbc'
+  
+  def self.decrypt(base64_encrypted_text)
+    # cipher for encrypting/decrypting
+    secret = Rails.application.credentials.just_encrypt[:secret]
+    key = Digest::SHA1.hexdigest(secret).slice(0..31)
+    encrypted_text = Base64.decode64(base64_encrypted_text)
+    # set cipher for decryption
+    cipher = OpenSSL::Cipher.new("aes-256-cbc")
     cipher.decrypt
-    cipher.key = Rails.application.credentials.just_encrypt[:secret]
-    # Decryption Process
-    unescaped = CGI.unescape(data) # Remove urlencode
-    decoded = Base64.decode64(unescaped) # Decode from base64
-    cipher.iv = decoded[0..15] # This corresponds to the first 16 characters of the received data
-    decrypted = cipher.update(decoded[16..decoded.length - 1]) # First step for decrypt
-    decrypted << cipher.final # Decryption finished
-    timestamp = decrypted[-10..(decrypted.length - 1)].to_i
-    # Return decrypted data
-    decrypted[0..(decrypted.length - 11)]
+    cipher.key = key
+    cipher.iv = encrypted_text[0..15]
+  
+    # decryption
+    decrypted = cipher.update(encrypted_text[16..encrypted_text.length-1])
+    decrypted << cipher.final
+    decrypted
   end
 
-  def self.encrypt(raw_user_cod, cipher_key = nil)
-    timestamp = Time.now.utc.to_i
+  def self.encrypt(text)
+    # cipher for encrypting/decrypting
     secret = Rails.application.credentials.just_encrypt[:secret]
-    cipher = OpenSSL::Cipher.new('aes-256-cbc')
-
-    iv = cipher.random_iv
+    key = Digest::SHA1.hexdigest(secret).slice(0..31)
+    # set cipher for encryption
+    cipher = OpenSSL::Cipher::AES256.new(:CBC)
     cipher.encrypt
-    cipher.key = secret
-
-    encrypted_data = cipher.update(raw_user_cod + timestamp.to_s)
-    encrypted_data << cipher.final
-    data = CGI.escape(Base64.strict_encode64(iv.to_s + encrypted_data))
-
-    data
+    cipher.key = key
+    iv = cipher.random_iv
+    cipher.iv = iv
+    
+    # encrypt the message
+    encrypted = cipher.update(text)
+    encrypted << cipher.final
+    Base64.encode64(iv + encrypted)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: just-encrypt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremías G.