Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Centralize logic for checking archive extraction tools (#2063)
ahrava9b056de0a2d
diff --git a/pkg/handlers/archive.go b/pkg/handlers/archive.goindex b1257be7e..6b4062556 100644--- a/pkg/handlers/archive.go+++ b/pkg/handlers/archive.go@@ -233,36 +233,45 @@ func (a *Archive) ReadToMax(ctx context.Context, reader io.Reader) (data []byte,return fileContent.Bytes(), nil}+type mimeType string+const (- arMimeType = "application/x-unix-archive"- rpmMimeType = "application/x-rpm"+ arMimeType mimeType = "application/x-unix-archive"+ rpmMimeType mimeType = "application/x-rpm")-// Define a map of mime types to corresponding command-line tools-var mimeTools = map[string][]string{+// mimeTools maps MIME types to the necessary command-line tools to handle them.+// This centralizes the tool requirements for different file types.+var mimeTools = map[mimeType][]string{arMimeType: {"ar"},rpmMimeType: {"rpm2cpio", "cpio"},}-// Check if the command-line tool is installed.-func isToolInstalled(tool string) bool {- _, err := exec.LookPath(tool)- return err == nil+// extractToolCache stores the availability of extraction tools, eliminating the need for repeated filesystem lookups.+var extractToolCache map[string]bool++func init() {+ // Preload the extractToolCache with the availability status of each required tool.+ extractToolCache = make(map[string]bool)+ for _, tools := range mimeTools {+ for _, tool := range tools {+ _, err := exec.LookPath(tool)+ extractToolCache[tool] = err == nil+ }+ }}-// Ensure all tools are available for given mime type.-func ensureToolsForMimeType(mimeType string) error {+func ensureToolsForMimeType(mimeType mimeType) error {tools, exists := mimeTools[mimeType]if !exists {- return fmt.Errorf("unsupported mime type")+ return fmt.Errorf("unsupported mime type: %s", mimeType)}for _, tool := range tools {- if !isToolInstalled(tool) {- return fmt.Errorf("Required tool " + tool + " is not installed")+ if installed := extractToolCache[tool]; !installed {+ return fmt.Errorf("required tool %s is not installed", tool)}}-return nil}@@ -389,9 +398,7 @@ func (a *Archive) handleNestedFileMIME(ctx logContext.Context, tempEnv tempEnv,}switch mimeType {- case arMimeType:- _, _, err = a.HandleSpecialized(ctx, reader)- case rpmMimeType:+ case arMimeType, rpmMimeType:_, _, err = a.HandleSpecialized(ctx, reader)default:return "", nil@@ -406,7 +413,7 @@ func (a *Archive) handleNestedFileMIME(ctx logContext.Context, tempEnv tempEnv,// determineMimeType reads from the provided reader to detect the MIME type.// It returns the detected MIME type and a new reader that includes the read portion.-func determineMimeType(reader io.Reader) (string, io.Reader, error) {+func determineMimeType(reader io.Reader) (mimeType, io.Reader, error) {buffer := make([]byte, 512)n, err := reader.Read(buffer)if err != nil {@@ -422,7 +429,7 @@ func determineMimeType(reader io.Reader) (string, io.Reader, error) {return "", nil, fmt.Errorf("unable to determine file type: %w", err)}- return kind.MIME.Value, reader, nil+ return mimeType(kind.MIME.Value), reader, nil}// handleExtractedFiles processes each file in the extracted directory using a provided handler function.