Trim TokenBasedUser#export_secret_token for compatibility with ruby 2…

….4.0
projectblacklight · Dec 27, 2016 · 0e7ef7f · 0e7ef7f
1 parent d9dbbe2
commit 0e7ef7f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/app/controllers/concerns/blacklight/token_based_user.rb b/app/controllers/concerns/blacklight/token_based_user.rb
@@ -42,10 +42,21 @@ def encrypt_user_id(user_id, current_time = nil)
   end
 
   def export_secret_token
-    ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base).generate_key('encrypted user session key')
+    ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base).generate_key('encrypted user session key')[0..key_len]
   end
 
   def message_encryptor
     ActiveSupport::MessageEncryptor.new(export_secret_token)
   end
+
+  private
+
+  # Ruby 2.4 requires keys of very particular lengths
+  def key_len
+    if ActiveSupport::MessageEncryptor.respond_to? :key_len
+      ActiveSupport::MessageEncryptor.key_len
+    else
+     -1
+    end
+  end
 end