A platform for community discussion. Free, open, simple.
DEV: Use constant-time signature comparison for DiscourseConnect HMAC validation (#42424)
Osama Sayegh1ff8a8cc1299
diff --git a/lib/discourse_connect_base.rb b/lib/discourse_connect_base.rbindex c59520833b2..9be2e520d08 100644--- a/lib/discourse_connect_base.rb+++ b/lib/discourse_connect_base.rb@@ -103,15 +103,19 @@ class DiscourseConnectBasedecoded = Base64.decode64(parsed["sso"])decoded_hash = Rack::Utils.parse_query(decoded)- raise SignatureError, <<~MSG if sso.sign(parsed["sso"]) != parsed["sig"]+ expected_sig = sso.sign(parsed["sso"])++ if !ActiveSupport::SecurityUtils.secure_compare(expected_sig, parsed["sig"].to_s)+ raise SignatureError, <<~MSGBad signature for payloadsso: #{parsed["sso"]}sig: #{parsed["sig"]}- expected sig: #{sso.sign(parsed["sso"])}+ expected sig: #{expected_sig}MSG+ endACCESSORS.each do |k|val = decoded_hash[k.to_s]diff --git a/lib/discourse_connect_provider.rb b/lib/discourse_connect_provider.rbindex 4d2ee6991f6..09175fc4ef2 100644--- a/lib/discourse_connect_provider.rb+++ b/lib/discourse_connect_provider.rb@@ -76,7 +76,10 @@ class DiscourseConnectProvider < DiscourseConnectBaseprovider_secrets.find do |domain, configured_secret|if WildcardDomainChecker.check_domain(domain, return_url_host)first_domain_match ||= configured_secret- sign(parsed_payload["sso"], configured_secret) == parsed_payload["sig"]+ ActiveSupport::SecurityUtils.secure_compare(+ sign(parsed_payload["sso"], configured_secret),+ parsed_payload["sig"].to_s,+ )endend