technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Router: fixed "pass" to upstreams.

Browse Source 
Messed up return values in nxt_upstream_find() caused error in applying any
configuration with a valid "pass" value in router configuration pointing to
upstream.  That wasn't the case in "listeners" objects, where the return value
wasn't checked.

Also, it caused segfault in cases where the "pass" option was configured with
variables and resulting value was pointing to a non-existent upstream.

Added missing return checks as well to catch possible memory allocation errors.

The bug was introduced in d32bc428f46b.

This closes #472 issue on GitHub.
This commit is contained in:
hongzhidao
2020-08-28 00:53:36 -04:00
parent d5e9159340
commit 806135f1c9
4 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/test_routing.py
View File

@@ -329,11 +329,90 @@ class TestRouting(TestApplicationProto):
[{"match": {"method": "GET"}}], 'routes'
), 'route pass absent configure'
def test_routes_route_pass(self):
assert 'success' in self.conf(
{
"applications": {
"app": {
"type": "python",
"processes": {"spare": 0},
"path": "/app",
"module": "wsgi",
}
},
"upstreams": {
"one": {
"servers": {
"127.0.0.1:7081": {},
"127.0.0.1:7082": {},
},
},
"two": {
"servers": {
"127.0.0.1:7081": {},
"127.0.0.1:7082": {},
},
},
},
}
)
assert 'success' in self.conf(
[{"action": {"pass": "routes"}}], 'routes'
)
assert 'success' in self.conf(
[{"action": {"pass": "applications/app"}}], 'routes'
)
assert 'success' in self.conf(
[{"action": {"pass": "upstreams/one"}}], 'routes'
)
def test_routes_route_pass_absent(self):
assert 'error' in self.conf(
[{"match": {"method": "GET"}, "action": {}}], 'routes'
), 'route pass absent configure'
def test_routes_route_pass_invalid(self):
assert 'success' in self.conf(
{
"applications": {
"app": {
"type": "python",
"processes": {"spare": 0},
"path": "/app",
"module": "wsgi",
}
},
"upstreams": {
"one": {
"servers": {
"127.0.0.1:7081": {},
"127.0.0.1:7082": {},
},
},
"two": {
"servers": {
"127.0.0.1:7081": {},
"127.0.0.1:7082": {},
},
},
},
}
)
assert 'error' in self.conf(
[{"action": {"pass": "blah"}}], 'routes'
), 'route pass invalid'
assert 'error' in self.conf(
[{"action": {"pass": "routes/blah"}}], 'routes'
), 'route pass routes invalid'
assert 'error' in self.conf(
[{"action": {"pass": "applications/blah"}}], 'routes'
), 'route pass applications invalid'
assert 'error' in self.conf(
[{"action": {"pass": "upstreams/blah"}}], 'routes'
), 'route pass upstreams invalid'
def test_routes_action_unique(self):
assert 'success' in self.conf(
{