Fixing two security issues.

cinar · Dec 3, 2023 · 4fb02b2 · 4fb02b2
1 parent 919a13c
commit 4fb02b2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/helper/csv.go b/helper/csv.go
@@ -10,6 +10,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"path/filepath"
 	"reflect"
 	"sync"
 )
@@ -142,7 +143,7 @@ func (c *Csv[T]) ReadFromReader(reader io.Reader) <-chan *T {
 // maps the data to corresponding struct fields, and delivers
 // the resulting snapshots through the channel.
 func (c *Csv[T]) ReadFromFile(fileName string) (<-chan *T, error) {
-	file, err := os.Open(fileName)
+	file, err := os.Open(filepath.Clean(fileName))
 	if err != nil {
 		return nil, err
 	}
@@ -152,7 +153,10 @@ func (c *Csv[T]) ReadFromFile(fileName string) (<-chan *T, error) {
 
 	go func() {
 		wg.Wait()
-		file.Close()
+		err := file.Close()
+		if err != nil {
+			log.Printf("file close failed with %v", err)
+		}
 	}()
 
 	return rows, nil