forked from apache/apisix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
change: don't strip square brackets from the IPv6 (apache#822)
* change: don't strip square brackets from the IPv6 The OpenResty APIs require the IPv6 literal wrapped inside a square brackets. Also add tests for IPv6 upstream and update lua-resty-ipmatcher to 0.3. Fix apache#816.
- Loading branch information
1 parent
7d33fb6
commit 5e85e93
Showing
7 changed files
with
294 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| # | ||
| # 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. | ||
| # | ||
| BEGIN { | ||
| if ($ENV{TEST_NGINX_CHECK_LEAK}) { | ||
| $SkipReason = "unavailable for the hup tests"; | ||
|
|
||
| } else { | ||
| $ENV{TEST_NGINX_USE_HUP} = 1; | ||
| undef $ENV{TEST_NGINX_USE_STAP}; | ||
| } | ||
| } | ||
|
|
||
| use t::APISIX; | ||
|
|
||
| my $travis_os_name = $ENV{TRAVIS_OS_NAME}; | ||
| if ((defined $travis_os_name) && $travis_os_name eq "linux") { | ||
| plan(skip_all => | ||
| "skip under Travis CI inux environment which doesn't work well with IPv6"); | ||
| } else { | ||
| plan 'no_plan'; | ||
| } | ||
|
|
||
| master_on(); | ||
| repeat_each(1); | ||
| log_level('info'); | ||
| no_root_location(); | ||
| no_shuffle(); | ||
| worker_connections(256); | ||
|
|
||
| add_block_preprocessor(sub { | ||
| my $block = shift; | ||
| $block->set_value("listen_ipv6", 1); | ||
| }); | ||
|
|
||
| run_tests(); | ||
|
|
||
| __DATA__ | ||
| === TEST 1: set route(two upstream node: one healthy + one unhealthy) | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "uri": "/server_port", | ||
| "upstream": { | ||
| "type": "roundrobin", | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1, | ||
| "127.0.0.1:1970": 1 | ||
| }, | ||
| "checks": { | ||
| "active": { | ||
| "http_path": "/status", | ||
| "host": "foo.com", | ||
| "healthy": { | ||
| "interval": 1, | ||
| "successes": 1 | ||
| }, | ||
| "unhealthy": { | ||
| "interval": 1, | ||
| "http_failures": 1 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| end | ||
| ngx.say(body) | ||
| } | ||
| } | ||
| --- request | ||
| GET /t | ||
| --- response_body | ||
| passed | ||
| --- grep_error_log eval | ||
| qr/^.*?\[error\](?!.*process exiting).*/ | ||
| --- grep_error_log_out | ||
| === TEST 2: hit routes (two upstream node: one healthy + one unhealthy) | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local http = require "resty.http" | ||
| local uri = "http://127.0.0.1:" .. ngx.var.server_port | ||
| .. "/server_port" | ||
| do | ||
| local httpc = http.new() | ||
| local res, err = httpc:request_uri(uri, {method = "GET", keepalive = false}) | ||
| ngx.log(ngx.ERR, "It works") | ||
| end | ||
| ngx.sleep(2.5) | ||
| local ports_count = {} | ||
| for i = 1, 12 do | ||
| ngx.log(ngx.ERR, "req ", i) | ||
| local httpc = http.new() | ||
| local res, err = httpc:request_uri(uri, {method = "GET", keepalive = false}) | ||
| if not res then | ||
| ngx.say(err) | ||
| return | ||
| end | ||
| ngx.log(ngx.ERR, "req ", i, " ", res.body) | ||
| ports_count[res.body] = (ports_count[res.body] or 0) + 1 | ||
| end | ||
| local ports_arr = {} | ||
| for port, count in pairs(ports_count) do | ||
| table.insert(ports_arr, {port = port, count = count}) | ||
| end | ||
| local function cmd(a, b) | ||
| return a.port > b.port | ||
| end | ||
| table.sort(ports_arr, cmd) | ||
| ngx.say(require("cjson").encode(ports_arr)) | ||
| ngx.exit(200) | ||
| } | ||
| } | ||
| --- request | ||
| GET /t | ||
| --- response_body | ||
| [{"count":12,"port":"1980"}] | ||
| --- grep_error_log eval | ||
| qr/\[error\].*/ | ||
| --- grep_error_log_out eval | ||
| qr/Connection refused\) while connecting to upstream/ | ||
| --- timeout: 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| # | ||
| # 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; | ||
|
|
||
| my $travis_os_name = $ENV{TRAVIS_OS_NAME}; | ||
| if ((defined $travis_os_name) && $travis_os_name eq "linux") { | ||
| plan(skip_all => | ||
| "skip under Travis CI inux environment which doesn't work well with IPv6"); | ||
| } else { | ||
| plan 'no_plan'; | ||
| } | ||
|
|
||
| repeat_each(1); | ||
| log_level('info'); | ||
| worker_connections(256); | ||
| no_root_location(); | ||
| no_shuffle(); | ||
|
|
||
| add_block_preprocessor(sub { | ||
| my $block = shift; | ||
| $block->set_value("listen_ipv6", 1); | ||
| }); | ||
|
|
||
| run_tests(); | ||
|
|
||
| __DATA__ | ||
| === TEST 1: set upstream(id: 1) | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/upstreams/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "nodes": { | ||
| "[::1]:1980": 1 | ||
| }, | ||
| "type": "roundrobin", | ||
| "desc": "new upstream" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| end | ||
| ngx.say(body) | ||
| } | ||
| } | ||
| --- request | ||
| GET /t | ||
| --- response_body | ||
| passed | ||
| --- no_error_log | ||
| [error] | ||
| === TEST 2: set route(id: 1) | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "uri": "/hello", | ||
| "upstream_id": "1" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| end | ||
| ngx.say(body) | ||
| } | ||
| } | ||
| --- request | ||
| GET /t | ||
| --- response_body | ||
| passed | ||
| --- no_error_log | ||
| [error] | ||
| === TEST 3: /not_found | ||
| --- request | ||
| GET /not_found | ||
| --- error_code: 404 | ||
| --- response_body eval | ||
| qr/404 Not Found/ | ||
| --- no_error_log | ||
| [error] | ||
| === TEST 4: hit routes | ||
| --- request | ||
| GET /hello | ||
| --- response_body | ||
| hello world | ||
| --- no_error_log | ||
| [error] |