Allow IPv6 Addresses

The REST and gRPC servers support IPv6. Unhobble the config test
to allow them through.

Author: RH-steve-grubb

Dockerfile.redhat

@@ -295,8 +295,8 @@ RUN bazel build --jobs=$JOBS ${debug_bazel_flags} ${minitrace_flags} //src:ovms
 COPY ci/check_coverage.bat /ovms/
 ARG CHECK_COVERAGE=0
 ARG RUN_TESTS=0
-COPY run_unit_tests.sh prepare_llm_models.sh prepare_gpu_models.sh /ovms/
-RUN if [ "$RUN_TESTS" == "1" ] ; then ./prepare_llm_models.sh /ovms/src/test/llm_testing docker && ./run_unit_tests.sh ; fi
+COPY run_unit_tests.sh prepare_llm_models.sh prepare_gpu_models.sh demos/common/export_models/export_model.py /ovms/
+RUN if [ "$RUN_TESTS" == "1" ] ; then mkdir -p demos/common/export_models/ && mv export_model.py demos/common/export_models/ && ./prepare_llm_models.sh /ovms/src/test/llm_testing docker && ./run_unit_tests.sh ; fi
 
 ARG ovms_metadata_file
 

Dockerfile.ubuntu

@@ -280,7 +280,7 @@ WORKDIR /ovms
 # Test Coverage
 COPY ci/check_coverage.bat /ovms/
 ARG CHECK_COVERAGE=0
-COPY run_unit_tests.sh prepare_llm_models.sh install_va.sh /ovms/
+COPY run_unit_tests.sh prepare_llm_models.sh install_va.sh demos/common/export_models/export_model.py /ovms/
 
 ARG FUZZER_BUILD=0
 # Custom Nodes
@@ -295,7 +295,7 @@ ARG OPTIMIZE_BUILDING_TESTS=0
 RUN if [ "$FUZZER_BUILD" == "0" ]; then bazel build --jobs=$JOBS ${debug_bazel_flags} ${minitrace_flags} //src:ovms $(if [ "${OPTIMIZE_BUILDING_TESTS}" == "1" ] ; then echo -n //src:ovms_test; fi); fi;
 
 ARG RUN_TESTS=0
-RUN if [ "$RUN_TESTS" == "1" ] ; then ./prepare_llm_models.sh /ovms/src/test/llm_testing docker && ./run_unit_tests.sh ; fi
+RUN if [ "$RUN_TESTS" == "1" ] ; then mkdir -p demos/common/export_models/ && mv export_model.py demos/common/export_models/ && ./prepare_llm_models.sh /ovms/src/test/llm_testing docker && ./run_unit_tests.sh ; fi
 
 RUN if [ "$FUZZER_BUILD" == "0" ]; then /ovms/bazel-bin/src/ovms --version && /ovms/bazel-bin/src/ovms; fi;
 

src/config.cpp

@@ -76,16 +76,18 @@ bool Config::check_hostname_or_ip(const std::string& input) {
     }
     bool all_numeric = true;
     for (char c : input) {
-        if (c == '.') {
+        if (c == '.' || c == ':') {
             continue;
         }
-        if (!::isdigit(c)) {
+        if (!::isxdigit(c)) {
             all_numeric = false;
         }
     }
     if (all_numeric) {
-        std::regex valid_ip_regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$");
-        return std::regex_match(input, valid_ip_regex);
+        static const std::regex valid_ipv4_regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$");
+        static const std::regex valid_ipv6_regex(R"(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))");
+        return std::regex_match(input, valid_ipv4_regex) ||
+		std::regex_match(input, valid_ipv6_regex);
     } else {
         std::regex valid_hostname_regex("^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$");
         return std::regex_match(input, valid_hostname_regex);

src/test/ovmsconfig_test.cpp

@@ -335,6 +335,25 @@ TEST_F(OvmsParamsTest, hostname_ip_regex) {
     EXPECT_EQ(ovms::Config::check_hostname_or_ip("(%$#*F"), false);
     std::string too_long(256, 'a');
     EXPECT_EQ(ovms::Config::check_hostname_or_ip(too_long), false);
+    // Uncompressed IPv6 address
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip(
+                "fe80:0000:0000:0000:0202:b3ff:fe1e:8329", true);
+    // Zero compressed IPv6 address
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip(
+                "2001:db8:85a3::8a2e:370:7334", true);
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("::1", true);
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("::", true);
+    // Link-local IPv6 with zone index (RFC 4007 § 11) - unsupported
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("fe80::1234%eth0", false);
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("fe80::1234%1", false);
+    // IPv4-Embedded IPv6 addresses
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("64:ff9b::192.0.2.33", true);
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip(
+                "2001:db8:122:344::192.0.2.33", true);
+    // IPv4-mapped IPv6 addresses
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("::ffff:192.0.2.128", true);
+    //  IPv4-translated IPv6 addresses
+    EXPECT_EQ(ovms::Config::check_hostname_or_ip("::ffff:0:192.0.2.128", true);
 }
 
 TEST(OvmsConfigTest, positiveMulti) {