mirror of
https://github.com/discourse/discourse.git
synced 2024-12-15 02:06:18 +08:00
30990006a9
This reduces chances of errors where consumers of strings mutate inputs and reduces memory usage of the app. Test suite passes now, but there may be some stuff left, so we will run a few sites on a branch prior to merging
47 lines
1.3 KiB
Ruby
47 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# For some reason safe buffer is getting invalid encoding in some cases
|
|
# we work around the issue and log the problems
|
|
#
|
|
# The alternative is a broken website when this happens
|
|
|
|
class ActiveSupport::SafeBuffer
|
|
def concat(value, raise_encoding_err = false)
|
|
if !html_safe? || value.html_safe?
|
|
super(value)
|
|
else
|
|
super(ERB::Util.h(value))
|
|
end
|
|
rescue Encoding::CompatibilityError
|
|
if raise_encoding_err
|
|
raise
|
|
else
|
|
|
|
encoding_diags = +"internal encoding #{Encoding.default_internal}, external encoding #{Encoding.default_external}"
|
|
|
|
if encoding != Encoding::UTF_8
|
|
encoding_diags << " my encoding is #{encoding} "
|
|
|
|
self.force_encoding("UTF-8")
|
|
unless valid_encoding?
|
|
encode!("utf-16", "utf-8", invalid: :replace)
|
|
encode!("utf-8", "utf-16")
|
|
end
|
|
Rails.logger.warn("Encountered a non UTF-8 string in SafeBuffer - #{self} - #{encoding_diags}")
|
|
end
|
|
|
|
if value.encoding != Encoding::UTF_8
|
|
|
|
encoding_diags << " attempted to append encoding #{value.encoding} "
|
|
|
|
value = value.dup.force_encoding("UTF-8").scrub
|
|
Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value} - #{encoding_diags}")
|
|
end
|
|
|
|
concat(value, _raise = true)
|
|
end
|
|
end
|
|
|
|
alias << concat
|
|
end
|