Skip to content
Browse files

Remove the use of String#% when formatting durations in log messages

This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
  • Loading branch information...
1 parent 54c05ac commit 5aee516b5edb49d7206cd9815c13a78b6b16c5d9 @NZKoz NZKoz committed with tenderlove Sep 23, 2013
View
6 actionmailer/lib/action_mailer/log_subscriber.rb
@@ -4,12 +4,12 @@ module ActionMailer
class LogSubscriber < ActiveSupport::LogSubscriber
def deliver(event)
recipients = Array.wrap(event.payload[:to]).join(', ')
- info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
+ info("\nSent mail to #{recipients} (#{format_duration(event.duration)})")
debug(event.payload[:mail])
end
def receive(event)
- info("\nReceived mail (%.1fms)" % event.duration)
+ info("\nReceived mail (#{format_duration(event.duration)})")
debug(event.payload[:mail])
end
@@ -19,4 +19,4 @@ def logger
end
end
-ActionMailer::LogSubscriber.attach_to :action_mailer
+ActionMailer::LogSubscriber.attach_to :action_mailer
View
11 actionpack/lib/action_controller/log_subscriber.rb
@@ -23,7 +23,7 @@ def process_action(event)
exception_class_name = payload[:exception].first
status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
end
- message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
+ message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{format_duration(event.duration)}"
message << " (#{additions.join(" | ")})" unless additions.blank?
info(message)
@@ -34,17 +34,15 @@ def halted_callback(event)
end
def send_file(event)
- message = "Sent file %s"
- message << " (%.1fms)"
- info(message % [event.payload[:path], event.duration])
+ info("Sent file #{event.payload[:path]} (#{format_duration(event.duration)})")
end
def redirect_to(event)
info "Redirected to #{event.payload[:location]}"
end
def send_data(event)
- info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
+ info("Sent data #{event.payload[:filename]} (#{format_duration(event.duration)})")
end
%w(write_fragment read_fragment exist_fragment?
@@ -53,7 +51,8 @@ def send_data(event)
def #{method}(event)
key_or_path = event.payload[:key] || event.payload[:path]
human_name = #{method.to_s.humanize.inspect}
- info("\#{human_name} \#{key_or_path} \#{"(%.1fms)" % event.duration}")
+ duration = format_duration(event.duration)
+ info("\#{human_name} \#{key_or_path} \#{duration}")
end
METHOD
end
View
4 activesupport/lib/active_support/log_subscriber.rb
@@ -118,5 +118,9 @@ def color(text, color, bold=false)
bold = bold ? BOLD : ""
"#{bold}#{color}#{text}#{CLEAR}"
end
+
+ def format_duration(duration)
+ "%.1fms" % duration
+ end
end
end

0 comments on commit 5aee516

Please sign in to comment.
Something went wrong with that request. Please try again.