summaryrefslogtreecommitdiff
path: root/lib/webrick/log.rb
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-14 11:26:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-14 11:26:53 +0000
commit3896b48678145db3e831566f6c752acd3517dd90 (patch)
treecfaaa9a6bcd6d9a6e76fb05fdb27a49e162b5346 /lib/webrick/log.rb
parentac6f2894ea8fd6c9718ececb1245b2b11aae8e82 (diff)
merge revision(s) 59897:
lib/webrick/log.rb: sanitize any type of logs It had failed to sanitize some type of exception messages. Reported and patched by Yusuke Endoh (mame) at https://hackerone.com/reports/223363 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/log.rb')
-rw-r--r--lib/webrick/log.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 7542d8f..41e907c 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -118,10 +118,10 @@ module WEBrick
# * Otherwise it will return +arg+.inspect.
def format(arg)
if arg.is_a?(Exception)
- "#{arg.class}: #{arg.message}\n\t" <<
+ "#{arg.class}: #{AccessLog.escape(arg.message)}\n\t" <<
arg.backtrace.join("\n\t") << "\n"
elsif arg.respond_to?(:to_str)
- arg.to_str
+ AccessLog.escape(arg.to_str)
else
arg.inspect
end