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

Fix fcgi configmap value parsing (#10528)

Browse source
This commit is contained in:
Ricardo Katz 2023-10-16 20:10:16 -03:00 • committed by GitHub
parent 96112d93f4
commit a879829408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 95 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/ingress/annotations/fastcgi/main.go
View file

@ -36,7 +36,10 @@ const (
)
// fast-cgi valid parameters is just a single file name (like index.php)
var regexValidIndexAnnotationAndKey = regexp.MustCompile(`^[A-Za-z0-9.\-\_]+$`)
var (
regexValidIndexAnnotationAndKey = regexp.MustCompile(`^[A-Za-z0-9.\-\_]+$`)
validFCGIValue = regexp.MustCompile(`^[A-Za-z0-9\-\_\$\{\}/.]*$`)
)
var fastCGIAnnotations = parser.Annotation{
Group: "fastcgi",
@ -142,7 +145,7 @@ func (a fastcgi) Parse(ing *networking.Ingress) (interface{}, error) {
}
for k, v := range cmap.Data {
if !regexValidIndexAnnotationAndKey.MatchString(k) || !parser.NGINXVariable.MatchString(v) {
if !regexValidIndexAnnotationAndKey.MatchString(k) || !validFCGIValue.MatchString(v) {
klog.ErrorS(fmt.Errorf("fcgi contains invalid key or value"), "fcgi annotation error", "configmap", cmap.Name, "namespace", cmap.Namespace, "key", k, "value", v)
return fcgiConfig, ing_errors.NewValidationError(fastCGIParamsAnnotation)
}

12
internal/ingress/annotations/fastcgi/main_test.go
View file

@ -371,6 +371,18 @@ func Test_fastcgi_Parse(t *testing.T) {
want: Config{Index: "indexxpto-92123.php"},
wantErr: true,
},
{
name: "invalid configmap values val",
index: "indexxpto-92123.php",
configmapname: "default/fcgiconfig",
configmap: map[string]string{
"SCRIPT_FILENAME": "/app/src/index.php",
},
want: Config{Index: "indexxpto-92123.php", Params: map[string]string{
"SCRIPT_FILENAME": "/app/src/index.php",
}},
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {