Merged r20854 from trunk to 4.0-stable (#34950).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20856 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb
index 1942ab1b764284d4a0d3adc58d15b85b824ade84..46761f7634564f814dcc9e7453269b659a82f2aa 100644 (file)
--- a/app/controllers/mail_handler_controller.rb
+++ b/app/controllers/mail_handler_controller.rb
@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MailHandlerController < ActionController::Base
+  include ActiveSupport::SecurityUtils
+
   before_action :check_credential
 
   # Displays the email submission form
@@ -37,7 +39,7 @@ class MailHandlerController < ActionController::Base
 
   def check_credential
     User.current = nil
-    unless Setting.mail_handler_api_enabled? && params[:key].to_s == Setting.mail_handler_api_key
+    unless Setting.mail_handler_api_enabled? && secure_compare(params[:key].to_s, Setting.mail_handler_api_key.to_s)
       render :plain => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
     end
   end

diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb
index 35886fc4e397119512829171adb6251ca1720e9b..d58e7ada3ac148bc44059f88d608d569d220898a 100644 (file)
--- a/app/controllers/sys_controller.rb
+++ b/app/controllers/sys_controller.rb
@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SysController < ActionController::Base
+  include ActiveSupport::SecurityUtils
+
   before_action :check_enabled
 
   def projects
@@ -74,7 +76,7 @@ class SysController < ActionController::Base
 
   def check_enabled
     User.current = nil
-    unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
+    unless Setting.sys_api_enabled? && secure_compare(params[:key].to_s, Setting.sys_api_key.to_s)
       render :plain => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
       return false
     end

diff --git a/app/models/token.rb b/app/models/token.rb
index 85d6abb9a4b3a531f74bf4f53b920a076525e313..05bc6f638902b9b6b7f2706f1025f452c6167bcd 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -113,11 +113,13 @@ class Token < ActiveRecord::Base
     return nil unless action.present? && key =~ /\A[a-z0-9]+\z/i
 
     token = Token.find_by(:action => action, :value => key)
-    if token && (token.action == action) && (token.value == key) && token.user
-      if validity_days.nil? || (token.created_on > validity_days.days.ago)
-        token
-      end
-    end
+    return unless token
+    return unless token.action == action
+    return unless ActiveSupport::SecurityUtils.secure_compare(token.value.to_s, key)
+    return unless token.user
+    return unless validity_days.nil? || (token.created_on > validity_days.days.ago)
+
+    token
   end
 
   def self.generate_token_value