Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

multi ssl bug #1818

Merged
merged 19 commits into from
Jul 10, 2020
Merged

multi ssl bug #1818

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c683e98
reproduce multi ssl bug
johzchen Jul 8, 2020
4535639
reproduce multi ssl bug
johzchen Jul 8, 2020
582ca4f
fix multi ssl bug
johzchen Jul 8, 2020
4f53374
fix errlog match
johzchen Jul 8, 2020
42cf8c2
remove /apisix/admin/ssl/2
johzchen Jul 8, 2020
c86e625
fix lint
johzchen Jul 8, 2020
2d9d3ba
fix test cases and typo
johzchen Jul 8, 2020
2042d0d
fix typo
johzchen Jul 8, 2020
2b48fa4
fix redis version
johzchen Jul 9, 2020
38f1f9a
for testing
johzchen Jul 9, 2020
932ac63
test
johzchen Jul 9, 2020
fdaebea
recover osx runner script
johzchen Jul 9, 2020
117f675
reverse snis for log
johzchen Jul 9, 2020
fe92a00
temporarily disabled osx travis runner
johzchen Jul 9, 2020
824ba58
rollback to avoid conflicts
johzchen Jul 9, 2020
a7cde0f
sleep more time for triggering error
johzchen Jul 9, 2020
7b63989
test cases for multi ssl certs
johzchen Jul 10, 2020
baa1af9
fix typo
johzchen Jul 10, 2020
22bdec0
remove additional test cases
johzchen Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apisix/http/router/radixtree_sni.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ local function create_router(ssl_items)
end
end

local
idx = idx + 1
route_items[idx] = {
paths = sni,
Expand Down Expand Up @@ -159,7 +158,7 @@ function _M.match_and_set(api_ctx)
local sni_rev = sni:reverse()
local ok = radixtree_router:dispatch(sni_rev, nil, api_ctx)
if not ok then
core.log.warn("not found any valid sni configuration")
core.log.warn("failed to found any SSL certificate by sni: ", sni)
return false
membphis marked this conversation as resolved.
Show resolved Hide resolved
end

Expand All @@ -172,13 +171,13 @@ function _M.match_and_set(api_ctx)
end
end
if not matched then
core.log.warn("not found any valid sni configuration, matched sni: ",
core.log.warn("failed to found any valid sni configuration, matched sni: ",
nic-chen marked this conversation as resolved.
Show resolved Hide resolved
core.json.delay_encode(api_ctx.matched_sni, true), " current sni: ", sni)
return false
end
else
if str_find(sni_rev, ".", #api_ctx.matched_sni, true) then
core.log.warn("not found any valid sni configuration, matched sni: ",
core.log.warn("failed to found any valid sni configuration, matched sni: ",
api_ctx.matched_sni:reverse(), " current sni: ", sni)
return false
end
Expand Down