subdomain format also kubernetes-specific

Author: xeniape

crates/stackable-operator/src/validation.rs

@@ -26,13 +26,18 @@ const RFC_1123_LABEL_FMT: &str = "[a-zA-Z0-9]([-a-zA-Z0-9]*[a-zA-Z0-9])?";
 
 /// This is a subdomain's max length in DNS (RFC 1123)
 const RFC_1123_SUBDOMAIN_MAX_LENGTH: usize = 253;
-const RFC_1123_SUBDOMAIN_FMT: &str =
-    concatcp!(RFC_1123_LABEL_FMT, "(\\.", RFC_1123_LABEL_FMT, ")*");
+const RFC_1123_SUBDOMAIN_FMT: &str = concatcp!(
+    LOWERCASE_RFC_1123_LABEL_FMT,
+    "(\\.",
+    LOWERCASE_RFC_1123_LABEL_FMT,
+    ")*"
+);
 const RFC_1123_SUBDOMAIN_ERROR_MSG: &str = "a RFC 1123 subdomain must consist of alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character";
 
 const DOMAIN_MAX_LENGTH: usize = RFC_1123_SUBDOMAIN_MAX_LENGTH;
-/// Same as [`RFC_1123_SUBDOMAIN_FMT`], but allows a trailing dot
-const DOMAIN_FMT: &str = concatcp!(RFC_1123_SUBDOMAIN_FMT, "\\.?");
+
+/// Same as [`RFC_1123_LABEL_FMT`], but allows a trailing dot
+const DOMAIN_FMT: &str = concatcp!(RFC_1123_LABEL_FMT, "(\\.", RFC_1123_LABEL_FMT, ")*\\.?");
 const DOMAIN_ERROR_MSG: &str = "a domain must consist of alphanumeric characters, '-' or '.', and must start with an alphanumeric character and end with an alphanumeric character or '.'";
 
 // FIXME: According to https://www.rfc-editor.org/rfc/rfc1035#section-2.3.1 domain names must start with a letter
@@ -303,6 +308,12 @@ mod tests {
 
     #[rstest]
     #[case("")]
+    #[case("A")]
+    #[case("aBc")]
+    #[case("ABC")]
+    #[case("A1")]
+    #[case("A-1")]
+    #[case("1-A")]
     #[case("-")]
     #[case("a-")]
     #[case("-a")]
@@ -329,6 +340,24 @@ mod tests {
     #[case("1 ")]
     #[case(" 1")]
     #[case("1 2")]
+    #[case("A.a")]
+    #[case("aB.a")]
+    #[case("ab.A")]
+    #[case("A1.a")]
+    #[case("a1.A")]
+    #[case("A.1")]
+    #[case("aB.1")]
+    #[case("A1.1")]
+    #[case("0.A")]
+    #[case("01.A")]
+    #[case("012.A")]
+    #[case("1A.a")]
+    #[case("1a.A")]
+    #[case("1A.1")]
+    #[case("a.B.c.d.e")]
+    #[case("A.B.C.D.E")]
+    #[case("aa.bB.cc.dd.ee")]
+    #[case("AA.BB.CC.DD.EE")]
     #[case("a@b")]
     #[case("a,b")]
     #[case("a_b")]
@@ -344,67 +373,43 @@ mod tests {
 
     #[rstest]
     #[case("a")]
-    #[case("A")]
     #[case("ab")]
     #[case("abc")]
-    #[case("aBc")]
-    #[case("ABC")]
     #[case("a1")]
-    #[case("A1")]
     #[case("a-1")]
-    #[case("A-1")]
     #[case("a--1--2--b")]
     #[case("0")]
     #[case("01")]
     #[case("012")]
     #[case("1a")]
     #[case("1-a")]
-    #[case("1-A")]
     #[case("1--a--b--2")]
     #[case("a.a")]
-    #[case("A.a")]
     #[case("ab.a")]
-    #[case("aB.a")]
-    #[case("ab.A")]
     #[case("abc.a")]
     #[case("a1.a")]
-    #[case("A1.a")]
-    #[case("a1.A")]
     #[case("a-1.a")]
     #[case("a--1--2--b.a")]
     #[case("a.1")]
-    #[case("A.1")]
     #[case("ab.1")]
-    #[case("aB.1")]
     #[case("abc.1")]
     #[case("a1.1")]
-    #[case("A1.1")]
     #[case("a-1.1")]
     #[case("a--1--2--b.1")]
     #[case("0.a")]
-    #[case("0.A")]
     #[case("01.a")]
-    #[case("01.A")]
     #[case("012.a")]
-    #[case("012.A")]
     #[case("1a.a")]
-    #[case("1A.a")]
-    #[case("1a.A")]
     #[case("1-a.a")]
     #[case("1--a--b--2")]
     #[case("0.1")]
     #[case("01.1")]
     #[case("012.1")]
     #[case("1a.1")]
-    #[case("1A.1")]
     #[case("1-a.1")]
     #[case("1--a--b--2.1")]
     #[case("a.b.c.d.e")]
-    #[case("a.B.c.d.e")]
-    #[case("A.B.C.D.E")]
     #[case("aa.bb.cc.dd.ee")]
-    #[case("aa.bB.cc.dd.ee")]
-    #[case("AA.BB.CC.DD.EE")]
     #[case("1.2.3.4.5")]
     #[case("11.22.33.44.55")]
     #[case(&"a".repeat(253))]