proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-06 11:34:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxmox/tools/common_regex: improve IPRE_BRACKET

Browse Source 
by disallowing [] around ipv4 adresses (which is not very common)

we did not use this anywhere, so there should not be any compatibility
problem

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-09-29 16:05:18 +02:00 committed by Dietmar Maurer
parent d79e1cfefe
commit ef6ccff5d1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxmox/src/tools/common_regex.rs
View File

@ -41,14 +41,14 @@ macro_rules! IPV6RE { () => (concat!(r"(?:",
macro_rules! IPRE { () => (concat!(r"(?:", IPV4RE!(), "|", IPV6RE!(), ")")) } macro_rules! IPRE { () => (concat!(r"(?:", IPV4RE!(), "|", IPV6RE!(), ")")) }
/// Regular expression string to match IP addresses where IPv6 addresses require brackets around /// Regular expression string to match IP addresses where IPv6 addresses require brackets around
/// them, while for IPv4 they are optional. /// them, while for IPv4 they are forbidden.
#[rustfmt::skip] #[rustfmt::skip]
#[macro_export] #[macro_export]
macro_rules! IPRE_BRACKET { () => ( macro_rules! IPRE_BRACKET { () => (
concat!(r"(?:", concat!(r"(?:",
IPV4RE!(), IPV4RE!(),
r"|\[(?:", r"|\[(?:",
IPV4RE!(), "|", IPV6RE!(), IPV6RE!(),
r")\]", r")\]",
r")")) r")"))
} }
@ -71,7 +71,6 @@ fn test_regexes() {
assert!(IP_REGEX.is_match("2014:b3a:0102:adf1:1234:4321:4afA:BCDF")); assert!(IP_REGEX.is_match("2014:b3a:0102:adf1:1234:4321:4afA:BCDF"));
assert!(IP_BRACKET_REGEX.is_match("127.0.0.1")); assert!(IP_BRACKET_REGEX.is_match("127.0.0.1"));
assert!(IP_BRACKET_REGEX.is_match("[127.0.0.1]"));
assert!(IP_BRACKET_REGEX.is_match("[::1]")); assert!(IP_BRACKET_REGEX.is_match("[::1]"));
assert!(IP_BRACKET_REGEX.is_match("[2014:b3a::27]")); assert!(IP_BRACKET_REGEX.is_match("[2014:b3a::27]"));
assert!(IP_BRACKET_REGEX.is_match("[2014:b3a::192.168.0.1]")); assert!(IP_BRACKET_REGEX.is_match("[2014:b3a::192.168.0.1]"));