Clean filpath for os.open func

Signed-off-by: thepetk <[email protected]>
redhat-developer · Jun 1, 2023 · 1d6a565 · 1d6a565
1 parent e0bac85
commit 1d6a565
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 75 deletions.
diff --git a/go/pkg/apis/enricher/framework/go/echo_detector.go b/go/pkg/apis/enricher/framework/go/echo_detector.go
@@ -13,7 +13,6 @@ package enricher
 
 import (
 	"context"
-	"os"
 	"regexp"
 
 	"github.com/redhat-developer/alizer/go/pkg/apis/model"
@@ -59,16 +58,8 @@ func (e EchoDetector) DoPortsDetection(component *model.Component, ctx *context.
 		},
 	}
 
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRules, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
-
 }
diff --git a/go/pkg/apis/enricher/framework/go/fasthttp_detector.go b/go/pkg/apis/enricher/framework/go/fasthttp_detector.go
@@ -13,7 +13,6 @@ package enricher
 
 import (
 	"context"
-	"os"
 	"regexp"
 
 	"github.com/redhat-developer/alizer/go/pkg/apis/model"
@@ -40,24 +39,16 @@ func (f FastHttpDetector) DoPortsDetection(component *model.Component, ctx *cont
 		return
 	}
 
-	matchRegexRule := model.PortMatchRules{
+	matchRegexRules := model.PortMatchRules{
 		MatchIndexRegexes: []model.PortMatchRule{
 			{
 				Regex:     regexp.MustCompile(`.ListenAndServe\([^,)]*`),
 				ToReplace: ".ListenAndServe(",
 			},
 		},
 	}
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRule, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
-
 }
diff --git a/go/pkg/apis/enricher/framework/go/gin_detector.go b/go/pkg/apis/enricher/framework/go/gin_detector.go
@@ -13,7 +13,6 @@ package enricher
 
 import (
 	"context"
-	"os"
 	"regexp"
 
 	"github.com/redhat-developer/alizer/go/pkg/apis/model"
@@ -40,7 +39,7 @@ func (g GinDetector) DoPortsDetection(component *model.Component, ctx *context.C
 		return
 	}
 
-	matchRegexRule := model.PortMatchRules{
+	matchRegexRules := model.PortMatchRules{
 		MatchIndexRegexes: []model.PortMatchRule{
 			{
 				Regex:     regexp.MustCompile(`.Run\(([^,)]*)`),
@@ -49,15 +48,8 @@ func (g GinDetector) DoPortsDetection(component *model.Component, ctx *context.C
 		},
 	}
 
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRule, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
 }
diff --git a/go/pkg/apis/enricher/framework/go/go_detector.go b/go/pkg/apis/enricher/framework/go/go_detector.go
@@ -14,6 +14,7 @@ package enricher
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -57,16 +58,9 @@ func DoGoPortsDetection(component *model.Component, ctx *context.Context) {
 		},
 	}
 
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRules, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
 }
 
@@ -134,3 +128,20 @@ func GetPortWithMatchIndexesGo(content string, matchIndexes []int, toBeReplaced
 
 	return -1
 }
+
+// GetPortFromFilesGo loops through a list of paths and tries to find a port matching the
+// given set PortMatchRules
+func GetPortFromFilesGo(matchRegexRules model.PortMatchRules, files []string) []int {
+	for _, file := range files {
+		cleanFile := filepath.Clean(file)
+		bytes, err := os.ReadFile(cleanFile)
+		if err != nil {
+			continue
+		}
+		ports := GetPortFromFileGo(matchRegexRules, string(bytes))
+		if len(ports) > 0 {
+			return ports
+		}
+	}
+	return []int{}
+}
diff --git a/go/pkg/apis/enricher/framework/go/gofiber_detector.go b/go/pkg/apis/enricher/framework/go/gofiber_detector.go
@@ -13,7 +13,6 @@ package enricher
 
 import (
 	"context"
-	"os"
 	"regexp"
 
 	"github.com/redhat-developer/alizer/go/pkg/apis/model"
@@ -40,23 +39,16 @@ func (g GoFiberDetector) DoPortsDetection(component *model.Component, ctx *conte
 		return
 	}
 
-	matchRegexRule := model.PortMatchRules{
+	matchRegexRules := model.PortMatchRules{
 		MatchIndexRegexes: []model.PortMatchRule{
 			{
 				Regex:     regexp.MustCompile(`.Listen\(([^,)]*)`),
 				ToReplace: ".Listen(",
 			},
 		},
 	}
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRule, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
 }
diff --git a/go/pkg/apis/enricher/framework/go/mux_detector.go b/go/pkg/apis/enricher/framework/go/mux_detector.go
@@ -13,7 +13,6 @@ package enricher
 
 import (
 	"context"
-	"os"
 	"regexp"
 
 	"github.com/redhat-developer/alizer/go/pkg/apis/model"
@@ -55,15 +54,8 @@ func (m MuxDetector) DoPortsDetection(component *model.Component, ctx *context.C
 		},
 	}
 
-	for _, file := range files {
-		bytes, err := os.ReadFile(file)
-		if err != nil {
-			continue
-		}
-		ports := GetPortFromFileGo(matchRegexRules, string(bytes))
-		if len(ports) > 0 {
-			component.Ports = ports
-			return
-		}
+	ports := GetPortFromFilesGo(matchRegexRules, files)
+	if len(ports) > 0 {
+		component.Ports = ports
 	}
 }
diff --git a/go/pkg/apis/enricher/framework/javascript/nodejs/express_detector.go b/go/pkg/apis/enricher/framework/javascript/nodejs/express_detector.go
@@ -14,6 +14,7 @@ package enricher
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -43,7 +44,8 @@ func (e ExpressDetector) DoPortsDetection(component *model.Component, ctx *conte
 	re := regexp.MustCompile(`\.listen\([^,)]*`)
 	var ports []int
 	for _, file := range files {
-		bytes, err := os.ReadFile(file)
+		cleanFile := filepath.Clean(file)
+		bytes, err := os.ReadFile(cleanFile)
 		if err != nil {
 			continue
 		}

diff --git a/go/pkg/apis/enricher/java_enricher.go b/go/pkg/apis/enricher/java_enricher.go
@@ -107,7 +107,8 @@ func getProjectNameGradle(root string) string {
 	settingsGradlePath := filepath.Join(root, "settings.gradle")
 	if _, err := os.Stat(settingsGradlePath); err == nil {
 		re := regexp.MustCompile(`rootProject.name\s*=\s*(.*)`)
-		bytes, err := os.ReadFile(settingsGradlePath)
+		cleanSettingsGradlePath := filepath.Clean(settingsGradlePath)
+		bytes, err := os.ReadFile(cleanSettingsGradlePath)
 		if err != nil {
 			return ""
 		}

diff --git a/go/pkg/utils/detector.go b/go/pkg/utils/detector.go
@@ -187,7 +187,8 @@ func isTagInDependencies(deps map[string]string, tag string) bool {
 
 // GetPackageJsonSchemaFromFile returns the package.json found in the path.
 func GetPackageJsonSchemaFromFile(path string) (schema.PackageJson, error) {
-	bytes, err := os.ReadFile(path)
+	cleanPath := filepath.Clean(path)
+	bytes, err := os.ReadFile(cleanPath)
 	if err != nil {
 		return schema.PackageJson{}, err
 	}
@@ -216,7 +217,8 @@ func IsTagInComposerJsonFile(file string, tag string) bool {
 
 // GetComposerJsonSchemaFromFile returns the composer.json found in the path.
 func GetComposerJsonSchemaFromFile(path string) (schema.ComposerJson, error) {
-	bytes, err := os.ReadFile(path)
+	cleanPath := filepath.Clean(path)
+	bytes, err := os.ReadFile(cleanPath)
 	if err != nil {
 		return schema.ComposerJson{}, err
 	}
@@ -513,7 +515,8 @@ func GetStringValueFromEnvFile(root string, regex string) string {
 // getEnvFileContent is exposed as a global variable for the purpose of running mock tests
 var getEnvFileContent = func(root string) (string, error) {
 	envPath := filepath.Join(root, ".env")
-	bytes, err := os.ReadFile(envPath)
+	cleanEnvPath := filepath.Clean(envPath)
+	bytes, err := os.ReadFile(cleanEnvPath)
 	if err != nil {
 		return "", err
 	}