Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
[chore] Fix potential resource leak in postman source (#2606)
Miccah3a7266e54034
diff --git a/pkg/sources/postman/postman.go b/pkg/sources/postman/postman.goindex d1b86a582..ad6227ddd 100644--- a/pkg/sources/postman/postman.go+++ b/pkg/sources/postman/postman.go@@ -165,37 +165,11 @@ func (s *Source) Chunks(ctx context.Context, chunksChan chan *sources.Chunk, _ .// check if zip fileworkspace := Workspace{}if strings.HasSuffix(workspacePath, ".zip") {- r, err := zip.OpenReader(workspacePath)+ var err error+ workspace, err = unpackWorkspace(workspacePath)if err != nil {return err}- for _, file := range r.File {- rc, err := file.Open()- if err != nil {- return err- }- contents, err := io.ReadAll(rc)- rc.Close()- if err != nil {- return err- }- if strings.Contains(file.Name, "collection") {- // read in the collection then scan it- c := Collection{}- if err = json.Unmarshal(contents, &c); err != nil {- return err- }- workspace.CollectionsRaw = append(workspace.CollectionsRaw, c)- }- if strings.Contains(file.Name, "environment") {- e := VariableData{}- if err = json.Unmarshal(contents, &e); err != nil {- return err- }- workspace.EnvironmentsRaw = append(workspace.EnvironmentsRaw, e)- }- }- r.Close()}basename := path.Base(workspacePath)workspace.ID = strings.TrimSuffix(basename, filepath.Ext(basename))@@ -673,6 +647,45 @@ func (s *Source) scanData(ctx context.Context, chunksChan chan *sources.Chunk, d}}+// unpackWorkspace unzips the provided zip file and scans the inflated files+// for collections and environments. It populates the CollectionsRaw and+// EnvironmentsRaw fields of the Workspace object.+func unpackWorkspace(workspacePath string) (Workspace, error) {+ var workspace Workspace+ r, err := zip.OpenReader(workspacePath)+ if err != nil {+ return workspace, err+ }+ defer r.Close()+ for _, file := range r.File {+ rc, err := file.Open()+ if err != nil {+ return workspace, err+ }+ contents, err := io.ReadAll(rc)+ rc.Close()+ if err != nil {+ return workspace, err+ }+ if strings.Contains(file.Name, "collection") {+ // read in the collection then scan it+ var c Collection+ if err = json.Unmarshal(contents, &c); err != nil {+ return workspace, err+ }+ workspace.CollectionsRaw = append(workspace.CollectionsRaw, c)+ }+ if strings.Contains(file.Name, "environment") {+ var e VariableData+ if err = json.Unmarshal(contents, &e); err != nil {+ return workspace, err+ }+ workspace.EnvironmentsRaw = append(workspace.EnvironmentsRaw, e)+ }+ }+ return workspace, nil+}+func shouldSkip(uuid string, include []string, exclude []string) bool {if slices.Contains(exclude, uuid) {return true