errors UPDATE out-of-bounds type value error

CESNET · Dec 1, 2023 · 49a205d · 49a205d
1 parent bedd408
commit 49a205d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/err_netconf.c b/src/err_netconf.c
@@ -271,7 +271,7 @@ np_err_sr2nc_edit(sr_session_ctx_t *ev_sess, const sr_session_ctx_t *err_sess)
         /* data-missing */
         sr_session_set_netconf_error(ev_sess, "protocol", "data-missing", NULL, NULL, err->message, 0);
     } else if (!strncmp(err->message, "Invalid type", 12) || !strncmp(err->message, "Unsatisfied range", 17) ||
-            !strncmp(err->message, "Unsatisfied pattern", 19)) {
+            !strncmp(err->message, "Unsatisfied pattern", 19) || strstr(err->message, "min/max bounds")) {
         /* create error message */
         str = strndup(err->message, (strchr(err->message, '.') + 1) - err->message);
 

diff --git a/tests/modules/errors.yang b/tests/modules/errors.yang
@@ -83,7 +83,7 @@ module errors {
     }
 
     leaf num {
-        type uint32 {
+        type uint16 {
             range "10..100";
         }
     }

diff --git a/tests/test_error.c b/tests/test_error.c
@@ -387,7 +387,7 @@ test_bad_element(void **state)
             "  <error-type>application</error-type>\n"
             "  <error-tag>bad-element</error-tag>\n"
             "  <error-severity>error</error-severity>\n"
-            "  <error-message xml:lang=\"en\">Invalid type uint32 value \"string\".</error-message>\n"
+            "  <error-message xml:lang=\"en\">Invalid type uint16 value \"string\".</error-message>\n"
             "  <error-info>\n"
             "    <bad-element>/errors:num</bad-element>\n"
             "  </error-info>\n"
@@ -410,6 +410,22 @@ test_bad_element(void **state)
             "</rpc-error>\n");
     FREE_TEST_VARS(st);
 
+    /* out of type range */
+    data = "<num xmlns=\"urn:errors\">100000</num>";
+    SEND_EDIT_RPC(st, data);
+    ASSERT_ERROR_REPLY(st);
+    assert_string_equal(st->str,
+            "<rpc-error xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+            "  <error-type>application</error-type>\n"
+            "  <error-tag>bad-element</error-tag>\n"
+            "  <error-severity>error</error-severity>\n"
+            "  <error-message xml:lang=\"en\">Value \"100000\" is out of type uint16 min/max bounds.</error-message>\n"
+            "  <error-info>\n"
+            "    <bad-element>/errors:num</bad-element>\n"
+            "  </error-info>\n"
+            "</rpc-error>\n");
+    FREE_TEST_VARS(st);
+
     /* unsatisfied pattern */
     data = "<str xmlns=\"urn:errors\">bb</str>";
     SEND_EDIT_RPC(st, data);