Loop with String#scan without creating substrings

Create the substrings necessary parts only, instead of cutting the
rest of the buffer.  Also removed a useless, probable typo, regexp.
This commit is contained in:
Nobuyoshi Nakada 2019-08-13 12:14:28 +09:00 коммит произвёл Yusuke Endoh
Родитель a0a2640b39
Коммит 36e057e26e
2 изменённых файлов: 24 добавлений и 17 удалений

Просмотреть файл

@ -290,23 +290,8 @@ module WEBrick
def split_param_value(string) def split_param_value(string)
ret = {} ret = {}
while string.bytesize != 0 string.scan(/\G\s*([\w\-.*%!]+)=\s*(?:\"((?>\\.|[^\"])*)\"|([^,\"]*))\s*,?/) do
case string ret[$1] = $3 || $2.gsub(/\\(.)/, "\\1")
when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
key = $1
matched = $2
string = $'
ret[key] = matched.gsub(/\\(.)/, "\\1")
when /^\s*([\w\-\.\*\%\!]+)=\s*([^,\"]*),?/
key = $1
matched = $2
string = $'
ret[key] = matched.clone
when /^s*^,/
string = $'
else
break
end
end end
ret ret
end end

Просмотреть файл

@ -310,6 +310,28 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
} }
end end
def test_digest_auth_invalid
digest_auth = WEBrick::HTTPAuth::DigestAuth.new(Realm: 'realm', UserDB: '')
def digest_auth.error(fmt, *)
end
def digest_auth.try_bad_request(len)
request = {"Authorization" => %[Digest a="#{'\b'*len}]}
authenticate request, nil
end
bad_request = WEBrick::HTTPStatus::BadRequest
t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
assert_raise(bad_request) {digest_auth.try_bad_request(10)}
limit = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0)
[20, 50, 100, 200].each do |len|
assert_raise(bad_request) do
Timeout.timeout(len*limit) {digest_auth.try_bad_request(len)}
end
end
end
private private
def credentials_for_request(user, password, params, body = nil) def credentials_for_request(user, password, params, body = nil)
cnonce = "hoge" cnonce = "hoge"