Make literal $ character work in set $location_path
This commit is contained in:
parent
be5b86fa8f
commit
3dc131bd57
3 changed files with 35 additions and 1 deletions
|
@ -120,6 +120,7 @@ var (
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
|
"escapeLocationPathVar": escapeLocationPathVar,
|
||||||
"shouldConfigureLuaRestyWAF": shouldConfigureLuaRestyWAF,
|
"shouldConfigureLuaRestyWAF": shouldConfigureLuaRestyWAF,
|
||||||
"buildLuaSharedDictionaries": buildLuaSharedDictionaries,
|
"buildLuaSharedDictionaries": buildLuaSharedDictionaries,
|
||||||
"buildLocation": buildLocation,
|
"buildLocation": buildLocation,
|
||||||
|
@ -161,6 +162,20 @@ var (
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// escapeLocationPathVar will replace the $ character with ${literal_dollar}
|
||||||
|
// which is made to work via the following configuration in the http section of
|
||||||
|
// the template:
|
||||||
|
// geo $literal_dollar {
|
||||||
|
// default "$";
|
||||||
|
// }
|
||||||
|
func escapeLocationPathVar(input interface{}) string {
|
||||||
|
inputStr, ok := input.(string)
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.Replace(inputStr, `$`, `${literal_dollar}`, -1)
|
||||||
|
}
|
||||||
|
|
||||||
// formatIP will wrap IPv6 addresses in [] and return IPv4 addresses
|
// formatIP will wrap IPv6 addresses in [] and return IPv4 addresses
|
||||||
// without modification. If the input cannot be parsed as an IP address
|
// without modification. If the input cannot be parsed as an IP address
|
||||||
// it is returned without modification.
|
// it is returned without modification.
|
||||||
|
|
|
@ -834,3 +834,16 @@ func TestBuildUpstreamName(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEscapeLocationPathVar(t *testing.T) {
|
||||||
|
escapedPath := escapeLocationPathVar("/$")
|
||||||
|
expected := "/${literal_dollar}"
|
||||||
|
if escapedPath != expected {
|
||||||
|
t.Errorf("Expected %s but got %s", expected, escapedPath)
|
||||||
|
}
|
||||||
|
escapedPath = escapeLocationPathVar(false)
|
||||||
|
expected = ""
|
||||||
|
if escapedPath != expected {
|
||||||
|
t.Errorf("Expected %s but got %s", expected, escapedPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -347,6 +347,12 @@ http {
|
||||||
}
|
}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
# Create a variable that contains the literal $ character.
|
||||||
|
# This works because the geo module will not resolve variables.
|
||||||
|
geo $literal_dollar {
|
||||||
|
default "$";
|
||||||
|
}
|
||||||
|
|
||||||
server_name_in_redirect off;
|
server_name_in_redirect off;
|
||||||
port_in_redirect off;
|
port_in_redirect off;
|
||||||
|
|
||||||
|
@ -970,7 +976,7 @@ stream {
|
||||||
set $ingress_name "{{ $ing.Rule }}";
|
set $ingress_name "{{ $ing.Rule }}";
|
||||||
set $service_name "{{ $ing.Service }}";
|
set $service_name "{{ $ing.Service }}";
|
||||||
set $service_port "{{ $location.Port }}";
|
set $service_port "{{ $location.Port }}";
|
||||||
set $location_path "{{ $location.Path }}";
|
set $location_path "{{ $location.Path | escapeLocationPathVar }}";
|
||||||
|
|
||||||
{{ if $all.Cfg.EnableOpentracing }}
|
{{ if $all.Cfg.EnableOpentracing }}
|
||||||
opentracing_propagate_context;
|
opentracing_propagate_context;
|
||||||
|
|
Loading…
Reference in a new issue