Fixed small bug where input wasn't being redacted if at the end

Author: savannah-ryan

phone.go

@@ -8,12 +8,12 @@ func (this *phoneRedaction) clear() {
 }
 func (this *phoneRedaction) match(input []byte) {
 	var previousBreak byte
-	for i := 0; i < len(input)-1; i++ {
+	for i, val := range input {
 		if i < len(this.used)-1 && this.used[i] {
 			this.resetCount(i)
 			continue
 		}
-		if isNumeric(input[i]) {
+		if isNumeric(val) {
 			this.numericLength++
 			this.length++
 			switch {
@@ -28,7 +28,7 @@ func (this *phoneRedaction) match(input []byte) {
 			continue
 		}
 		if i < len(input)-1 {
-			this.validateBreaks(input[i], previousBreak, i)
+			this.validateBreaks(val, previousBreak, i)
 			previousBreak = input[i]
 		}
 	}

redactor_test.go

@@ -152,6 +152,7 @@ func TestRedactEmail_Invalid_NoRedaction(t *testing.T) {
 func TestRedactPhone_Valid_Redaction(t *testing.T) {
 	t.Parallel()
 	redaction := New()
+
 	assertRedaction(t, redaction,
 		"801-111-1111 +1(801)111-1111 taco",
 		"************ +************** taco",
@@ -172,6 +173,10 @@ func TestRedactPhone_Valid_Redaction(t *testing.T) {
 		"Blah 801-111-1111 and (801) 111-1111 +1(801)111-1111 taco",
 		"Blah ************ and (801) 111-1111 +************** taco",
 	)
+	assertRedaction(t, redaction,
+		"1111|801-111-1111",
+		"1111|************",
+	)
 }
 func TestRedactPhone_Invalid_NoRedaction(t *testing.T) {
 	t.Parallel()
@@ -197,6 +202,10 @@ func TestRedactSSN_Valid_Redaction(t *testing.T) {
 		"Blah 123-12-1234.",
 		"Blah ***********.",
 	)
+	assertRedaction(t, redaction,
+		"Blah|123-12-1234",
+		"Blah|***********",
+	)
 	assertRedaction(t, redaction,
 		"123 12 1234 taco",
 		"*********** taco",

ssn.go

@@ -6,12 +6,12 @@ func (this *ssnRedaction) clear() {
 	this.breakLength = 0
 }
 func (this *ssnRedaction) match(input []byte) {
-	for i := 0; i < len(input)-1; i++ {
+	for i, val := range input {
 		if i < len(this.used)-1 && this.used[i] {
 			this.resetCount(i)
 			continue
 		}
-		if isNumeric(input[i]) {
+		if isNumeric(val) {
 			this.length++
 			switch {
 			case this.length < MaxSSNLength_WithBreaks && this.breakLength <= MaxSSNBreakLength:
@@ -25,7 +25,7 @@ func (this *ssnRedaction) match(input []byte) {
 			continue
 		}
 		if i < len(input)-1 {
-			this.validateBreaks(input[i], i)
+			this.validateBreaks(val, i)
 		}
 	}
 	this.resetCount(0)