reject short IPv4 address forms in default FromStr parser

stbuehler · stbuehler · commit b9147bfdbf61 · 2024-09-30T15:04:56.000+02:00
* shouldn't have allowed that in the first place.
  192.168 could mean either 192.0.0.168 ("inet_addr") or 192.168.0.0
  (previously parsed it as the latter)
* also "192.168" should never have meant 192.168.0.0/32; 192.168.0.0/16
  would have been way more useful (parse_short_ipv4_address_as_cidr
  provides this)
diff --git a/src/cidr/any.rs b/src/cidr/any.rs
@@ -247,11 +247,7 @@ impl FromStr for AnyIpCidr {
 	type Err = NetworkParseError;
 
 	fn from_str(s: &str) -> Result<Self, NetworkParseError> {
-		// TODO: use strict FromStr::from_str address parsing with version bump
-		crate::parsers::parse_any_cidr(
-			s,
-			crate::local_addr_parser::ParseableAddress::address_from_str,
-		)
+		crate::parsers::parse_any_cidr(s, str::parse)
 	}
 }
 
diff --git a/src/cidr/combined.rs b/src/cidr/combined.rs
@@ -8,7 +8,6 @@ use core::{
 	str::FromStr,
 };
 
-use super::from_str::cidr_from_str;
 use crate::{
 	errors::*,
 	internal_traits::PrivCidr,
@@ -231,7 +230,7 @@ impl FromStr for IpCidr {
 	type Err = NetworkParseError;
 
 	fn from_str(s: &str) -> Result<Self, NetworkParseError> {
-		cidr_from_str(s)
+		crate::parsers::parse_cidr(s, FromStr::from_str)
 	}
 }
 
diff --git a/src/cidr/direct.rs b/src/cidr/direct.rs
@@ -10,7 +10,6 @@ use core::{
 	str::FromStr,
 };
 
-use super::from_str::cidr_from_str;
 use crate::{
 	errors::*,
 	internal_traits::{
@@ -272,7 +271,7 @@ macro_rules! impl_cidr_for {
 			type Err = NetworkParseError;
 
 			fn from_str(s: &str) -> Result<$n, NetworkParseError> {
-				cidr_from_str(s)
+				crate::parsers::parse_cidr(s, FromStr::from_str)
 			}
 		}
 
diff --git a/src/cidr/from_str.rs b/src/cidr/from_str.rs
diff --git a/src/cidr/mod.rs b/src/cidr/mod.rs
@@ -3,7 +3,6 @@ pub use self::any::AnyIpCidr;
 mod any;
 mod combined;
 mod direct;
-mod from_str;
 mod serde;
 
 #[cfg(feature = "bitstring")]
diff --git a/src/cidr/tests.rs b/src/cidr/tests.rs
@@ -460,6 +460,7 @@ fn parse_v4_8bit() {
 }
 
 #[test]
+#[should_panic(expected = "invalid IPv4 address syntax")]
 fn parse_v4_8bit_short() {
 	test_v4(
 		"10/8",
@@ -482,6 +483,7 @@ fn parse_v4_0bit() {
 }
 
 #[test]
+#[should_panic(expected = "invalid IPv4 address syntax")]
 fn parse_v4_0bit_short() {
 	test_v4(
 		"0/0",
diff --git a/src/inet/combined.rs b/src/inet/combined.rs
@@ -8,7 +8,6 @@ use core::{
 	str::FromStr,
 };
 
-use super::from_str::inet_from_str;
 use crate::{
 	errors::*,
 	internal_traits::PrivInet,
@@ -336,7 +335,7 @@ impl FromStr for IpInet {
 	type Err = NetworkParseError;
 
 	fn from_str(s: &str) -> Result<Self, NetworkParseError> {
-		inet_from_str(s)
+		crate::parsers::parse_inet(s, FromStr::from_str)
 	}
 }
 
diff --git a/src/inet/direct.rs b/src/inet/direct.rs
@@ -10,7 +10,6 @@ use core::{
 	str::FromStr,
 };
 
-use super::from_str::inet_from_str;
 use crate::{
 	errors::*,
 	internal_traits::{
@@ -369,7 +368,7 @@ macro_rules! impl_inet_for {
 			type Err = NetworkParseError;
 
 			fn from_str(s: &str) -> Result<Self, NetworkParseError> {
-				inet_from_str(s)
+				crate::parsers::parse_inet(s, FromStr::from_str)
 			}
 		}
 
diff --git a/src/inet/from_str.rs b/src/inet/from_str.rs
diff --git a/src/inet/mod.rs b/src/inet/mod.rs
@@ -1,6 +1,5 @@
 mod combined;
 mod direct;
-mod from_str;
 mod serde;
 
 #[cfg(test)]
diff --git a/src/lib.rs b/src/lib.rs
@@ -11,12 +11,15 @@
 //!
 //! The naming follows the names of the [PostgreSQL data types](https://www.postgresql.org/docs/current/static/datatype-net-types.html)
 //!
-//! Address parsing also accepts IPv4 address with less than four octets
-//! (but always parses those as decimal); this is deprecated and will be
-//! removed in 0.3.0.
+//! By default address parsing is done using `FromStr` from the standard
+//! library, which is rather strict in the inputs it accepts.
+//! [`Cidr`] types don't accept addresses with host-bits set (i.e. `127.0.0.1/8`
+//! isn't valid; it should be `127.0.0.0/8`).
+//!
+//! Custom parsing can be implemented using the helpers in the [`parsers`] module.
 //!
 //! If the `#` flag is used with the `Display` formatting (i.e. `{:#}`) the
-//! prefix will be shown even for host addresses (added in `0.1.1`).
+//! prefix length will be shown even for host addresses (added in `0.1.1`).
 //!
 //! # Feature `no_unsafe`
 //!
@@ -100,6 +103,5 @@ mod inet;
 mod inet_iterator;
 mod inet_pair;
 mod internal_traits;
-mod local_addr_parser;
 mod num;
 mod traits;
diff --git a/src/local_addr_parser.rs b/src/local_addr_parser.rs

Original file line number	Diff line number	Diff line change
`@@ -247,11 +247,7 @@ impl FromStr for AnyIpCidr {`
`247`	`247`	`type Err = NetworkParseError;`
`248`	`248`
`249`	`249`	`fn from_str(s: &str) -> Result<Self, NetworkParseError> {`
`250`		`- // TODO: use strict FromStr::from_str address parsing with version bump`
`251`		`- crate::parsers::parse_any_cidr(`
`252`		`- s,`
`253`		`- crate::local_addr_parser::ParseableAddress::address_from_str,`
`254`		`- )`
	`250`	`+ crate::parsers::parse_any_cidr(s, str::parse)`
`255`	`251`	`}`
`256`	`252`	`}`
`257`	`253`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ use core::{`
`8`	`8`	`str::FromStr,`
`9`	`9`	`};`
`10`	`10`
`11`		`-use super::from_str::cidr_from_str;`
`12`	`11`	`use crate::{`
`13`	`12`	`errors::*,`
`14`	`13`	`internal_traits::PrivCidr,`
`@@ -231,7 +230,7 @@ impl FromStr for IpCidr {`
`231`	`230`	`type Err = NetworkParseError;`
`232`	`231`
`233`	`232`	`fn from_str(s: &str) -> Result<Self, NetworkParseError> {`
`234`		`- cidr_from_str(s)`
	`233`	`+ crate::parsers::parse_cidr(s, FromStr::from_str)`
`235`	`234`	`}`
`236`	`235`	`}`
`237`	`236`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ use core::{`
`10`	`10`	`str::FromStr,`
`11`	`11`	`};`
`12`	`12`
`13`		`-use super::from_str::cidr_from_str;`
`14`	`13`	`use crate::{`
`15`	`14`	`errors::*,`
`16`	`15`	`internal_traits::{`
`@@ -272,7 +271,7 @@ macro_rules! impl_cidr_for {`
`272`	`271`	`type Err = NetworkParseError;`
`273`	`272`
`274`	`273`	`fn from_str(s: &str) -> Result<$n, NetworkParseError> {`
`275`		`- cidr_from_str(s)`
	`274`	`+ crate::parsers::parse_cidr(s, FromStr::from_str)`
`276`	`275`	`}`
`277`	`276`	`}`
`278`	`277`
Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,7 @@ fn parse_v4_8bit() {`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`#[test]`
	`463`	`+#[should_panic(expected = "invalid IPv4 address syntax")]`
`463`	`464`	`fn parse_v4_8bit_short() {`
`464`	`465`	`test_v4(`
`465`	`466`	`"10/8",`
`@@ -482,6 +483,7 @@ fn parse_v4_0bit() {`
`482`	`483`	`}`
`483`	`484`
`484`	`485`	`#[test]`
	`486`	`+#[should_panic(expected = "invalid IPv4 address syntax")]`
`485`	`487`	`fn parse_v4_0bit_short() {`
`486`	`488`	`test_v4(`
`487`	`489`	`"0/0",`