Fix bug with key length

attr-encrypted/encryptor#26
sophomoric · Jul 1, 2018 · 6b2cd3e · 6b2cd3e
1 parent d174cab
commit 6b2cd3e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/models/page.rb b/app/models/page.rb
@@ -18,14 +18,22 @@ class Page < ActiveRecord::Base
 
   def encryption_key
     if password
-      password + ENV.fetch("SECRET_KEY_BASE")
+      padded_or_chopped(password)
     else
-      ENV.fetch("SECRET_KEY_BASE")
+      padded_or_chopped(ENV["SECRET_KEY_BASE"])
     end
   end
 
   private
 
+  def padded_or_chopped(password)
+    if password.length < 32
+      " " * (32 - password.length) + password
+    else
+      password[0,32]
+    end
+  end
+
   def set_random_url_key
     self.url_key = SecureRandom.hex(5) unless self.url_key.present?
   end