More validator unit tests and simplifications in UUValidator

Author: jstedfast

MimeKit/Encodings/UUValidator.cs

@@ -141,29 +141,21 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 					if (nsaved != 0 && nsaved != (byte) '\n') {
 						byte* start = inptr;
 
-						// only lines containing whitespace are allowed before the begin marker
-						while (inptr < inend && *inptr != (byte) '\n') {
-							if (!invalidPretext && !(*inptr).IsWhitespace ()) {
-								// FIXME: should this really be emitted for *each* character before the 'begin'?
-								reader.OnMimeComplianceViolation (MimeComplianceViolation.InvalidUUEncodePretext, streamOffset + (int) (inptr - start), lineNumber);
-								invalidPretext = true;
-							}
-
+						// skip ahead to the next line...
+						while (inptr < inend && *inptr != (byte) '\n')
 							inptr++;
-						}
+
+						streamOffset += (int) (inptr - start);
 
 						if (inptr == inend) {
-							streamOffset += (int) (inptr - start);
 							nsaved = *(inptr - 1);
-							return false;
+							break;
 						}
 
-						streamOffset += (int) (inptr - start);
-
-						SkipByte (ref inptr);
+						nsaved = ReadByte (ref inptr);
 
 						if (inptr == inend)
-							return false;
+							break;
 					}
 
 					nsaved = ReadByte (ref inptr);
@@ -183,7 +175,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 
 					state = UUValidatorState.B;
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.B) {
@@ -199,7 +191,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 
 					state = UUValidatorState.Be;
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.Be) {
@@ -215,7 +207,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 
 					state = UUValidatorState.Beg;
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.Beg) {
@@ -231,7 +223,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 
 					state = UUValidatorState.Begi;
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.Begi) {
@@ -247,7 +239,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 
 					state = UUValidatorState.Begin;
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.Begin) {
@@ -265,7 +257,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 					nsaved = 0;
 
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.FileMode) {
@@ -282,7 +274,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 					}
 
 					if (inptr == inend)
-						return false;
+						break;
 
 					if (nsaved < 3) {
 						// file mode is too short
@@ -303,7 +295,7 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 					nsaved = 0;
 
 					if (inptr == inend)
-						return false;
+						break;
 				}
 
 				if (state == UUValidatorState.FileName) {
@@ -312,14 +304,13 @@ unsafe bool ScanBeginMarker (ref byte* inptr, byte* inend)
 					while (inptr < inend && *inptr != (byte) '\n')
 						inptr++;
 
+					streamOffset += (int) (inptr - start);
+
 					if (inptr == inend) {
 						// need to keep reading until we hit the end of the line
-						streamOffset += (int) (inptr - start);
-						return false;
+						break;
 					}
 
-					streamOffset += (int) (inptr - start);
-
 					SkipByte (ref inptr);
 
 					state = UUValidatorState.Payload;

UnitTests/Encodings/Base64ValidatorTests.cs

@@ -147,6 +147,18 @@ public void TestValidateInvalidInput_CharactersAfterPadding ()
 			TestValidateInvalidInput (text, violations);
 		}
 
+		[Test]
+		public void TestValidateInvalidInput_IncompleteQuantumAfterPaddingStart ()
+		{
+			const string text = "VGhpcyBpcyB0aGUgcGxhaW4gdGV4dCBtZXNzYWdlIQ=\r\n=";
+			var violations = new List<MimeComplianceViolationEventArgs> {
+				new MimeComplianceViolationEventArgs (MimeComplianceViolation.IncompleteBase64Quantum, 44, 1),
+				new MimeComplianceViolationEventArgs (MimeComplianceViolation.IncompleteBase64Quantum, 46, 2)
+			};
+
+			TestValidateInvalidInput (text, violations);
+		}
+
 		[TestCase (4096)]
 		[TestCase (1024)]
 		[TestCase (16)]

UnitTests/Encodings/QuotedPrintableValidatorTests.cs

@@ -71,6 +71,7 @@ public void TestValidateBufferSizeDos (int bufferSize)
 
 		[TestCase ("=XA", 1)]
 		[TestCase ("=AX", 2)]
+		[TestCase ("=A\n", 2)]
 		public void TestValidateInvalidHexSequence (string hex, int offset)
 		{
 			string text = $"This is some quoted printable text with an invalid {hex} sequence.";
@@ -103,5 +104,23 @@ public void TestValidateInvalidSoftBreak ()
 			Assert.That (reader.ComplianceViolations[0].StreamOffset, Is.EqualTo (text.LastIndexOf ('s')));
 			Assert.That (reader.ComplianceViolations[0].LineNumber, Is.EqualTo (1));
 		}
+
+		[TestCase ("invalid trailing =", MimeComplianceViolation.InvalidQuotedPrintableEncoding)]
+		[TestCase ("invalid trailing =A", MimeComplianceViolation.InvalidQuotedPrintableEncoding)]
+		[TestCase ("invalid trailing =\r", MimeComplianceViolation.InvalidQuotedPrintableSoftBreak)]
+		public void TestValidateInvalidFlush (string text, MimeComplianceViolation violation)
+		{
+			var rawData = Encoding.ASCII.GetBytes (text);
+			var reader = new ComplianceMimeReader ();
+			var validator = new QuotedPrintableValidator (reader, 0, 1);
+
+			validator.Write (rawData, 0, rawData.Length);
+			validator.Flush ();
+
+			Assert.That (reader.ComplianceViolations.Count, Is.EqualTo (1));
+			Assert.That (reader.ComplianceViolations[0].Violation, Is.EqualTo (violation));
+			Assert.That (reader.ComplianceViolations[0].StreamOffset, Is.EqualTo (text.Length));
+			Assert.That (reader.ComplianceViolations[0].LineNumber, Is.EqualTo (1));
+		}
 	}
 }