fix: escape dot in target path regex

Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
kubernetes-sigs · Oct 26, 2022 · bb1815a · bb1815a
1 parent 658c421
commit bb1815a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
     - main
+  pull_request:
+    branches:
+    - main
   schedule:
     - cron: "0 7 * * 1" # Mondays at 7:00 AM
 

diff --git a/pkg/util/fileutil/filesystem.go b/pkg/util/fileutil/filesystem.go
@@ -25,7 +25,7 @@ import (
 )
 
 var (
-	targetPathRe = regexp.MustCompile(`[\\|\/]+pods[\\|\/]+(.+?)[\\|\/]+volumes[\\|\/]+kubernetes.io~csi[\\|\/]+(.+?)[\\|\/]+mount$`)
+	targetPathRe = regexp.MustCompile(`[\\|\/]+pods[\\|\/]+(.+?)[\\|\/]+volumes[\\|\/]+kubernetes\.io~csi[\\|\/]+(.+?)[\\|\/]+mount$`)
 )
 
 // GetMountedFiles returns all the mounted files mapping their path relative to

diff --git a/pkg/util/fileutil/filesystem_test.go b/pkg/util/fileutil/filesystem_test.go
@@ -266,6 +266,10 @@ func TestGetVolumeNameFromTargetPath(t *testing.T) {
 			targetPath: "/var/lib/kubelet/pods/7e7686a1-56c4-4c67-a6fd-4656ac484f0a/volumes/kubernetes.io~pv/pvvol/mount",
 			want:       "",
 		},
+		{
+			targetPath: "/var/lib/kubelet/pods/7e7686a1-56c4-4c67-a6fd-4656ac484f0a/volumes/kubernetesxio~csi/secrets-store-inline/mount",
+			want:       "",
+		},
 		{
 			targetPath: "/var/lib/kubelet/pods/7e7686a1-56c4-4c67-a6fd-4656ac484f0a/volumes/kubernetes.io~csi/secrets-store-inline/mount",
 			want:       "secrets-store-inline",