github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-05 12:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddyhttp: Fix merging consecutive client_ip or remote_ip matchers (#6350)

Browse Source
This commit is contained in:
Francis Lavoie
2024-05-30 09:32:17 -04:00
committed by GitHub
parent a52917a37d
commit 40c582ce82
2 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
caddytest/integration/caddyfile_adapt/matcher_syntax.caddyfiletest
View File

@ -46,6 +46,18 @@
@matcher12 client_ip private_ranges
respond @matcher12 "client_ip matcher with private ranges"
@matcher13 {
remote_ip 1.1.1.1
remote_ip 2.2.2.2
}
respond @matcher13 "remote_ip merged"
@matcher14 {
client_ip 1.1.1.1
client_ip 2.2.2.2
}
respond @matcher14 "client_ip merged"
}
----------
{
@ -279,6 +291,42 @@
"handler": "static_response"
}
]
},
{
"match": [
{
"remote_ip": {
"ranges": [
"1.1.1.1",
"2.2.2.2"
]
}
}
],
"handle": [
{
"body": "remote_ip merged",
"handler": "static_response"
}
]
},
{
"match": [
{
"client_ip": {
"ranges": [
"1.1.1.1",
"2.2.2.2"
]
}
}
],
"handle": [
{
"body": "client_ip merged",
"handler": "static_response"
}
]
}
]
}