Merge pull request rust-postgres#518 from quodlibetor/message-length-error-uniqueness

sfackler · web-flow · commit a94127c05db6 · 2019-11-19T11:09:23.000-05:00
Make all invalid message length errors unique
diff --git a/postgres-protocol/src/message/backend.rs b/postgres-protocol/src/message/backend.rs
@@ -53,7 +53,7 @@ impl Header {
         if len < 4 {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidData,
-                "invalid message length",
+                "invalid message length: header length < 4",
             ));
         }
 
@@ -123,7 +123,7 @@ impl Message {
         if len < 4 {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidInput,
-                "invalid message length",
+                "invalid message length: parsing u32",
             ));
         }
 
@@ -271,7 +271,7 @@ impl Message {
         if !buf.is_empty() {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidInput,
-                "invalid message length",
+                "invalid message length: expected buffer to be empty",
             ));
         }
 
@@ -376,7 +376,7 @@ impl<'a> FallibleIterator for SaslMechanisms<'a> {
             if self.0.len() != 1 {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidData,
-                    "invalid message length",
+                    "invalid message length: expected to be at end of iterator for sasl",
                 ));
             }
             Ok(None)
@@ -488,7 +488,7 @@ impl<'a> FallibleIterator for ColumnFormats<'a> {
             } else {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
-                    "invalid message length",
+                    "invalid message length: wrong column formats",
                 ));
             }
         }
@@ -564,7 +564,7 @@ impl<'a> FallibleIterator for DataRowRanges<'a> {
             } else {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
-                    "invalid message length",
+                    "invalid message length: datarowrange is not empty",
                 ));
             }
         }
@@ -622,7 +622,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
             } else {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
-                    "invalid message length",
+                    "invalid message length: error fields is not drained",
                 ));
             }
         }
@@ -718,7 +718,7 @@ impl<'a> FallibleIterator for Parameters<'a> {
             } else {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
-                    "invalid message length",
+                    "invalid message length: parameters is not drained",
                 ));
             }
         }
@@ -794,7 +794,7 @@ impl<'a> FallibleIterator for Fields<'a> {
             } else {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
-                    "invalid message length",
+                    "invalid message length: field is not drained",
                 ));
             }
         }
diff --git a/postgres-protocol/src/types/mod.rs b/postgres-protocol/src/types/mod.rs
@@ -308,11 +308,11 @@ pub fn varbit_from_sql<'a>(
 ) -> Result<Varbit<'a>, StdBox<dyn Error + Sync + Send>> {
     let len = buf.read_i32::<BigEndian>()?;
     if len < 0 {
-        return Err("invalid varbit length".into());
+        return Err("invalid varbit length: varbit < 0".into());
     }
     let bytes = (len as usize + 7) / 8;
     if buf.len() != bytes {
-        return Err("invalid message length".into());
+        return Err("invalid message length: varbit mismatch".into());
     }
 
     Ok(Varbit {
@@ -362,7 +362,7 @@ pub fn timestamp_to_sql(v: i64, buf: &mut BytesMut) {
 pub fn timestamp_from_sql(mut buf: &[u8]) -> Result<i64, StdBox<dyn Error + Sync + Send>> {
     let v = buf.read_i64::<BigEndian>()?;
     if !buf.is_empty() {
-        return Err("invalid message length".into());
+        return Err("invalid message length: timestamp not drained".into());
     }
     Ok(v)
 }
@@ -382,7 +382,7 @@ pub fn date_to_sql(v: i32, buf: &mut BytesMut) {
 pub fn date_from_sql(mut buf: &[u8]) -> Result<i32, StdBox<dyn Error + Sync + Send>> {
     let v = buf.read_i32::<BigEndian>()?;
     if !buf.is_empty() {
-        return Err("invalid message length".into());
+        return Err("invalid message length: date not drained".into());
     }
     Ok(v)
 }
@@ -402,7 +402,7 @@ pub fn time_to_sql(v: i64, buf: &mut BytesMut) {
 pub fn time_from_sql(mut buf: &[u8]) -> Result<i64, StdBox<dyn Error + Sync + Send>> {
     let v = buf.read_i64::<BigEndian>()?;
     if !buf.is_empty() {
-        return Err("invalid message length".into());
+        return Err("invalid message length: time not drained".into());
     }
     Ok(v)
 }
@@ -417,7 +417,7 @@ pub fn macaddr_to_sql(v: [u8; 6], buf: &mut BytesMut) {
 #[inline]
 pub fn macaddr_from_sql(buf: &[u8]) -> Result<[u8; 6], StdBox<dyn Error + Sync + Send>> {
     if buf.len() != 6 {
-        return Err("invalid message length".into());
+        return Err("invalid message length: macaddr length mismatch".into());
     }
     let mut out = [0; 6];
     out.copy_from_slice(buf);
@@ -434,7 +434,7 @@ pub fn uuid_to_sql(v: [u8; 16], buf: &mut BytesMut) {
 #[inline]
 pub fn uuid_from_sql(buf: &[u8]) -> Result<[u8; 16], StdBox<dyn Error + Sync + Send>> {
     if buf.len() != 16 {
-        return Err("invalid message length".into());
+        return Err("invalid message length: uuid size mismatch".into());
     }
     let mut out = [0; 16];
     out.copy_from_slice(buf);
@@ -615,7 +615,7 @@ impl<'a> FallibleIterator for ArrayValues<'a> {
     fn next(&mut self) -> Result<Option<Option<&'a [u8]>>, StdBox<dyn Error + Sync + Send>> {
         if self.remaining == 0 {
             if !self.buf.is_empty() {
-                return Err("invalid message length".into());
+                return Err("invalid message length: arrayvalue not drained".into());
             }
             return Ok(None);
         }
@@ -944,7 +944,7 @@ impl<'a> FallibleIterator for PathPoints<'a> {
     fn next(&mut self) -> Result<Option<Point>, StdBox<dyn Error + Sync + Send>> {
         if self.remaining == 0 {
             if !self.buf.is_empty() {
-                return Err("invalid message length".into());
+                return Err("invalid message length: path points not drained".into());
             }
             return Ok(None);
         }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ impl Header {`
`53`	`53`	`if len < 4 {`
`54`	`54`	`return Err(io::Error::new(`
`55`	`55`	`io::ErrorKind::InvalidData,`
`56`		`- "invalid message length",`
	`56`	`+ "invalid message length: header length < 4",`
`57`	`57`	`));`
`58`	`58`	`}`
`59`	`59`
`@@ -123,7 +123,7 @@ impl Message {`
`123`	`123`	`if len < 4 {`
`124`	`124`	`return Err(io::Error::new(`
`125`	`125`	`io::ErrorKind::InvalidInput,`
`126`		`- "invalid message length",`
	`126`	`+ "invalid message length: parsing u32",`
`127`	`127`	`));`
`128`	`128`	`}`
`129`	`129`
`@@ -271,7 +271,7 @@ impl Message {`
`271`	`271`	`if !buf.is_empty() {`
`272`	`272`	`return Err(io::Error::new(`
`273`	`273`	`io::ErrorKind::InvalidInput,`
`274`		`- "invalid message length",`
	`274`	`+ "invalid message length: expected buffer to be empty",`
`275`	`275`	`));`
`276`	`276`	`}`
`277`	`277`
`@@ -376,7 +376,7 @@ impl<'a> FallibleIterator for SaslMechanisms<'a> {`
`376`	`376`	`if self.0.len() != 1 {`
`377`	`377`	`return Err(io::Error::new(`
`378`	`378`	`io::ErrorKind::InvalidData,`
`379`		`- "invalid message length",`
	`379`	`+ "invalid message length: expected to be at end of iterator for sasl",`
`380`	`380`	`));`
`381`	`381`	`}`
`382`	`382`	`Ok(None)`
`@@ -488,7 +488,7 @@ impl<'a> FallibleIterator for ColumnFormats<'a> {`
`488`	`488`	`} else {`
`489`	`489`	`return Err(io::Error::new(`
`490`	`490`	`io::ErrorKind::InvalidInput,`
`491`		`- "invalid message length",`
	`491`	`+ "invalid message length: wrong column formats",`
`492`	`492`	`));`
`493`	`493`	`}`
`494`	`494`	`}`
`@@ -564,7 +564,7 @@ impl<'a> FallibleIterator for DataRowRanges<'a> {`
`564`	`564`	`} else {`
`565`	`565`	`return Err(io::Error::new(`
`566`	`566`	`io::ErrorKind::InvalidInput,`
`567`		`- "invalid message length",`
	`567`	`+ "invalid message length: datarowrange is not empty",`
`568`	`568`	`));`
`569`	`569`	`}`
`570`	`570`	`}`
`@@ -622,7 +622,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {`
`622`	`622`	`} else {`
`623`	`623`	`return Err(io::Error::new(`
`624`	`624`	`io::ErrorKind::InvalidInput,`
`625`		`- "invalid message length",`
	`625`	`+ "invalid message length: error fields is not drained",`
`626`	`626`	`));`
`627`	`627`	`}`
`628`	`628`	`}`
`@@ -718,7 +718,7 @@ impl<'a> FallibleIterator for Parameters<'a> {`
`718`	`718`	`} else {`
`719`	`719`	`return Err(io::Error::new(`
`720`	`720`	`io::ErrorKind::InvalidInput,`
`721`		`- "invalid message length",`
	`721`	`+ "invalid message length: parameters is not drained",`
`722`	`722`	`));`
`723`	`723`	`}`
`724`	`724`	`}`
`@@ -794,7 +794,7 @@ impl<'a> FallibleIterator for Fields<'a> {`
`794`	`794`	`} else {`
`795`	`795`	`return Err(io::Error::new(`
`796`	`796`	`io::ErrorKind::InvalidInput,`
`797`		`- "invalid message length",`
	`797`	`+ "invalid message length: field is not drained",`
`798`	`798`	`));`
`799`	`799`	`}`
`800`	`800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,11 +308,11 @@ pub fn varbit_from_sql<'a>(`
`308`	`308`	`) -> Result<Varbit<'a>, StdBox<dyn Error + Sync + Send>> {`
`309`	`309`	`let len = buf.read_i32::<BigEndian>()?;`
`310`	`310`	`if len < 0 {`
`311`		`- return Err("invalid varbit length".into());`
	`311`	`+ return Err("invalid varbit length: varbit < 0".into());`
`312`	`312`	`}`
`313`	`313`	`let bytes = (len as usize + 7) / 8;`
`314`	`314`	`if buf.len() != bytes {`
`315`		`- return Err("invalid message length".into());`
	`315`	`+ return Err("invalid message length: varbit mismatch".into());`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`Ok(Varbit {`
`@@ -362,7 +362,7 @@ pub fn timestamp_to_sql(v: i64, buf: &mut BytesMut) {`
`362`	`362`	`pub fn timestamp_from_sql(mut buf: &[u8]) -> Result<i64, StdBox<dyn Error + Sync + Send>> {`
`363`	`363`	`let v = buf.read_i64::<BigEndian>()?;`
`364`	`364`	`if !buf.is_empty() {`
`365`		`- return Err("invalid message length".into());`
	`365`	`+ return Err("invalid message length: timestamp not drained".into());`
`366`	`366`	`}`
`367`	`367`	`Ok(v)`
`368`	`368`	`}`
`@@ -382,7 +382,7 @@ pub fn date_to_sql(v: i32, buf: &mut BytesMut) {`
`382`	`382`	`pub fn date_from_sql(mut buf: &[u8]) -> Result<i32, StdBox<dyn Error + Sync + Send>> {`
`383`	`383`	`let v = buf.read_i32::<BigEndian>()?;`
`384`	`384`	`if !buf.is_empty() {`
`385`		`- return Err("invalid message length".into());`
	`385`	`+ return Err("invalid message length: date not drained".into());`
`386`	`386`	`}`
`387`	`387`	`Ok(v)`
`388`	`388`	`}`
`@@ -402,7 +402,7 @@ pub fn time_to_sql(v: i64, buf: &mut BytesMut) {`
`402`	`402`	`pub fn time_from_sql(mut buf: &[u8]) -> Result<i64, StdBox<dyn Error + Sync + Send>> {`
`403`	`403`	`let v = buf.read_i64::<BigEndian>()?;`
`404`	`404`	`if !buf.is_empty() {`
`405`		`- return Err("invalid message length".into());`
	`405`	`+ return Err("invalid message length: time not drained".into());`
`406`	`406`	`}`
`407`	`407`	`Ok(v)`
`408`	`408`	`}`
`@@ -417,7 +417,7 @@ pub fn macaddr_to_sql(v: [u8; 6], buf: &mut BytesMut) {`
`417`	`417`	`#[inline]`
`418`	`418`	`pub fn macaddr_from_sql(buf: &[u8]) -> Result<[u8; 6], StdBox<dyn Error + Sync + Send>> {`
`419`	`419`	`if buf.len() != 6 {`
`420`		`- return Err("invalid message length".into());`
	`420`	`+ return Err("invalid message length: macaddr length mismatch".into());`
`421`	`421`	`}`
`422`	`422`	`let mut out = [0; 6];`
`423`	`423`	`out.copy_from_slice(buf);`
`@@ -434,7 +434,7 @@ pub fn uuid_to_sql(v: [u8; 16], buf: &mut BytesMut) {`
`434`	`434`	`#[inline]`
`435`	`435`	`pub fn uuid_from_sql(buf: &[u8]) -> Result<[u8; 16], StdBox<dyn Error + Sync + Send>> {`
`436`	`436`	`if buf.len() != 16 {`
`437`		`- return Err("invalid message length".into());`
	`437`	`+ return Err("invalid message length: uuid size mismatch".into());`
`438`	`438`	`}`
`439`	`439`	`let mut out = [0; 16];`
`440`	`440`	`out.copy_from_slice(buf);`
`@@ -615,7 +615,7 @@ impl<'a> FallibleIterator for ArrayValues<'a> {`
`615`	`615`	`fn next(&mut self) -> Result<Option<Option<&'a [u8]>>, StdBox<dyn Error + Sync + Send>> {`
`616`	`616`	`if self.remaining == 0 {`
`617`	`617`	`if !self.buf.is_empty() {`
`618`		`- return Err("invalid message length".into());`
	`618`	`+ return Err("invalid message length: arrayvalue not drained".into());`
`619`	`619`	`}`
`620`	`620`	`return Ok(None);`
`621`	`621`	`}`
`@@ -944,7 +944,7 @@ impl<'a> FallibleIterator for PathPoints<'a> {`
`944`	`944`	`fn next(&mut self) -> Result<Option<Point>, StdBox<dyn Error + Sync + Send>> {`
`945`	`945`	`if self.remaining == 0 {`
`946`	`946`	`if !self.buf.is_empty() {`
`947`		`- return Err("invalid message length".into());`
	`947`	`+ return Err("invalid message length: path points not drained".into());`
`948`	`948`	`}`
`949`	`949`	`return Ok(None);`
`950`	`950`	`}`