DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config: Fix panic on invalid lua-shared-dict. (#12284)

Browse source 
Co-authored-by: AleksaC <aleksacukovic1@gmail.com>
This commit is contained in:
k8s-infra-cherrypick-robot 2024-11-02 15:35:26 -07:00 committed by GitHub
parent b0852ecca9
commit e313ffa544
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/ingress/controller/template/configmap.go
View file

@ -127,8 +127,11 @@ func ReadConfig(src map[string]string) config.Configuration {
delete(conf, luaSharedDictsKey)
lsd := splitAndTrimSpace(val, ",")
for _, v := range lsd {
v = strings.ReplaceAll(v, " ", "")
results := strings.SplitN(v, ":", 2)
results := strings.SplitN(strings.ReplaceAll(v, " ", ""), ":", 2)
if len(results) != 2 {
klog.Errorf("Ignoring poorly formatted Lua dictionary %v", v)
continue
}
dictName := results[0]
size := dictStrToKb(results[1])
if size < 0 {

5
internal/ingress/controller/template/configmap_test.go
View file

@ -390,6 +390,11 @@ func TestLuaSharedDictsParsing(t *testing.T) {
entry: map[string]string{"lua-shared-dicts": "configuration_data: 10, my_random_dict:15 , another_example:2"},
expect: map[string]int{"configuration_data": 10240, "my_random_dict": 15360, "another_example": 2048},
},
{
name: "invalid format",
entry: map[string]string{"lua-shared-dicts": "mydict: 10, invalid_dict 100"},
expect: map[string]int{"mydict": 10240},
},
{
name: "invalid size value should be ignored",
entry: map[string]string{"lua-shared-dicts": "mydict: 10, invalid_dict: 1a, bad_mb_dict:10mb"},