all: check record lengths before parsing them

moov-io · Jun 27, 2019 · b75dd13 · b75dd13
1 parent 538b6eb
commit b75dd13
Show file tree

Hide file tree

Showing 24 changed files with 190 additions and 9 deletions.
diff --git a/CheckDetailAddendumC.go b/CheckDetailAddendumC.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a CheckDetailAddendumC Record
@@ -98,6 +99,10 @@ func NewCheckDetailAddendumC() CheckDetailAddendumC {
 
 // Parse takes the input record string and parses the CheckDetailAddendumC values
 func (cdAddendumC *CheckDetailAddendumC) Parse(record string) {
+	if utf8.RuneCountInString(record) < 60 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "28"
 	cdAddendumC.recordType = "28"
 	// 03-04

diff --git a/checkDetail.go b/checkDetail.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"unicode/utf8"
 )
 
 // Errors specific to a CheckDetail Record
@@ -162,6 +163,10 @@ func NewCheckDetail() *CheckDetail {
 
 // Parse takes the input record string and parses the CheckDetail values
 func (cd *CheckDetail) Parse(record string) {
+	if utf8.RuneCountInString(record) < 80 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "25"
 	cd.recordType = "25"
 	// 03-17

diff --git a/checkDetailAddendumA.go b/checkDetailAddendumA.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a CheckDetailAddendumA Record
@@ -94,6 +95,10 @@ func NewCheckDetailAddendumA() CheckDetailAddendumA {
 
 // Parse takes the input record string and parses the CheckDetailAddendumA values
 func (cdAddendumA *CheckDetailAddendumA) Parse(record string) {
+	if utf8.RuneCountInString(record) < 77 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "26"
 	cdAddendumA.recordType = "26"
 	// 03-03

diff --git a/checkDetailAddendumA_test.go b/checkDetailAddendumA_test.go
@@ -28,6 +28,14 @@ func mockCheckDetailAddendumA() CheckDetailAddendumA {
 	return cdAddendumA
 }
 
+func TestCheckDetailAddendumParseErr(t *testing.T) {
+	var c CheckDetailAddendumA
+	c.Parse("asdshfaksjs")
+	if c.RecordNumber != 0 {
+		t.Errorf("c.RecordNumber=%d", c.RecordNumber)
+	}
+}
+
 // TestMockCheckDetailAddendumA creates a CheckDetailAddendumA
 func TestMockCheckDetailAddendumA(t *testing.T) {
 	cdAddendumA := mockCheckDetailAddendumA()

diff --git a/checkDetailAddendumB.go b/checkDetailAddendumB.go
@@ -7,6 +7,7 @@ package imagecashletter
 import (
 	"fmt"
 	"strings"
+	"unicode/utf8"
 )
 
 // Errors specific to a CheckDetailAddendumB Record
@@ -60,6 +61,10 @@ func NewCheckDetailAddendumB() CheckDetailAddendumB {
 
 // Parse takes the input record string and parses the CheckDetailAddendumB values
 func (cdAddendumB *CheckDetailAddendumB) Parse(record string) {
+	if utf8.RuneCountInString(record) < 22 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "27"
 	cdAddendumB.recordType = "27"
 	// 03-03
@@ -68,14 +73,20 @@ func (cdAddendumB *CheckDetailAddendumB) Parse(record string) {
 	cdAddendumB.MicrofilmArchiveSequenceNumber = cdAddendumB.parseStringField(record[3:18])
 	// 19-22
 	cdAddendumB.LengthImageReferenceKey = cdAddendumB.parseStringField(record[18:22])
+
+	imageRefLength := cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey)
+	if utf8.RuneCountInString(record) < 46+imageRefLength {
+		return // line too short
+	}
+
 	// 23 (22+X)
-	cdAddendumB.ImageReferenceKey = cdAddendumB.parseStringField(record[22:cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey)])
+	cdAddendumB.ImageReferenceKey = cdAddendumB.parseStringField(record[22:imageRefLength])
 	// 23+X - 37+X
-	cdAddendumB.Description = cdAddendumB.parseStringField(record[22+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey) : 37+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey)])
+	cdAddendumB.Description = cdAddendumB.parseStringField(record[22+imageRefLength : 37+imageRefLength])
 	// 38+X - 41+X
-	cdAddendumB.UserField = cdAddendumB.parseStringField(record[37+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey) : 41+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey)])
+	cdAddendumB.UserField = cdAddendumB.parseStringField(record[37+imageRefLength : 41+imageRefLength])
 	// 42+X - 46+X
-	cdAddendumB.reserved = cdAddendumB.parseStringField(record[41+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey) : 46+cdAddendumB.parseNumField(cdAddendumB.LengthImageReferenceKey)])
+	cdAddendumB.reserved = cdAddendumB.parseStringField(record[41+imageRefLength : 46+imageRefLength])
 }
 
 // String writes the CheckDetailAddendumB struct to a string.

diff --git a/checkDetailAddendumB_test.go b/checkDetailAddendumB_test.go
@@ -22,6 +22,21 @@ func mockCheckDetailAddendumB() CheckDetailAddendumB {
 	return cdAddendumB
 }
 
+func TestCheckDetailAddendumBParseErr(t *testing.T) {
+	var c CheckDetailAddendumB
+	c.Parse("asdhfakjfsa")
+	if c.ImageReferenceKeyIndicator != 0 {
+		t.Errorf("c.ImageReferenceKeyIndicator=%d", c.ImageReferenceKeyIndicator)
+	}
+	c.Parse("2711A             00340                                 CD Addendum B")
+	if c.ImageReferenceKeyIndicator != 1 {
+		t.Errorf("c.ImageReferenceKeyIndicator=%d", c.ImageReferenceKeyIndicator)
+	}
+	if c.ImageReferenceKey != "" {
+		t.Errorf("c.ImageReferenceKey=%s", c.ImageReferenceKey)
+	}
+}
+
 // TestMockCheckDetailAddendumB creates a CheckDetailAddendumB
 func TestMockCheckDetailAddendumB(t *testing.T) {
 	cdAddendumB := mockCheckDetailAddendumB()

diff --git a/checkDetailAddendumC_test.go b/checkDetailAddendumC_test.go
@@ -65,6 +65,14 @@ func TestMockCheckDetailAddendumC(t *testing.T) {
 	}
 }
 
+func TestParseCheckDetailAddendumCErr(t *testing.T) {
+	var c CheckDetailAddendumC
+	c.Parse("asdsakjahsfa")
+	if c.RecordNumber != 0 {
+		t.Errorf("c.RecordNumber=%d", c.RecordNumber)
+	}
+}
+
 // TestParseCheckDetailAddendumC validates parsing a CheckDetailAddendumC
 func TestParseCheckDetailAddendumC(t *testing.T) {
 	var line = "2801121042882201809051              Y10A                   0                    "

diff --git a/checkDetail_test.go b/checkDetail_test.go
@@ -29,6 +29,14 @@ func mockCheckDetail() *CheckDetail {
 	return cd
 }
 
+func TestCheckDetailParseErr(t *testing.T) {
+	var c CheckDetail
+	c.Parse("jakjsakjfas")
+	if c.AuxiliaryOnUs != "" {
+		t.Errorf("c.AuxiliaryOnUs=%s", c.AuxiliaryOnUs)
+	}
+}
+
 // TestMockCheckDetail creates a CheckDetail
 func TestMockCheckDetail(t *testing.T) {
 	cd := mockCheckDetail()

diff --git a/returnDetail.go b/returnDetail.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a ReturnDetail Record
@@ -170,6 +171,10 @@ func NewReturnDetail() *ReturnDetail {
 
 // Parse takes the input record string and parses the ReturnDetail values
 func (rd *ReturnDetail) Parse(record string) {
+	if utf8.RuneCountInString(record) < 72 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "31"
 	rd.recordType = "31"
 	// 03-10

diff --git a/returnDetailAddendumA.go b/returnDetailAddendumA.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a ReturnDetailAddendumA Record
@@ -96,6 +97,10 @@ func NewReturnDetailAddendumA() ReturnDetailAddendumA {
 
 // Parse takes the input record string and parses the ReturnDetailAddendumA values
 func (rdAddendumA *ReturnDetailAddendumA) Parse(record string) {
+	if utf8.RuneCountInString(record) < 77 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "32"
 	rdAddendumA.recordType = "32"
 	// 03-03

diff --git a/returnDetailAddendumA_test.go b/returnDetailAddendumA_test.go
@@ -28,6 +28,14 @@ func mockReturnDetailAddendumA() ReturnDetailAddendumA {
 	return rdAddendumA
 }
 
+func TestReturnDetailAddendumAParseErr(t *testing.T) {
+	var r ReturnDetailAddendumA
+	r.Parse("asdlsajhfakjfa")
+	if r.RecordNumber != 0 {
+		t.Errorf("r.RecordNumber=%d", r.RecordNumber)
+	}
+}
+
 // TestMockReturnDetailAddendumA creates a ReturnDetailAddendumA
 func TestMockReturnDetailAddendumA(t *testing.T) {
 	rdAddendumA := mockReturnDetailAddendumA()

diff --git a/returnDetailAddendumB.go b/returnDetailAddendumB.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a ReturnDetailAddendumB Record
@@ -49,6 +50,10 @@ func NewReturnDetailAddendumB() ReturnDetailAddendumB {
 
 // Parse takes the input record string and parses the ReturnDetailAddendumB values
 func (rdAddendumB *ReturnDetailAddendumB) Parse(record string) {
+	if utf8.RuneCountInString(record) < 80 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "33"
 	rdAddendumB.recordType = "33"
 	// 03-20
@@ -61,7 +66,6 @@ func (rdAddendumB *ReturnDetailAddendumB) Parse(record string) {
 	rdAddendumB.PayorBankBusinessDate = rdAddendumB.parseYYYYMMDDDate(record[50:58])
 	// 59-80
 	rdAddendumB.PayorAccountName = rdAddendumB.parseStringField(record[58:80])
-
 }
 
 // String writes the ReturnDetailAddendumB struct to a string.

diff --git a/returnDetailAddendumB_test.go b/returnDetailAddendumB_test.go
@@ -22,6 +22,14 @@ func mockReturnDetailAddendumB() ReturnDetailAddendumB {
 	return rdAddendumB
 }
 
+func TestReturnDetailAddendumBParseErr(t *testing.T) {
+	var r ReturnDetailAddendumB
+	r.Parse("Asdjashfakjfa")
+	if r.PayorBankName != "" {
+		t.Errorf("r.PayorBankName=%s", r.PayorBankName)
+	}
+}
+
 // TestMockReturnDetailAddendumB creates a ReturnDetailAddendumB
 func TestMockReturnDetailAddendumB(t *testing.T) {
 	rdAddendumB := mockReturnDetailAddendumB()

diff --git a/returnDetailAddendumC.go b/returnDetailAddendumC.go
@@ -7,6 +7,7 @@ package imagecashletter
 import (
 	"fmt"
 	"strings"
+	"unicode/utf8"
 )
 
 // Errors specific to a ReturnDetailAddendumC Record
@@ -61,6 +62,10 @@ func NewReturnDetailAddendumC() ReturnDetailAddendumC {
 
 // Parse takes the input record string and parses the ReturnDetailAddendumC values
 func (rdAddendumC *ReturnDetailAddendumC) Parse(record string) {
+	if utf8.RuneCountInString(record) < 22 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "34"
 	rdAddendumC.recordType = "34"
 	// 03-03
@@ -69,14 +74,20 @@ func (rdAddendumC *ReturnDetailAddendumC) Parse(record string) {
 	rdAddendumC.MicrofilmArchiveSequenceNumber = rdAddendumC.parseStringField(record[3:18])
 	// 19-22
 	rdAddendumC.LengthImageReferenceKey = rdAddendumC.parseStringField(record[18:22])
+
+	imageRefKeyLength := rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey)
+	if utf8.RuneCountInString(record) < 46+imageRefKeyLength {
+		return // line too short
+	}
+
 	// 23 (22+X)
-	rdAddendumC.ImageReferenceKey = rdAddendumC.parseStringField(record[22:rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey)])
+	rdAddendumC.ImageReferenceKey = rdAddendumC.parseStringField(record[22:imageRefKeyLength])
 	// 23+X - 37+X
-	rdAddendumC.Description = rdAddendumC.parseStringField(record[22+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey) : 37+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey)])
+	rdAddendumC.Description = rdAddendumC.parseStringField(record[22+imageRefKeyLength : 37+imageRefKeyLength])
 	// 38+X - 41+X
-	rdAddendumC.UserField = rdAddendumC.parseStringField(record[37+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey) : 41+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey)])
+	rdAddendumC.UserField = rdAddendumC.parseStringField(record[37+imageRefKeyLength : 41+imageRefKeyLength])
 	// 42+X - 46+X
-	rdAddendumC.reserved = rdAddendumC.parseStringField(record[41+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey) : 46+rdAddendumC.parseNumField(rdAddendumC.LengthImageReferenceKey)])
+	rdAddendumC.reserved = rdAddendumC.parseStringField(record[41+imageRefKeyLength : 46+imageRefKeyLength])
 
 }
 

diff --git a/returnDetailAddendumC_test.go b/returnDetailAddendumC_test.go
@@ -22,6 +22,21 @@ func mockReturnDetailAddendumC() ReturnDetailAddendumC {
 	return rdAddendumC
 }
 
+func TestReturnDetailAddendumCParseErr(t *testing.T) {
+	var r ReturnDetailAddendumC
+	r.Parse("ASdsadasda")
+	if r.ImageReferenceKeyIndicator != 0 {
+		t.Errorf("r.ImageReferenceKeyIndicator=%d", r.ImageReferenceKeyIndicator)
+	}
+	r.Parse("3411A             00340                                 RD Addendum C")
+	if r.ImageReferenceKeyIndicator != 1 {
+		t.Errorf("r.ImageReferenceKeyIndicator=%d", r.ImageReferenceKeyIndicator)
+	}
+	if r.ImageReferenceKey != "" {
+		t.Errorf("r.ImageReferenceKey=%s", r.ImageReferenceKey)
+	}
+}
+
 // TestMockReturnDetailAddendumCcreates a ReturnDetailAddendumC
 func TestMockReturnDetailAddendumC(t *testing.T) {
 	rdAddendumC := mockReturnDetailAddendumC()

diff --git a/returnDetailAddendumD.go b/returnDetailAddendumD.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // Errors specific to a ReturnDetailAddendumD Record
@@ -98,6 +99,10 @@ func NewReturnDetailAddendumD() ReturnDetailAddendumD {
 
 // Parse takes the input record string and parses the ReturnDetailAddendumD values
 func (rdAddendumD *ReturnDetailAddendumD) Parse(record string) {
+	if utf8.RuneCountInString(record) < 60 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "35"
 	rdAddendumD.recordType = "35"
 	// 03-04

diff --git a/returnDetailAddendumD_test.go b/returnDetailAddendumD_test.go
@@ -27,6 +27,14 @@ func mockReturnDetailAddendumD() ReturnDetailAddendumD {
 	return rdAddendumD
 }
 
+func TestReturnDetailAddendumDParseErr(t *testing.T) {
+	var r ReturnDetailAddendumD
+	r.Parse("ASdasdas")
+	if r.RecordNumber != 0 {
+		t.Errorf("r.RecordNumber=%d", r.RecordNumber)
+	}
+}
+
 // TestMockReturnDetailAddendumD creates a ReturnDetailAddendumD
 func TestMockReturnDetailAddendumD(t *testing.T) {
 	rdAddendumD := mockReturnDetailAddendumD()

diff --git a/returnDetail_test.go b/returnDetail_test.go
@@ -30,6 +30,14 @@ func mockReturnDetail() *ReturnDetail {
 	return rd
 }
 
+func TestReturnDetailParse(t *testing.T) {
+	var r ReturnDetail
+	r.Parse("asshafaksjfas")
+	if r.PayorBankRoutingNumber != "" {
+		t.Errorf("r.PayorBankRoutingNumber=%s", r.PayorBankRoutingNumber)
+	}
+}
+
 // TestMockReturnDetail creates a ReturnDetail
 func TestMockReturnDetail(t *testing.T) {
 	rd := mockReturnDetail()

diff --git a/routingNumberSummary.go b/routingNumberSummary.go
@@ -7,6 +7,7 @@ package imagecashletter
 import (
 	"fmt"
 	"strings"
+	"unicode/utf8"
 )
 
 // RoutingNumberSummary Record
@@ -40,6 +41,10 @@ func NewRoutingNumberSummary() *RoutingNumberSummary {
 
 // Parse takes the input record string and parses the ImageViewDetail values
 func (rns *RoutingNumberSummary) Parse(record string) {
+	if utf8.RuneCountInString(record) < 55 {
+		return // line too short
+	}
+
 	// Character position 1-2, Always "85"
 	rns.recordType = "85"
 	// 03-11