diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c index 355f77e3..fff0275c 100644 --- a/apps/restconf/restconf_methods.c +++ b/apps/restconf/restconf_methods.c @@ -65,6 +65,8 @@ /* cligen */ #include +// TODO - remove this include if cbuf_trunc() is added to cligen repo +#include "../cligen/cligen_buf_internal.h" /* clicon */ #include @@ -581,6 +583,412 @@ api_data_write(clicon_handle h, } /* api_data_write */ #ifdef YANG_PATCH + +/*! Free memory after a NULL pointer check + * + * @param [in] str void pointer to memory to be freed + * + */ +static void yang_patch_free_mem(void *p) +{ + if (p != NULL) + free(p); +} + +/*! Return a value within XML tags + * @param [in] nsc namespace context + * @param [in] xn cxobj containing XML with the current edit + * @param [in] val cbuf to which the value will be written + * @param [in] key string containing the tag + * @retval 0 success + * @retval <0 failure + */ +static int yang_patch_get_xval( + cvec* nsc, + cxobj* xn, + cbuf* val, + const char* key + ) +{ + cxobj **vec = NULL; + size_t veclen = 0; + char* tmp_val = NULL; + int ret = xpath_vec(xn, nsc, "%s", &vec, &veclen, key); + if (ret < 0) { + return ret; + } + cxobj *xn_tmp = NULL; + if (veclen == 1) { //veclen should always be 1 + xn_tmp = vec[0]; + } + if (xn_tmp != NULL) { + tmp_val = xml_body(xn_tmp); + cbuf_append_str(val, tmp_val); + } + return 0; +} + +// TODO - add this to cligen repo if it is approved +/*! Truncate a cbuf + * + * @param [in] cb cligen buffer allocated by cbuf_new(), may be reallocated. + * @param [in] int pos position at which to truncate + * @retval new cbuf containing the truncated string (old buffer remains as it was) + * @retval NULL Error + */ +cbuf* +cbuf_trunc(cbuf *cb, + int pos) +{ + if (pos < 0 || pos > cb->cb_strlen){ + errno = EINVAL; + return NULL; + } + /* Ensure buffer is right size */ + cbuf* new_buf = cbuf_new_alloc(pos + 1); + if (new_buf == NULL) + return NULL; + strncpy(new_buf->cb_buffer, cb->cb_buffer, pos); + new_buf->cb_strlen = pos; + return new_buf; +} + +/*! Add square brackets after the surrounding curly brackets in JSON + * Needed, in order to modify the result of xml2json_cbuf() to be valid input + * to api_dta_post() and api_dta_write() + * @param [in] x_simple_patch a cxobj to pass to xml2json_cbuf() + * @retval new cbuf with the modified json + * @retval NULL Error + */ + +static cbuf* yang_patch_xml2json_modified_cbuf(cxobj* x_simple_patch) +{ + cbuf *json_simple_patch = cbuf_new(); + if (json_simple_patch == NULL) + return NULL; + cbuf* cb = cbuf_new(); + xml2json_cbuf(cb, x_simple_patch, 1); + + // Insert a '[' after the first '{' to get the JSON to match what api_data_post/write() expect + char *json_simple_patch_tmp = cbuf_get(cb); + int brace_count = 0; + for (int l = 0; l < strlen(json_simple_patch_tmp); l++) { + char c = json_simple_patch_tmp[l]; + if (c == '{') { + brace_count++; + if (brace_count == 2) { // We've reached the second brace, insert a '[' before it + cbuf_append(json_simple_patch,(int)'['); + } + } + cbuf_append(json_simple_patch,(int)c); + } + cbuf* json_simple_patch_2 = NULL; + + // Insert a ']' before the last '}' to get the JSON to match what api_data_post() expects + for (int l = cbuf_len(json_simple_patch) - 1; l >= 0; l--) { + char c = cbuf_get(json_simple_patch)[l]; + if (c == '}') { + // Truncate and add a string, as there is not a function to insert a char into a cbuf + json_simple_patch_2 = cbuf_trunc(json_simple_patch, l); + cbuf_append_str(json_simple_patch_2, "]}"); + break; + } + } + cbuf_free(json_simple_patch); + cbuf_free(cb); + return json_simple_patch_2; +} + +/*!yang_patch_strip_after_last_slash + * + * Strip /... from end of val + * so that e.g. "/interface=eth2" becomes "/" + * or "/interface_list=mylist/interface=eth2" becomes "/interface_list=mylist/" + * + * @param[in] val value to strip + * @retval new cbuf with the stripped string + * @retval NULL error + */ +static cbuf* yang_patch_strip_after_last_slash(cbuf* val) +{ + cbuf *cb = cbuf_new(); + cbuf* val_tmp = cbuf_new(); + cbuf_append_str(val_tmp, cbuf_get(val)); + int idx = cbuf_len(val_tmp); + for (int l = cbuf_len(val_tmp) - 1; l>= 0; l--) { + if (cbuf_get(val_tmp)[l] == '/') { + idx = l; + break; + } + } + if (idx == cbuf_len(val_tmp)) // Didn't find a slash in the loop above + return NULL; + cbuf* val_tmp_2 = cbuf_trunc(val_tmp, idx + 1); + if (cbuf_append_str(cb, cbuf_get(val_tmp_2)) < 0) + return NULL; + cbuf_free(val_tmp); + cbuf_free(val_tmp_2); + return cb; +} + +/*! YANG PATCH replace method + * @param[in] h Clixon handle + * @param[in] req Generic Www handle + * @param[in] pi Offset, where to start pcvec + * @param[in] qvec Vector of query string (QUERY_STRING) + * @param[in] pretty Set to 1 for pretty-printed xml/json output + * @param[in] media_out Output media + * @param[in] ds 0 if "data" resource, 1 if rfc8527 "ds" resource + * @param[in] simplepatch_request_uri URI for patch request, e.g. "/restconf/data/ietf-interfaces:interfaces" + * @param[in] target_val value in "target" field of edit in YANG patch + * @param[in] value_vec_len number of elements in the "value" array of an edit in YANG patch + * @param[in] value_vec pointer to the "value" array of an edit in YANG patch + * @param[in] x_simple_patch pointer to XML containing module name, e.g. + */ +static int yang_patch_do_replace ( + clicon_handle h, + void *req, + int pi, + cvec *qvec, + int pretty, + restconf_media media_out, + ietf_ds_t ds, + cbuf* simple_patch_request_uri, + cbuf* target_val, + int value_vec_len, + cxobj** value_vec, + cxobj *x_simple_patch + ) +{ + cxobj * value_vec_tmp = NULL; + cbuf* delete_req_uri = cbuf_new(); + if (delete_req_uri == NULL) + return 1; + + // Make delete_req_uri something like "/restconf/data/ietf-interfaces:interfaces" + if (cbuf_append_str(delete_req_uri, cbuf_get(simple_patch_request_uri)) < 0) + return 1; + + // Add the target to delete_req_uri, + // so it's something like "/restconf/data/ietf-interfaces:interfaces/interface=eth2" + if (cbuf_append_str(delete_req_uri, cbuf_get(target_val)) < 0) + return 1; + + // Delete the object with the old values + int ret = api_data_delete(h, req, cbuf_get(delete_req_uri), pi, pretty, YANG_DATA_JSON, ds ); + cbuf_free(delete_req_uri); + if (ret != 0) + return ret; + + // Now set up for the post request. + // Strip /... from end of target val + // so that e.g. "/interface=eth2" becomes "/" + // or "/interface_list=mylist/interface=eth2" becomes "/interface_list=mylist/" + cbuf* post_req_uri = yang_patch_strip_after_last_slash(target_val); + + // Make post_req_uri something like "/restconf/data/ietf-interfaces:interfaces" + if (cbuf_append_str(simple_patch_request_uri, cbuf_get(post_req_uri))) + return 1; + cbuf_free(post_req_uri); + + // Now insert the new values into the data + // (which will include the key value and all other mandatory values) + for (int k = 0; k < value_vec_len; k++) { + if (value_vec[k] != NULL) { + value_vec_tmp = xml_dup(value_vec[k]); + xml_addsub(x_simple_patch, value_vec_tmp); + } + } + // Convert the data to json + cbuf *json_simple_patch = cbuf_new(); + if (json_simple_patch == NULL) + return 1; + xml2json_cbuf(json_simple_patch, x_simple_patch, 1); + + // Send the POST request + ret = api_data_post(h, req, cbuf_get(simple_patch_request_uri), pi, qvec, cbuf_get(json_simple_patch), pretty, YANG_DATA_JSON, media_out, ds ); + + cbuf_free(json_simple_patch); + xml_free(value_vec_tmp); + return ret; +} + +/*! YANG PATCH create method + * @param[in] h Clixon handle + * @param[in] req Generic Www handle + * @param[in] pi Offset, where to start pcvec + * @param[in] qvec Vector of query string (QUERY_STRING) + * @param[in] pretty Set to 1 for pretty-printed xml/json output + * @param[in] media_out Output media + * @param[in] ds 0 if "data" resource, 1 if rfc8527 "ds" resource + * @param[in] simplepatch_request_uri URI for patch request, e.g. "/restconf/data/ietf-interfaces:interfaces" + * @param[in] value_vec_len number of elements in the "value" array of an edit in YANG patch + * @param[in] value_vec pointer to the "value" array of an edit in YANG patch + * @param[in] x_simple_patch pointer to XML containing module name, e.g. + */ +static int yang_patch_do_create ( + clicon_handle h, + void *req, + int pi, + cvec *qvec, + int pretty, + restconf_media media_out, + ietf_ds_t ds, + cbuf* simple_patch_request_uri, + int value_vec_len, + cxobj** value_vec, + cxobj *x_simple_patch + ) +{ + cxobj * value_vec_tmp = NULL; + for (int k = 0; k < value_vec_len; k++) { + if (value_vec[k] != NULL) { + value_vec_tmp = xml_dup(value_vec[k]); + xml_addsub(x_simple_patch, value_vec_tmp); + } + } + + // Send the POST request + cbuf* cb = cbuf_new(); + xml2json_cbuf(cb, x_simple_patch, 1); + char *json_simple_patch = cbuf_get(cb); + int ret = api_data_post(h, req, cbuf_get(simple_patch_request_uri), pi, qvec, json_simple_patch, pretty, YANG_DATA_JSON, media_out, ds ); + xml_free(value_vec_tmp); + return ret; +} + +/*! YANG PATCH insert method + * @param[in] h Clixon handle + * @param[in] req Generic Www handle + * @param[in] pi Offset, where to start pcvec + * @param[in] pretty Set to 1 for pretty-printed xml/json output + * @param[in] media_out Output media + * @param[in] ds 0 if "data" resource, 1 if rfc8527 "ds" resource + * @param[in] simple_patch_request_uri URI for patch request, e.g. "/restconf/data/ietf-interfaces:interfaces" + * @param[in] value_vec_len number of elements in the "value" array of an edit in YANG patch + * @param[in] value_vec pointer to the "value" array of an edit in YANG patch + * @param[in] x_simple_patch pointer to XML containing module name, e.g. + * @param[in] where_val value in "where" field of edit in YANG patch + * @param[in] api_path full API path, e.g. "/restconf/data/example-jukebox:jukebox/playlist=Foo-One" + * @param[in] point_val value in "point" field of edit in YANG patch + */ +static int yang_patch_do_insert ( + clicon_handle h, + void *req, + int pi, + int pretty, + restconf_media media_out, + ietf_ds_t ds, + cbuf* simple_patch_request_uri, + int value_vec_len, + cxobj** value_vec, + cxobj *x_simple_patch, + cbuf* where_val, + char* api_path, + cbuf *point_val + ) +{ + cxobj * value_vec_tmp = NULL; + + // Loop through the XML, and get each value + for (int k = 0; k < value_vec_len; k++) { + if (value_vec[k] != NULL) { + value_vec_tmp = xml_dup(value_vec[k]); + xml_addsub(x_simple_patch, value_vec_tmp); + } + } + cbuf *json_simple_patch = yang_patch_xml2json_modified_cbuf(x_simple_patch); + if (json_simple_patch == NULL) + return 1; + + // Set the insert attributes + cvec* qvec_tmp = NULL; + qvec_tmp = cvec_new(0); + if (qvec_tmp == NULL) + return 1; + cg_var *cv; + if ((cv = cvec_add(qvec_tmp, CGV_STRING)) == NULL){ + return 1; + } + cv_name_set(cv, "insert"); + cv_string_set(cv, cbuf_get(where_val)); + cbuf *point_str = cbuf_new(); + if (point_str == NULL) + return 1; + cbuf_append_str(point_str, api_path); + cbuf_append_str(point_str, cbuf_get(point_val)); + if ((cv = cvec_add(qvec_tmp, CGV_STRING)) == NULL){ + return 1; + } + cv_name_set(cv, "point"); + cv_string_set(cv, cbuf_get(point_str)); + + // Send the POST request + int ret = api_data_post(h, req, cbuf_get(simple_patch_request_uri), pi, qvec_tmp, cbuf_get(json_simple_patch), pretty, YANG_DATA_JSON, media_out, ds ); + xml_free(value_vec_tmp); + cbuf_free(point_str); + cbuf_free(json_simple_patch); + return ret; +} + +/*! YANG PATCH merge method + * @param[in] h Clixon handle + * @param[in] req Generic Www handle + * @param[in] pcvec Vector of path ie DOCUMENT_URI element + * @param[in] pi Offset, where to start pcvec + * @param[in] qvec Vector of query string (QUERY_STRING) + * @param[in] pretty Set to 1 for pretty-printed xml/json output + * @param[in] media_out Output media + * @param[in] ds 0 if "data" resource, 1 if rfc8527 "ds" resource + * @param[in] simple_patch_request_uri URI for patch request, e.g. "/restconf/data/ietf-interfaces:interfaces" + * @param[in] value_vec_len number of elements in the "value" array of an edit in YANG patch + * @param[in] value_vec pointer to the "value" array of an edit in YANG patch + * @param[in] x_simple_patch pointer to XML containing module name, e.g. "" + * @param[in] where_val value in "where" field of edit in YANG patch + * @param[in] key_xn XML with key tag and value, e.g. "Foo-One" + */ +static int yang_patch_do_merge ( + clicon_handle h, + void *req, + cvec *pcvec, + int pi, + cvec *qvec, + int pretty, + restconf_media media_out, + ietf_ds_t ds, + cbuf* simple_patch_request_uri, + int value_vec_len, + cxobj** value_vec, + cxobj *x_simple_patch, + cxobj *key_xn + ) +{ + int ret = -1; + cxobj * value_vec_tmp = NULL; + if (key_xn != NULL) + xml_addsub(x_simple_patch, key_xn); + + // Loop through the XML, create JSON from each one, and submit a simple patch + for (int k = 0; k < value_vec_len; k++) { + if (value_vec[k] != NULL) { + value_vec_tmp = xml_dup(value_vec[k]); + xml_addsub(x_simple_patch, value_vec_tmp); + } + cbuf* cb = cbuf_new(); + xml2json_cbuf(cb, x_simple_patch, 1); + + cbuf *json_simple_patch = yang_patch_xml2json_modified_cbuf(x_simple_patch); + if (json_simple_patch == NULL) + return 1; + xml_free(value_vec_tmp); + // Send the simple patch request + ret = api_data_write(h, req, cbuf_get(simple_patch_request_uri), pcvec, pi, qvec, cbuf_get(json_simple_patch), pretty, YANG_DATA_JSON, media_out, 1, ds ); + cbuf_free(cb); + cbuf_free(json_simple_patch); + } + return ret; +} + /*! YANG PATCH method * @param[in] h Clixon handle * @param[in] req Generic Www handle @@ -627,8 +1035,7 @@ api_data_yang_patch(clicon_handle h, cvec *nsc = NULL; yang_bind yb; char *xpath = NULL; - const int temp_str_malloc_size = 5000; - char *path_orig_1 = NULL; + cbuf *path_orig_1 = NULL; clicon_debug(1, "%s api_path:\"%s\"", __FUNCTION__, api_path0); if ((yspec = clicon_dbspec_yang(h)) == NULL){ @@ -697,84 +1104,57 @@ api_data_yang_patch(clicon_handle h, continue; } } - path_orig_1 = malloc(temp_str_malloc_size); + path_orig_1 = cbuf_new(); if (path_orig_1 == NULL) { goto done; } else { - strcpy(path_orig_1, restconf_uripath(h)); + cbuf_append_str(path_orig_1, restconf_uripath(h)); } // Loop through the edits for (int i = 0; i < veclen; i++) { + cxobj **tmp_vec = NULL; + size_t tmp_veclen = 0; + cxobj *xn = vec[i]; - + clicon_log_xml(LOG_DEBUG, xn, "%s %d xn:", __FUNCTION__, __LINE__); // Get target - char *target_val = NULL; - cxobj **target_vec = NULL; - size_t target_veclen; - ret = xpath_vec(xn, nsc, "target", &target_vec, &target_veclen); + cbuf *target_val = cbuf_new(); + ret = yang_patch_get_xval(nsc, xn, target_val, "target"); if (ret < 0) { goto done; } - for (int j = 0; j < target_veclen; j++) { - cxobj *target_xn = target_vec[j]; - target_val = xml_body(target_xn); - } - // Get operation - char *op_val = NULL; - cxobj **operation_vec = NULL; - size_t operation_veclen; - ret = xpath_vec(xn, nsc, "operation", &operation_vec, &operation_veclen); + cbuf *op_val = cbuf_new(); + ret = yang_patch_get_xval(nsc, xn, op_val, "operation"); if (ret < 0) { goto done; } - for (int j = 0; j < operation_veclen; j++) { - cxobj *operation_xn = operation_vec[j]; - op_val = xml_body(operation_xn); - } - // Get "point" and "where" for insert operations - char *point_val = NULL; - cxobj **point_vec = NULL; - size_t point_veclen; - if (strcmp(op_val, "insert") == 0) { - ret = xpath_vec(xn, nsc, "point", &point_vec, &point_veclen); + cbuf *point_val = NULL; + cbuf *where_val = cbuf_new(); + if (strcmp(cbuf_get(op_val), "insert") == 0) { + point_val = cbuf_new(); + ret = yang_patch_get_xval(nsc, xn, point_val, "point"); if (ret < 0) { goto done; } - for (int j = 0; j < point_veclen; j++) { - cxobj *point_xn = point_vec[j]; - point_val = xml_body(point_xn); - } - } - char *where_val = NULL; - cxobj **where_vec = NULL; - size_t where_veclen; - if (strcmp(op_val, "insert") == 0) { - ret = xpath_vec(xn, nsc, "where", &where_vec, &where_veclen); + where_val = cbuf_new(); + ret = yang_patch_get_xval(nsc, xn, where_val, "where"); if (ret < 0) { goto done; } - for (int j = 0; j < where_veclen; j++) { - cxobj *where_xn = where_vec[j]; - where_val = xml_body(where_xn); - } } // Construct request URI - char* simple_patch_request_uri = NULL; - simple_patch_request_uri = malloc(temp_str_malloc_size); - strcpy(simple_patch_request_uri, path_orig_1); + cbuf* simple_patch_request_uri = cbuf_new(); + cbuf_append_str(simple_patch_request_uri, cbuf_get(path_orig_1)); - int plain_patch_val = 0; - char* api_path_target = NULL; - api_path_target = malloc(temp_str_malloc_size); - strcpy(api_path_target, api_path); - if (strcmp(op_val, "merge") == 0) { - plain_patch_val = 1; - strcat(api_path_target, target_val); - strcat(simple_patch_request_uri, target_val); + cbuf* api_path_target = cbuf_new(); + cbuf_append_str(api_path_target, api_path); + if (strcmp(cbuf_get(op_val), "merge") == 0) { + cbuf_append_str(api_path_target, cbuf_get(target_val)); + cbuf_append_str(simple_patch_request_uri, cbuf_get(target_val)); } if (xerr) @@ -785,7 +1165,7 @@ api_data_yang_patch(clicon_handle h, // Get key field /* Translate api_path to xml in the form of xtop/xbot */ xbot_tmp = xtop; - if ((ret = api_path2xml(api_path_target, yspec, xtop, YC_DATANODE, 1, &xbot_tmp, &ybot, &xerr)) < 0) + if ((ret = api_path2xml(cbuf_get(api_path_target), yspec, xtop, YC_DATANODE, 1, &xbot_tmp, &ybot, &xerr)) < 0) goto done; if (ret == 0){ /* validation failed */ if (api_return_err0(h, req, xerr, pretty, media_out, 0) < 0) @@ -808,288 +1188,84 @@ api_data_yang_patch(clicon_handle h, if (key_vec != NULL) { key_xn = key_vec[0]; } - - // Get values (for "delete", there are no values) - cxobj **values_vec = NULL; - size_t values_veclen; - xpath_vec(xn, nsc, "value", &values_vec, &values_veclen); + // Get values (for "delete" and "remove", there are no values) + xpath_vec(xn, nsc, "value", &tmp_vec, &tmp_veclen); key_node_id = NULL; // Loop through the values - for (int j = 0; j < values_veclen; j++) { - cxobj *values_xn = values_vec[j]; + for (int j = 0; j < tmp_veclen; j++) { + cxobj *values_xn = tmp_vec[j]; cxobj** values_child_vec = xml_childvec_get(values_xn); if (key_node_id == NULL) key_node_id = xml_name(*values_child_vec); - char *patch_header = NULL; - patch_header = malloc(temp_str_malloc_size); + cbuf *patch_header = cbuf_new(); if (patch_header == NULL) { goto done; } - strcpy(patch_header, modname); - strcat(patch_header, ":"); - strcat(patch_header, key_node_id); - cxobj *x_simple_patch = xml_new(patch_header, NULL, CX_ELMNT); + cbuf_append_str(patch_header, modname); + cbuf_append_str(patch_header, ":"); + cbuf_append_str(patch_header, key_node_id); + cxobj *x_simple_patch = xml_new(cbuf_get(patch_header), NULL, CX_ELMNT); if (x_simple_patch == NULL) goto done; int value_vec_len = xml_child_nr(*values_child_vec); cxobj** value_vec = xml_childvec_get(*values_child_vec); - cxobj * value_vec_tmp = NULL; - // For "replace", delete the item and then POST it // TODO - in an ordered list, insert it into its original position - if (strcmp(op_val,"replace") == 0) { - char *delete_req_uri = malloc(temp_str_malloc_size); - if (delete_req_uri == NULL) - break; - - strcpy(delete_req_uri, simple_patch_request_uri); - strcat(delete_req_uri, target_val); - - // Delete the object with the old values - ret = api_data_delete(h, req, delete_req_uri, pi, pretty, YANG_DATA_JSON, ds ); - free(delete_req_uri); - - // Now insert the object with the new values - char *json_simple_patch = malloc(temp_str_malloc_size); - if (json_simple_patch == NULL) + if (strcmp(cbuf_get(op_val),"replace") == 0) { + ret = yang_patch_do_replace(h, req, pi, qvec, pretty, media_out, ds, simple_patch_request_uri, target_val, value_vec_len, value_vec, x_simple_patch); + if (ret != 0) { goto done; - memset(json_simple_patch, 0, temp_str_malloc_size); - - for (int k = 0; k < value_vec_len; k++) { - if (value_vec[k] != NULL) { - value_vec_tmp = xml_dup(value_vec[k]); - xml_addsub(x_simple_patch, value_vec_tmp); - } } - cbuf* cb = cbuf_new(); - xml2json_cbuf(cb, x_simple_patch, 1); - - // Some ugly text processing to get the JSON to match what api_data_post() expects - char *json_simple_patch_tmp = cbuf_get(cb); - int brace_count = 0; - for (int l = 0; l < strlen(json_simple_patch_tmp); l++) { - char c = json_simple_patch_tmp[l]; - if (c == '{') { - brace_count++; - if (brace_count == 2) { - json_simple_patch[strlen(json_simple_patch)] = '['; - } - } - json_simple_patch[strlen(json_simple_patch)] = c; - } - /* strip /... from end */ - char *post_req_uri = malloc(temp_str_malloc_size); - if (post_req_uri == NULL) - break; - memset(post_req_uri, 0, temp_str_malloc_size); - if (post_req_uri == NULL) - break; - int idx = strlen(target_val); - for (int l = strlen(target_val); l>= 0; l--) { - if (target_val[l] == '/') { - idx = l; - break; - } - } - strncpy(post_req_uri, target_val, idx); - strcat(simple_patch_request_uri, post_req_uri); - free(post_req_uri); - for (int l = strlen(json_simple_patch); l>= 0; l--) { - char c = json_simple_patch[l]; - if (c == '}') { - json_simple_patch[l] = ']'; - json_simple_patch[l + 1] = '}'; - break; - } - } - - // Send the POST request - ret = api_data_post(h, req, simple_patch_request_uri, pi, qvec, json_simple_patch, pretty, YANG_DATA_JSON, media_out, ds ); - if (value_vec_tmp != NULL) - free(value_vec_tmp); - free(x_simple_patch); - free(patch_header); // NULL check was already done before - if (ret != 0) - goto done; - break; } - // For "create", put all the data values into a single POST request - if (strcmp(op_val,"create") == 0) { - for (int k = 0; k < value_vec_len; k++) { - if (value_vec[k] != NULL) { - value_vec_tmp = xml_dup(value_vec[k]); - xml_addsub(x_simple_patch, value_vec_tmp); - } - } - - // Send the POST request - cbuf* cb = cbuf_new(); - xml2json_cbuf(cb, x_simple_patch, 1); - char *json_simple_patch = cbuf_get(cb); - ret = api_data_post(h, req, simple_patch_request_uri, pi, qvec, json_simple_patch, pretty, YANG_DATA_JSON, media_out, ds ); - if (value_vec_tmp != NULL) - free(value_vec_tmp); - free(x_simple_patch); - free(patch_header); // NULL check was already done before - if (ret != 0) + if (strcmp(cbuf_get(op_val),"create") == 0) { + ret = yang_patch_do_create(h, req, pi, qvec, pretty, media_out, ds, simple_patch_request_uri, value_vec_len, value_vec, x_simple_patch); + if (ret != 0) { goto done; - break; + } } // For "insert", make a api_data_post request - if (strcmp(op_val, "insert") == 0) { - char *json_simple_patch = malloc(temp_str_malloc_size); - if (json_simple_patch == NULL) - goto done; - memset(json_simple_patch, 0, temp_str_malloc_size); - - // Loop through the XML, and get each value - for (int k = 0; k < value_vec_len; k++) { - if (value_vec[k] != NULL) { - value_vec_tmp = xml_dup(value_vec[k]); - xml_addsub(x_simple_patch, value_vec_tmp); - } - } - cbuf* cb = cbuf_new(); - xml2json_cbuf(cb, x_simple_patch, 1); - - // Some ugly text processing to get the JSON to match what api_data_post() expects - char *json_simple_patch_tmp = cbuf_get(cb); - int brace_count = 0; - for (int l = 0; l < strlen(json_simple_patch_tmp); l++) { - char c = json_simple_patch_tmp[l]; - if (c == '{') { - brace_count++; - if (brace_count == 2) { - json_simple_patch[strlen(json_simple_patch)] = '['; - } - } - json_simple_patch[strlen(json_simple_patch)] = c; - } - for (int l = strlen(json_simple_patch); l>= 0; l--) { - char c = json_simple_patch[l]; - if (c == '}') { - json_simple_patch[l] = ']'; - json_simple_patch[l + 1] = '}'; - break; - } - } - - // Set the insert attributes - cvec* qvec_tmp = NULL; - qvec_tmp = cvec_new(0); - if (qvec_tmp == NULL) - goto done; - cg_var *cv; - if ((cv = cvec_add(qvec_tmp, CGV_STRING)) == NULL){ + if (strcmp(cbuf_get(op_val), "insert") == 0) { + ret = yang_patch_do_insert(h, req, pi, pretty, media_out, ds, simple_patch_request_uri, value_vec_len, value_vec, x_simple_patch, where_val, api_path, point_val); + if (ret != 0) { goto done; } - cv_name_set(cv, "insert"); - cv_string_set(cv, where_val); - char *point_str = malloc(temp_str_malloc_size); - if (point_str == NULL) - goto done; - memset(point_str, 0, temp_str_malloc_size); - strcpy(point_str, api_path); - strcat(point_str, point_val); - if ((cv = cvec_add(qvec_tmp, CGV_STRING)) == NULL){ - goto done; - } - cv_name_set(cv, "point"); - cv_string_set(cv, point_str); - - // Send the POST request - ret = api_data_post(h, req, simple_patch_request_uri, pi, qvec_tmp, json_simple_patch, pretty, YANG_DATA_JSON, media_out, ds ); - if (cb != NULL) - cbuf_free(cb); - if (value_vec_tmp != NULL) - free(value_vec_tmp); - free(point_str); // NULL check was already done above - free(json_simple_patch); // NULL check was already done above - free(patch_header); // NULL check was already done before - if (x_simple_patch != NULL) - free(x_simple_patch); - break; } - // For merge", make single simple patch requests for each value - if (strcmp(op_val,"merge") == 0) { - if (key_xn != NULL) - xml_addsub(x_simple_patch, key_xn); - - char *json_simple_patch = malloc(temp_str_malloc_size); - if (json_simple_patch == NULL) + if (strcmp(cbuf_get(op_val),"merge") == 0) { + ret = yang_patch_do_merge(h, req, pcvec, pi, qvec, pretty, media_out, ds, simple_patch_request_uri, value_vec_len, value_vec, x_simple_patch, key_xn); + if (ret != 0) { goto done; - - // Loop through the XML, create JSON from each one, and submit a simple patch - for (int k = 0; k < value_vec_len; k++) { - if (value_vec[k] != NULL) { - value_vec_tmp = xml_dup(value_vec[k]); - xml_addsub(x_simple_patch, value_vec_tmp); - } - cbuf* cb = cbuf_new(); - xml2json_cbuf(cb, x_simple_patch, 1); - - // Some ugly text processing to get the JSON to match what api_data_write() expects for a simple patch - char *json_simple_patch_tmp = cbuf_get(cb); - memset(json_simple_patch, 0, temp_str_malloc_size); - int brace_count = 0; - for (int l = 0; l < strlen(json_simple_patch_tmp); l++) { - char c = json_simple_patch_tmp[l]; - if (c == '{') { - brace_count++; - if (brace_count == 2) { - json_simple_patch[strlen(json_simple_patch)] = '['; - } - } - json_simple_patch[strlen(json_simple_patch)] = c; - } - for (int l = strlen(json_simple_patch); l>= 0; l--) { - char c = json_simple_patch[l]; - if (c == '}') { - json_simple_patch[l] = ']'; - json_simple_patch[l + 1] = '}'; - break; - } - } - if (value_vec_tmp != NULL) - free(value_vec_tmp); - // Send the simple patch request - ret = api_data_write(h, req, simple_patch_request_uri, pcvec, pi, qvec, json_simple_patch, pretty, YANG_DATA_JSON, media_out, plain_patch_val, ds ); - cbuf_free(cb); } - free(json_simple_patch); // NULL check was already done above - free(patch_header); // NULL check was already done before - if (x_simple_patch != NULL) - free(x_simple_patch); } + cbuf_free(patch_header); + yang_patch_free_mem((void *)x_simple_patch); // Using xml_free() causes crash } - if ((strcmp(op_val, "delete") == 0) || - (strcmp(op_val, "remove") == 0)) { - strcat(simple_patch_request_uri, target_val); - if (strcmp(op_val, "delete") == 0) { + if ((strcmp(cbuf_get(op_val), "delete") == 0) || + (strcmp(cbuf_get(op_val), "remove") == 0)) { + cbuf_append_str(simple_patch_request_uri, cbuf_get(target_val)); + if (strcmp(cbuf_get(op_val), "delete") == 0) { // TODO - send error } else { // TODO - do not send error } - api_data_delete(h, req, simple_patch_request_uri, pi, pretty, YANG_DATA_JSON, ds); + api_data_delete(h, req, cbuf_get(simple_patch_request_uri), pi, pretty, YANG_DATA_JSON, ds); } - if (simple_patch_request_uri) - free(simple_patch_request_uri); - if (api_path_target) - free(api_path_target); + cbuf_free(simple_patch_request_uri); + cbuf_free(api_path_target); + cbuf_free(target_val); + cbuf_free(op_val); + cbuf_free(point_val); + cbuf_free(where_val); } ok: retval = 0; done: - if (path_orig_1 != NULL) - free(path_orig_1); - if (vec) - free(vec); - if (xpath) - free(xpath); + cbuf_free(path_orig_1); + yang_patch_free_mem((void *)vec); + yang_patch_free_mem((void *)xpath); if (nsc) xml_nsctx_free(nsc); if (xret) @@ -1194,7 +1370,7 @@ api_data_patch(clicon_handle h, ietf_ds_t ds) { restconf_media media_in; - int ret; + int ret = -1; media_in = restconf_content_type(h); switch (media_in){ diff --git a/apps/restconf/restconf_methods.h b/apps/restconf/restconf_methods.h index 975b63eb..95943ba6 100644 --- a/apps/restconf/restconf_methods.h +++ b/apps/restconf/restconf_methods.h @@ -39,6 +39,7 @@ #ifndef _RESTCONF_METHODS_H_ #define _RESTCONF_METHODS_H_ +#define TEMP_STR_MALLOC_SIZE 5000 /* * Prototypes */ diff --git a/example/main/example.xml b/example/main/example.xml index 179db40f..fc7912f5 100644 --- a/example/main/example.xml +++ b/example/main/example.xml @@ -23,5 +23,5 @@ disabled true false - truenonedefault
0.0.0.0
8081false + truenonedefault
0.0.0.0
80false diff --git a/test/test_restconf_internal.sh b/test/test_restconf_internal.sh index 41e449f5..4eb894f0 100755 --- a/test/test_restconf_internal.sh +++ b/test/test_restconf_internal.sh @@ -23,8 +23,6 @@ startupdb=$dir/startup_db RESTCONFDBG=$DBG RCPROTO=http # no ssl here -RESTCONFDIR=$(dirname $(which clixon_restconf)) - # log-destination in restconf xml: syslog or file : ${LOGDST:=syslog} # Set daemon command-line to -f @@ -54,7 +52,6 @@ cat < $cfg /usr/local/lib/$APPNAME/backend example_backend.so$ /usr/local/lib/$APPNAME/restconf - $RESTCONFDIR /usr/local/lib/$APPNAME/cli $APPNAME /usr/local/var/$APPNAME/$APPNAME.sock diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh index 70a94c37..f57c7cf9 100755 --- a/test/test_restconf_internal_usecases.sh +++ b/test/test_restconf_internal_usecases.sh @@ -34,8 +34,6 @@ startupdb=$dir/startup_db RESTCONFDBG=$DBG RCPROTO=http # no ssl here -RESTCONFDIR=$(dirname $(which clixon_restconf)) - INVALIDADDR=251.1.1.1 # used by fourth usecase as invalid # log-destination in restconf xml: syslog or file @@ -68,7 +66,6 @@ cat < $cfg /usr/local/lib/$APPNAME/backend example_backend.so$ /usr/local/lib/$APPNAME/restconf - $RESTCONFDIR /usr/local/lib/$APPNAME/cli $APPNAME /usr/local/var/$APPNAME/$APPNAME.sock diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index c2c5f141..4c80d5ef 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -169,7 +169,7 @@ case $release in native) $sshcmd sudo yum install -y libevent openssl $sshcmd sudo yum install -y libevent-devel openssl-devel - $sshcmd sudo dnf config-manager --set-enabled powertools + $sshcmd sudo yum-config-manager --enable powertools $sshcmd sudo yum install -y libnghttp2-devel ;; esac @@ -214,8 +214,9 @@ case $release in $sshcmd sudo apt install -y nginx ;; native) -# $sshcmd sudo apt install -y libevent-2.1 - $sshcmd sudo apt install -y libevent-dev libssl-dev + $sshcmd sudo apt install -y libssl-dev + $sshcmd sudo apt install -y libevent-dev # evhtp + $sshcmd sudo apt install -y libnghttp2-dev # nghttp2 ;; esac ;;