all: fix errors found by nilaway

Author: adamdecaf

batchErrors.go

@@ -87,10 +87,12 @@ func (b *Batch) Error(field string, err error, values ...interface{}) error {
 		return err
 	}
 	be := BatchError{
-		BatchNumber: b.Header.BatchNumber,
-		BatchType:   b.Header.StandardEntryClassCode,
-		FieldName:   field,
-		Err:         err,
+		FieldName: field,
+		Err:       err,
+	}
+	if b != nil {
+		be.BatchNumber = b.Header.BatchNumber
+		be.BatchType = b.Header.StandardEntryClassCode
 	}
 	// only the first value counts
 	if len(values) > 0 {

cmd/achcli/describe.go

@@ -19,7 +19,9 @@ func dumpFiles(paths []string, validateOpts *ach.ValidateOpts) error {
 		if err != nil {
 			fmt.Printf("WARN: problem reading %s:\n %v\n\n", paths[i], err)
 		}
-		files[i] = f
+		if f != nil {
+			files[i] = f
+		}
 	}
 
 	if *flagMerge {
@@ -38,7 +40,9 @@ func dumpFiles(paths []string, validateOpts *ach.ValidateOpts) error {
 			if err != nil {
 				fmt.Printf("ERROR: problem flattening file: %v\n", err)
 			}
-			files[i] = file
+			if file != nil {
+				files[i] = file
+			}
 		}
 	}
 

cmd/writeACH/main.go

@@ -67,7 +67,8 @@ func write(path string) {
 
 	f, err := os.Create(path)
 	if err != nil {
-		fmt.Printf("%T: %s", err, err)
+		fmt.Printf("%T: %v\n", err, err)
+		return
 	}
 
 	// To create a file
@@ -91,7 +92,11 @@ func write(path string) {
 		bh.EffectiveEntryDate = time.Now().AddDate(0, 0, 1).Format("060102")
 		bh.ODFIIdentification = "121042882"
 
-		batch, _ := ach.NewBatch(bh)
+		batch, err := ach.NewBatch(bh)
+		if err != nil {
+			fmt.Printf("%T: %v\n", err, err)
+			return
+		}
 
 		// Create Entry
 		entrySeq := 0
@@ -121,7 +126,8 @@ func write(path string) {
 
 		// Create the batch.
 		if err := batch.Create(); err != nil {
-			fmt.Printf("%T: %s", err, err)
+			fmt.Printf("%T: %v\n", err, err)
+			return
 		}
 
 		// Add batch to the file
@@ -131,30 +137,35 @@ func write(path string) {
 	// ensure we have a validated file structure
 	if file.Validate(); err != nil {
 		fmt.Printf("Could not validate entire file: %v", err)
+		return
 	}
 
 	// Create the file
 	if err := file.Create(); err != nil {
-		fmt.Printf("%T: %s", err, err)
+		fmt.Printf("%T: %v\n", err, err)
+		return
 	}
 
 	// Write to a file
 	if *flagJson {
 		// Write in JSON format
 		if err := json.NewEncoder(f).Encode(file); err != nil {
-			fmt.Printf("%T: %s", err, err)
+			fmt.Printf("%T: %v\n", err, err)
+			return
 		}
 	} else {
 		// Write in ACH plain text format
 		w := ach.NewWriter(f)
 		if err := w.Write(file); err != nil {
-			fmt.Printf("%T: %s", err, err)
+			fmt.Printf("%T: %v\n", err, err)
+			return
 		}
 		w.Flush()
 	}
 
 	if err := f.Close(); err != nil {
-		fmt.Println(err.Error())
+		fmt.Printf("%T: %v\n", err, err)
+		return
 	}
 
 	fmt.Printf("Wrote %s\n", path)

examples/http/main.go

@@ -104,11 +104,12 @@ func main() {
 	req.Header.Set("Content-Type", "application/json")
 
 	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
+	if resp == nil || err != nil {
 		log.Fatal(err)
 	}
-	defer resp.Body.Close()
-
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
 	if resp.StatusCode == 200 {
 		log.Printf("File created!")
 	} else {

file.go

@@ -544,6 +544,9 @@ func (f *File) Create() error {
 
 // AddBatch appends a Batch to the ach.File
 func (f *File) AddBatch(batch Batcher) []Batcher {
+	if batch == nil {
+		return f.Batches
+	}
 	if batch.Category() == CategoryNOC {
 		f.NotificationOfChange = append(f.NotificationOfChange, batch)
 	}
@@ -984,7 +987,10 @@ func (f *File) SegmentFile(_ *SegmentFileConfiguration) (*File, *File, error) {
 	}
 
 	if f.Batches != nil {
-		f.segmentFileBatches(creditFile, debitFile)
+		err := f.segmentFileBatches(creditFile, debitFile)
+		if err != nil {
+			return nil, nil, err
+		}
 	}
 
 	if f.IATBatches != nil {
@@ -1013,7 +1019,7 @@ func (f *File) SegmentFile(_ *SegmentFileConfiguration) (*File, *File, error) {
 	return creditFile, debitFile, nil
 }
 
-func (f *File) segmentFileBatches(creditFile, debitFile *File) {
+func (f *File) segmentFileBatches(creditFile, debitFile *File) error {
 	for _, batch := range f.Batches {
 		bh := batch.GetHeader()
 
@@ -1030,7 +1036,10 @@ func (f *File) segmentFileBatches(creditFile, debitFile *File) {
 
 				entries := batch.GetADVEntries()
 				for _, entry := range entries {
-					segmentFileBatchAddADVEntry(creditBatch, debitBatch, entry)
+					err := segmentFileBatchAddADVEntry(creditBatch, debitBatch, entry)
+					if err != nil {
+						return err
+					}
 				}
 				// Add the Entry to its Batch
 				if creditBatch != nil && len(creditBatch.GetADVEntries()) > 0 {
@@ -1054,7 +1063,10 @@ func (f *File) segmentFileBatches(creditFile, debitFile *File) {
 
 				entries := batch.GetEntries()
 				for _, entry := range entries {
-					segmentFileBatchAddEntry(creditBatch, debitBatch, entry)
+					err := segmentFileBatchAddEntry(creditBatch, debitBatch, entry)
+					if err != nil {
+						return err
+					}
 				}
 
 				if creditBatch != nil && len(creditBatch.GetEntries()) > 0 {
@@ -1072,6 +1084,7 @@ func (f *File) segmentFileBatches(creditFile, debitFile *File) {
 			}
 		}
 	}
+	return nil
 }
 
 // segmentFileIATBatches segments IAT batches debits and credits into debit and credit files
@@ -1175,29 +1188,45 @@ func (f *File) addFileHeaderData(file *File) *File {
 
 // segmentFileBatchAddEntry adds entries to batches in a segmented file
 // Applies to All SEC Codes except ADV (Automated Accounting Advice)
-func segmentFileBatchAddEntry(creditBatch, debitBatch Batcher, entry *EntryDetail) {
+func segmentFileBatchAddEntry(creditBatch, debitBatch Batcher, entry *EntryDetail) error {
 	switch entry.TransactionCode {
 	case CheckingCredit, CheckingReturnNOCCredit, CheckingPrenoteCredit, CheckingZeroDollarRemittanceCredit,
 		SavingsCredit, SavingsReturnNOCCredit, SavingsPrenoteCredit, SavingsZeroDollarRemittanceCredit,
 		GLCredit, GLReturnNOCCredit, GLPrenoteCredit, GLZeroDollarRemittanceCredit,
 		LoanCredit, LoanReturnNOCCredit, LoanPrenoteCredit, LoanZeroDollarRemittanceCredit:
+		if creditBatch == nil {
+			return errors.New("missing creditBatch")
+		}
 		creditBatch.AddEntry(entry)
+
 	case CheckingDebit, CheckingReturnNOCDebit, CheckingPrenoteDebit, CheckingZeroDollarRemittanceDebit,
 		SavingsDebit, SavingsReturnNOCDebit, SavingsPrenoteDebit, SavingsZeroDollarRemittanceDebit,
 		GLDebit, GLReturnNOCDebit, GLPrenoteDebit, GLZeroDollarRemittanceDebit,
 		LoanDebit, LoanReturnNOCDebit:
+		if debitBatch == nil {
+			return errors.New("missing debitBatch")
+		}
 		debitBatch.AddEntry(entry)
 	}
+	return nil
 }
 
 // segmentFileBatchAddADVEntry adds entries to batches in a segment file for SEC Code ADV (Automated Accounting Advice)
-func segmentFileBatchAddADVEntry(creditBatch Batcher, debitBatch Batcher, entry *ADVEntryDetail) {
+func segmentFileBatchAddADVEntry(creditBatch Batcher, debitBatch Batcher, entry *ADVEntryDetail) error {
 	switch entry.TransactionCode {
 	case CreditForDebitsOriginated, CreditForCreditsReceived, CreditForCreditsRejected, CreditSummary:
+		if creditBatch == nil {
+			return errors.New("missing creditBatch")
+		}
 		creditBatch.AddADVEntry(entry)
+
 	case DebitForCreditsOriginated, DebitForDebitsReceived, DebitForDebitsRejectedBatches, DebitSummary:
+		if debitBatch == nil {
+			return errors.New("missing debitBatch")
+		}
 		debitBatch.AddADVEntry(entry)
 	}
+	return nil
 }
 
 // Validates that the batch numbers are ascending

iterator.go

@@ -110,6 +110,9 @@ func (i *Iterator) NextEntry() (*BatchHeader, *EntryDetail, error) {
 			if err != nil {
 				return nil, nil, fmt.Errorf("faking batch for line %d failed: %w", i.reader.lineNum, err)
 			}
+			if i.reader.currentBatch == nil {
+				return nil, nil, fmt.Errorf("failed to create %s batch: %v", bh.StandardEntryClassCode, err)
+			}
 			if err := i.reader.readLine(line); err != nil {
 				return nil, nil, fmt.Errorf("reading line %d with fake BatchHeader failed: %w", i.reader.lineNum, err)
 			}

makefile

@@ -28,7 +28,7 @@ ifeq ($(OS),Windows_NT)
 else
 	@wget -O lint-project.sh https://raw.githubusercontent.com/moov-io/infra/master/go/lint-project.sh
 	@chmod +x ./lint-project.sh
-	GOLANGCI_LINTERS=prealloc GOLANGCI_SKIP_DIR=test EXPERIMENTAL=shuffle \
+	GOLANGCI_LINTERS=prealloc GOLANGCI_SKIP_DIR=test EXPERIMENTAL=nilaway,shuffle \
 	GOCYCLO_LIMIT=26 COVER_THRESHOLD=90.0 \
 	GOOS=js GOARCH=wasm time ./lint-project.sh
 endif

merge.go

@@ -18,6 +18,7 @@
 package ach
 
 import (
+	"fmt"
 	"time"
 )
 
@@ -229,7 +230,10 @@ func (fs *mergableFiles) findOutfile(f *File) *File {
 }
 
 func mergeEntries(b1, b2 Batcher) (Batcher, error) {
-	b, _ := NewBatch(b1.GetHeader())
+	b, err := NewBatch(b1.GetHeader())
+	if err != nil {
+		return nil, fmt.Errorf("mergeEntries: %w", err)
+	}
 	entries := sortEntriesByTraceNumber(append(b1.GetEntries(), b2.GetEntries()...))
 	for i := range entries {
 		b.AddEntry(entries[i])

reader.go

@@ -575,22 +575,30 @@ func (r *Reader) parseAddenda() error {
 
 // parseADVAddenda takes the input record string and create an Addenda99 appended to the last ADVEntryDetail
 func (r *Reader) parseADVAddenda() error {
+	if r.currentBatch == nil {
+		return ErrFileAddendaOutsideBatch
+	}
 	if len(r.currentBatch.GetADVEntries()) == 0 {
 		return ErrFileAddendaOutsideEntry
 	}
+
 	entryIndex := len(r.currentBatch.GetADVEntries()) - 1
 	entry := r.currentBatch.GetADVEntries()[entryIndex]
 
 	if entry.AddendaRecordIndicator != 1 {
 		return r.parseError(r.currentBatch.Error("AddendaRecordIndicator", ErrBatchAddendaIndicator))
 	}
+
 	addenda99 := NewAddenda99()
 	addenda99.Parse(r.line)
+
 	if err := maybeValidate(addenda99, r.File.validateOpts); err != nil {
 		return r.parseError(err)
 	}
+
 	r.currentBatch.GetADVEntries()[entryIndex].Category = CategoryReturn
 	r.currentBatch.GetADVEntries()[entryIndex].Addenda99 = addenda99
+
 	return nil
 }
 

server/files.go

@@ -161,7 +161,11 @@ func decodeCreateFileRequest(_ context.Context, request *http.Request) (interfac
 	}
 
 	for _, name := range validationNames {
-		input := request.URL.Query().Get(name)
+		q := request.URL.Query()
+		if q == nil {
+			continue
+		}
+		input := q.Get(name)
 		if input == "" {
 			continue
 		}
@@ -237,7 +241,9 @@ func decodeCreateFileRequest(_ context.Context, request *http.Request) (interfac
 	// Set the fileID from the request
 	fileID, ok := mux.Vars(request)["fileID"]
 	if ok && fileID != "" && fileID != "create" {
-		req.File.ID = fileID
+		if req.File != nil {
+			req.File.ID = fileID
+		}
 	}
 
 	return req, nil

server/repository.go

@@ -133,7 +133,9 @@ func (r *repositoryInMemory) StoreBatch(fileID string, batch ach.Batcher) error
 	}
 
 	// Add the batch to the file
-	r.files[fileID].AddBatch(batch)
+	if f := r.files[fileID]; f != nil {
+		f.AddBatch(batch)
+	}
 
 	return nil
 }
@@ -203,7 +205,11 @@ func (r *repositoryInMemory) cleanupOldFiles() {
 	tooOldStr := tooOld.Format("060102") // YYMMDD
 
 	for i := range r.files {
-		if r.files[i].Header.FileCreationDate < tooOldStr {
+		file := r.files[i]
+		if file == nil {
+			continue
+		}
+		if file.Header.FileCreationDate < tooOldStr {
 			removed++
 			delete(r.files, i)
 		}

server/routing.go

@@ -242,7 +242,9 @@ func marshalStructWithError(in interface{}, w http.ResponseWriter) error {
 	for i := 0; i < v.NumField(); i++ {
 		name := v.Type().Field(i).Name
 		value := v.Field(i).Interface()
-
+		if value == nil {
+			continue
+		}
 		if err, ok := value.(error); ok {
 			out["error"] = err.Error()
 		} else {

test/ach-adv-write-multipleBatches/main.go

@@ -47,7 +47,10 @@ func main() {
 		bh.ODFIIdentification = "121042882"
 		bh.OriginatorStatusCode = 0
 
-		batch, _ := ach.NewBatch(bh)
+		batch, err := ach.NewBatch(bh)
+		if err != nil {
+			log.Fatalf("%T: %v", err, err)
+		}
 
 		// Create Entry
 		entrySeq := 0

test/server-example/main.go

@@ -27,6 +27,7 @@ import (
 	"github.com/moov-io/ach/server"
 
 	"github.com/go-kit/log"
+	"github.com/stretchr/testify/require"
 )
 
 func TestServer__CreateFile(t *testing.T) {
@@ -55,7 +56,10 @@ func TestServer__CreateFile(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer resp.Body.Close()
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+	require.NotNil(t, resp)
 
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("got %d HTTP status code", resp.StatusCode)