Low: libcib: Move CIB op input transformation to ops that need it

I've been testing full-CIB replacements and encountered some problems
due to the early input transformation (currently in get_op_input()),
particularly with XPath. When we're treating the section string as an
XPath expression, it doesn't make sense to try to find it as an element
of input. (That is, unless we want to do an XPath search, which we can
think about if necessary.)

This moves the input transformation to the operations that need it, and
performs it only when NOT treating the section as XPath.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

lib/cib/cib_ops.c

@@ -300,25 +300,19 @@ cib__process_create(const char *op, int options, const char *section,
     int rc = pcmk_rc_ok;
     xmlNode *update_section = NULL;
 
-    if (pcmk__str_eq(PCMK__XE_ALL, section, pcmk__str_casei)) {
-        section = NULL;
-
-    } else if (pcmk__str_eq(section, PCMK_XE_CIB, pcmk__str_casei)) {
-        section = NULL;
-
-    } else if (pcmk__xe_is(input, PCMK_XE_CIB)) {
-        section = NULL;
+    if ((section != NULL) && pcmk__xe_is(input, PCMK_XE_CIB)) {
+        input = pcmk_find_cib_element(input, section);
     }
 
-    CRM_CHECK(strcmp(op, PCMK__CIB_REQUEST_CREATE) == 0, return -EINVAL);
-
     if (input == NULL) {
         pcmk__err("Cannot perform modification with no data");
         return EINVAL;
     }
 
-    if (section == NULL) {
-        return cib__process_modify(op, options, section, req, input, cib,
+    if (pcmk__strcase_any_of(section, PCMK__XE_ALL, PCMK_XE_CIB, NULL)
+        || pcmk__xe_is(input, PCMK_XE_CIB)) {
+
+        return cib__process_modify(op, options, NULL, req, input, cib,
                                    answer);
     }
 
@@ -446,6 +440,10 @@ process_delete_section(const char *section, xmlNode *input, xmlNode *cib)
 {
     xmlNode *obj_root = NULL;
 
+    if ((section != NULL) && pcmk__xe_is(input, PCMK_XE_CIB)) {
+        input = pcmk_find_cib_element(input, section);
+    }
+
     if (input == NULL) {
         pcmk__err("Cannot find matching section to delete with no input data");
         return EINVAL;
@@ -556,6 +554,10 @@ process_modify_section(int options, const char *section, xmlNode *input,
     const uint32_t flags = (score? pcmk__xaf_score_update : pcmk__xaf_none);
     xmlNode *obj_root = NULL;
 
+    if ((section != NULL) && pcmk__xe_is(input, PCMK_XE_CIB)) {
+        input = pcmk_find_cib_element(input, section);
+    }
+
     if (input == NULL) {
         pcmk__err("Cannot complete CIB modify request with no input data");
         return EINVAL;
@@ -875,6 +877,10 @@ process_replace_section(const char *section, xmlNode *request, xmlNode *input,
     int rc = pcmk_rc_ok;
     xmlNode *obj_root = NULL;
 
+    if ((section != NULL) && pcmk__xe_is(input, PCMK_XE_CIB)) {
+        input = pcmk_find_cib_element(input, section);
+    }
+
     if (input == NULL) {
         pcmk__err("Cannot find matching section to replace with no input data");
         return EINVAL;

lib/cib/cib_utils.c

@@ -173,23 +173,17 @@ cib_acl_enabled(xmlNode *xml, const char *user)
 
 /*!
  * \internal
- * \brief Get input data from a CIB request, based on section and call data
+ * \brief Get input data from a CIB request
  *
  * \param[in] request  CIB request XML
  */
 static xmlNode *
 get_op_input(const xmlNode *request)
 {
-    const char *section = pcmk__xe_get(request, PCMK__XA_CIB_SECTION);
     xmlNode *wrapper = pcmk__xe_first_child(request, PCMK__XE_CIB_CALLDATA,
                                             NULL, NULL);
-    xmlNode *input = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
 
-    if ((section == NULL) || !pcmk__xe_is(input, PCMK_XE_CIB)) {
-        return input;
-    }
-
-    return pcmk_find_cib_element(input, section);
+    return pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
 }
 
 int