Skip to content

Commit

Permalink
fix: stream route matcher is nil after first match (#11269)
Browse files Browse the repository at this point in the history
Signed-off-by: Nic <qianyong@api7.ai>
  • Loading branch information
nic-6443 authored May 21, 2024
1 parent 114a088 commit e193439
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 4 deletions.
4 changes: 0 additions & 4 deletions apisix/stream/router/ip_port.lua
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ do
for _, route in ipairs(items) do
local hit = match_addrs(route, vars)
if hit then
route.value.remote_addr_matcher = nil
route.value.server_addr_matcher = nil
ctx.matched_route = route
return true
end
Expand Down Expand Up @@ -177,8 +175,6 @@ do
for _, route in ipairs(other_routes) do
local hit = match_addrs(route, api_ctx.var)
if hit then
route.value.remote_addr_matcher = nil
route.value.server_addr_matcher = nil
api_ctx.matched_route = route
return true
end
Expand Down
134 changes: 134 additions & 0 deletions t/stream-node/sanity-repeat.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
use t::APISIX 'no_plan';

log_level('info');
no_root_location();
workers(1);
repeat_each(2);

run_tests();

__DATA__
=== TEST 1: set stream route(id: 1) -> service(id: 1)
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:1995": 1
},
"type": "roundrobin"
}
}]]
)
if code >= 300 then
ngx.status = code
end
code, body = t('/apisix/admin/stream_routes/1',
ngx.HTTP_PUT,
[[{
"remote_addr": "127.0.0.1",
"service_id": 1
}]]
)
if code >= 300 then
ngx.status = code
end
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
=== TEST 2: hit route
--- stream_request eval
mmm
--- stream_response
hello world
=== TEST 3: set stream / ssl
--- config
location /t {
content_by_lua_block {
local core = require("apisix.core")
local t = require("lib.test_admin")
local ssl_cert = t.read_file("t/certs/apisix.crt")
local ssl_key = t.read_file("t/certs/apisix.key")
local data = {
cert = ssl_cert, key = ssl_key,
sni = "*.test.com",
}
local code, body = t.test('/apisix/admin/ssls/1',
ngx.HTTP_PUT,
core.json.encode(data)
)
if code >= 300 then
ngx.status = code
return
end
local code, body = t.test('/apisix/admin/stream_routes/1',
ngx.HTTP_PUT,
[[{
"sni": "a.test.com",
"remote_addr": "127.0.0.1",
"upstream": {
"nodes": {
"127.0.0.1:1995": 1
},
"type": "roundrobin"
}
}]]
)
if code >= 300 then
ngx.status = code
return
end
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
=== TEST 4: hit route
--- stream_tls_request
mmm
--- stream_sni: a.test.com
--- response_body
hello world
--- error_log
proxy request to 127.0.0.1:1995

0 comments on commit e193439

Please sign in to comment.