Fix sanitizing filenames

Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
Update version tusing an up-to-date alpine image
2025-09-13 20:10:29 +00:00 · 2022-07-18 12:45:02 -05:00 · 2022-07-07 14:33:32 -05:00 · 2021-05-18 21:18:07 +00:00 · 2021-05-18 16:16:55 -05:00 · 2021-05-18 21:16:01 +00:00
10 changed files with 19 additions and 17 deletions
--- a/main.go
+++ b/main.go
@@ -55,7 +55,7 @@ func init() {
 	flag.Parse()
 }

-func readDevDirectory(dirToList string) (files []string, err error) {
+func readDevDirectory(dirToList string, allowedRecursions uint8) (files []string, err error) {
        var foundFiles []string

        fType, err := os.Stat(dirToList)
@@ -79,10 +79,12 @@ func readDevDirectory(dirToList string) (files []string, err error) {
        f.Close()
        for _, subDir := range files {
                foundFiles = append(foundFiles, subDir)
-                filesDir, err := readDevDirectory(dirToList+"/"+subDir)
-                if err == nil {
-                        for _, fileName := range filesDir {
-                                foundFiles = append(foundFiles, subDir+"/"+fileName)
+                if allowedRecursions > 0 {
+                        filesDir, err := readDevDirectory(dirToList+"/"+subDir,allowedRecursions-1)
+                        if err == nil {
+                                for _, fileName := range filesDir {
+                                        foundFiles = append(foundFiles, subDir+"/"+fileName)
+                                }
                        }
                }
        }
@@ -91,7 +93,7 @@ func readDevDirectory(dirToList string) (files []string, err error) {
 }

 func sanitizeName(path string) string {
-        return strings.Replace(path, "/", "_" ,-1)
+        return strings.Replace(path, "/!@#$%^&*()[]{}'`~.", "___________________",-1)
 }

 func findDevicesPattern(listDevices []string, pattern string) ([]string,error) {
@@ -127,13 +129,13 @@ func main() {
        }

 	glog.V(0).Info("Reading existing devices on /dev")
-	ExistingDevices, err := readDevDirectory("/dev")
+	ExistingDevices, err := readDevDirectory("/dev",10)
 	if err != nil {
 		glog.Errorf(err.Error())
 		os.Exit(1)
 	}

-	ExistingDevicesSys, err := readDevDirectory("/sys/devices")
+	ExistingDevicesSys, err := readDevDirectory("/sys/devices",0)
 	if err != nil {
 		glog.Errorf(err.Error())
 		os.Exit(1)
--- a/smarter-device-management-pod-k3s-test-xavier.yaml
+++ b/smarter-device-management-pod-k3s-test-xavier.yaml
@@ -15,7 +15,7 @@ spec:
  nodeName: smarter-jetson-xavier-4bcc2584
  containers:
  - name: smarter-device-manager
-    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
    imagePullPolicy: IfNotPresent
    securityContext:
      allowPrivilegeEscalation: false
--- a/smarter-device-management-pod-k3s.yaml
+++ b/smarter-device-management-pod-k3s.yaml
@@ -15,7 +15,7 @@ spec:
  nodeName: <replace with node to run>
  containers:
  - name: smarter-device-manager
-    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
    imagePullPolicy: IfNotPresent
    securityContext:
      allowPrivilegeEscalation: false
--- a/smarter-device-management-pod.yaml
+++ b/smarter-device-management-pod.yaml
@@ -15,7 +15,7 @@ spec:
  nodeName: <replace with node to run>
  containers:
  - name: smarter-device-manager
-    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+    image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
    imagePullPolicy: IfNotPresent
    securityContext:
      allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds-k3s.yaml
+++ b/smarter-device-manager-ds-k3s.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds-with-configmap-rpi-k3s.yaml
+++ b/smarter-device-manager-ds-with-configmap-rpi-k3s.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds-with-configmap-rpi.yaml
+++ b/smarter-device-manager-ds-with-configmap-rpi.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds-with-configmap-xavier-k3s.yaml
+++ b/smarter-device-manager-ds-with-configmap-xavier-k3s.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds-with-configmap-xavier.yaml
+++ b/smarter-device-manager-ds-with-configmap-xavier.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
--- a/smarter-device-manager-ds.yaml
+++ b/smarter-device-manager-ds.yaml
@@ -34,7 +34,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      containers:
      - name: smarter-device-manager
-        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
+        image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.8
        imagePullPolicy: IfNotPresent
        securityContext:
          allowPrivilegeEscalation: false
Author	SHA1	Message	Date
Alexandre Peixoto Ferreira	fe9b26d283	Fix sanitizing filenames Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>	2022-07-18 12:45:02 -05:00
Alexandre Peixoto Ferreira	e20fb9b58f	Update version tusing an up-to-date alpine image Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>	2022-07-07 14:33:32 -05:00
Alexandre Ferreira	741d8edc23	Merge branch 'dev' into 'master' Fix examples to tag 1.20.7 See merge request arm-research/smarter/smarter-device-manager!19	2021-05-18 21:18:07 +00:00
Alexandre Ferreira	261f70121a	Fix examples to tag 1.20.7	2021-05-18 16:16:55 -05:00
Alexandre Ferreira	8a304aa5ee	Merge branch 'dev' into 'master' Fix recursion problem See merge request arm-research/smarter/smarter-device-manager!18	2021-05-18 21:16:01 +00:00
Alexandre Ferreira	1421f564e5	Fix recursion problem	2021-05-18 16:06:16 -05:00