chore: update context in mal.go; use errors.Is for ErrNotExist checks (#1359)

Signed-off-by: egibs <20933572+egibs@users.noreply.github.com>

Author: egibs

cmd/mal/mal.go

@@ -121,7 +121,7 @@ func main() {
 		ver      string
 	)
 
-	ctx, cancel := context.WithCancel(context.TODO())
+	ctx, cancel := context.WithCancel(context.Background())
 	ctx = clog.WithLogger(ctx, log)
 	defer cancel()
 

pkg/action/path.go

@@ -5,6 +5,7 @@ package action
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -28,7 +29,7 @@ func findFilesRecursively(ctx context.Context, rootPath string) ([]string, error
 	if err != nil {
 		// If the target does not exist, log the error but return gracefully
 		// This is useful when scanning -compat packages
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			logger.Debugf("symlink target does not exist: %s", err.Error())
 			return nil, nil
 		}

pkg/archive/archive.go

@@ -6,8 +6,10 @@ package archive
 import (
 	"archive/tar"
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -83,7 +85,7 @@ func extractNestedArchive(ctx context.Context, c malcontent.Config, d string, f
 
 	fullPath := filepath.Join(d, f)
 	fi, err := os.Stat(fullPath)
-	if os.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return nil
 	}
 	if err != nil {
@@ -397,7 +399,7 @@ func handleHardlink(dir, linkPath, linkTarget string) error {
 	}
 
 	if err := os.Link(targetPath, fullPath); err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return nil
 		}
 		return fmt.Errorf("failed to create hardlink: %w", err)

pkg/compile/compile_test.go

@@ -5,6 +5,7 @@ package compile
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -37,7 +38,7 @@ func clearRulesCache(t *testing.T, fss []fs.FS) {
 
 	cacheFile := filepath.Join(cacheDir, fmt.Sprintf("rules-%s.cache", hash))
 
-	if err := os.Remove(cacheFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(cacheFile); err != nil && !errors.Is(err, fs.ErrNotExist) {
 		t.Fatalf("Failed to remove cache file: %v", err)
 	}
 }
@@ -59,7 +60,7 @@ func clearRulesCacheB(b *testing.B, fss []fs.FS) {
 
 	cacheFile := filepath.Join(cacheDir, fmt.Sprintf("rules-%s.cache", hash))
 
-	if err := os.Remove(cacheFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(cacheFile); err != nil && !errors.Is(err, fs.ErrNotExist) {
 		b.Fatalf("Failed to remove cache file: %v", err)
 	}
 }
@@ -122,7 +123,7 @@ func TestCacheOperations(t *testing.T) {
 		t.Fatalf("Failed to save rules to cache: %v", err)
 	}
 
-	if _, err := os.Stat(cacheFile); os.IsNotExist(err) {
+	if _, err := os.Stat(cacheFile); errors.Is(err, fs.ErrNotExist) {
 		t.Fatal("Cache file was not created")
 	}
 

pkg/programkind/programkind.go

@@ -237,7 +237,7 @@ func UPXInstalled() error {
 
 	fi, err := os.Stat(upxPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return ErrUPXNotFound
 		}
 		return fmt.Errorf("failed to check for UPX executable: %w", err)
@@ -387,7 +387,7 @@ func containsValue(value string, slice []string) bool {
 func File(ctx context.Context, path string) (*FileType, error) {
 	// Follow symlinks and return cleanly if the target does not exist
 	_, err := filepath.EvalSymlinks(path)
-	if os.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return nil, nil
 	}
 

third_party/yara/update.sh

@@ -51,40 +51,42 @@ function fixup_rules() {
 # update_dep updates a dependency to the latest release
 function update_dep() {
 	local kind=$1
-	local tmpdir=$(mktemp -d)
+	local tmpdir=""
 	local rel="unknown"
 
+	tmpdir="$(mktemp -d)"
+
 	mkdir -p "${kind}" || true
 
 	case $kind in
 	YARAForge)
 		rel=$(latest_github_release YARAHQ/yara-forge)
-		curl -L -o "${tmpdir}/yaraforge.zip" "https://github.com/YARAHQ/yara-forge/releases/download/${rel}/yara-forge-rules-full.zip"
-		unzip -o -j "${tmpdir}/yaraforge.zip" packages/full/yara-rules-full.yar -d "${kind}"
+		curl -L -o "${tmpdir}"/yaraforge.zip "https://github.com/YARAHQ/yara-forge/releases/download/${rel}/yara-forge-rules-full.zip"
+		unzip -o -j "${tmpdir}"/yaraforge.zip packages/full/yara-rules-full.yar -d "${kind}"
 		;;
 	huntress)
 		rel=$(git_clone https://github.com/huntresslabs/threat-intel.git "${tmpdir}")
 		find "${tmpdir}" \( -name "*.yar*" -o -name "*LICENSE*" \) -print -exec cp {} "${kind}" \;
 		# error: rule "BOINC" in boinc.yar(1): syntax error, unexpected identifier, expecting '{'
-		rm "${kind}/boinc.yar"
+		rm "${kind}"/boinc.yar
 		# ^ expecting pattern modifier, pattern identifier or `condition`, found `}` (missing condition field)
-		rm "${kind}/defendnot_tool.yar"
+		rm "${kind}"/defendnot_tool.yar
 		;;
 	InQuest-VT)
 		rel=$(git_clone https://github.com/InQuest/yara-rules-vt.git "${tmpdir}")
 		find "${tmpdir}" \( -name "*.yar*" -o -name "*LICENSE*" -o -name "README*" \) -print -exec cp {} "${kind}" \;
 		;;
 	bartblaze)
 		rel=$(git_clone https://github.com/bartblaze/Yara-rules.git "${tmpdir}")
-		cp -Rp ${tmpdir}/LICENSE ${tmpdir}/README.md ${tmpdir}/rules/* "${kind}/"
+		cp -Rp "${tmpdir}"/LICENSE "${tmpdir}"/README.md "${tmpdir}"/rules/* "${kind}"/
 		;;
 	JPCERT)
 		rel=$(git_clone https://github.com/JPCERTCC/jpcert-yara.git "${tmpdir}")
 		find "${tmpdir}" \( -name "*.yar*" -o -name "*LICENSE*" -o -name "README*" \) -print -exec cp {} "${kind}" \;
 		;;
 	TTC-CERT)
 		rel=$(git_clone https://github.com/ttc-cert/TTC-CERT-YARA-Rules.git "${tmpdir}")
-		cp -Rp ${tmpdir}/* "${kind}/"
+		cp -Rp "${tmpdir}"/* "${kind}"/
 		;;
 	elastic)
 	  rel=$(git_clone https://github.com/elastic/protections-artifacts.git "${tmpdir}")
@@ -96,12 +98,12 @@ function update_dep() {
 		;;
 	esac
 
-	fixup_rules ${kind}/*.yar* # nolint
-	echo "${rel}" >"${kind}/RELEASE"
+	fixup_rules "${kind}"/*.yar*
+	echo "${rel}" > "${kind}"/RELEASE
 	echo "updated ${kind} to ${rel}"
 }
 
-cd "$(dirname $0)"
+cd "$(dirname "$0")"
 
 if [[ "$1" != "" ]]; then
 	update_dep "$1"