Refactor inTotoMaterials to skip directories

Author: aledbf

pkg/leeway/provenance.go

@@ -295,9 +295,16 @@ type provenanceEnvironment struct {
 func (p *Package) inTotoMaterials() ([]in_toto.ProvenanceMaterial, error) {
 	res := make([]in_toto.ProvenanceMaterial, 0, len(p.Sources))
 	for _, src := range p.Sources {
-		if stat, err := os.Lstat(src); err != nil {
+		stat, err := os.Lstat(src);
+		if err != nil {
 			return nil, err
-		} else if !stat.Mode().IsRegular() {
+		}
+
+		if stat.Mode().IsDir() {
+			continue
+		}
+
+		if !stat.Mode().IsRegular() {
 			continue
 		}
 
@@ -326,12 +333,14 @@ func sha256Hash(fn string) (res string, err error) {
 		return "", xerrors.Errorf("cannot compute hash of %s: %w", fn, err)
 	}
 
+	defer f.Close()
+
 	hash := sha256.New()
 	_, err = io.Copy(hash, f)
 	if err != nil {
 		return "", xerrors.Errorf("cannot compute hash of %s: %w", fn, err)
 	}
-	f.Close()
+
 
 	return fmt.Sprintf("%x", hash.Sum(nil)), nil
 }