Fixed bug in parsing process_select for Windows

The USER field from process_select on Windows may contain spaces. Now,
the parser continues until it finds something that looks like a PID.
This approach is not bullet proof, because the USER field could contain
something that looks like a PID. However, a proper fix would require
rewriting the entire parser. Hence, this will do for now.

Ticket: ENT-12751
Changelog: Title
Signed-off-by: Lars Erik Wik <[email protected]>

Author: larsewi

libpromises/processes_select.c

@@ -778,6 +778,17 @@ static bool SplitProcLine(const char *line,
 
       Take these two examples:
 
+Windows:
+    User field can contain spaces. E.g.:
+
+    USER                   PID %CPU %MEM      VSZ       RSS TTY STAT START  TIME COMMAND
+    NETWORK SERVICE        540  0.0  0.3     5092     11180 ?   ?    Apr28 00:00 C:\\Windows\\system32\\svchost.exe -k RPCSS -p
+    etc.
+
+    There is really no good way to do this with the current parsing logic. We
+    know that the next field will be a PID, so we can parse until we find a
+    number.
+
 AIX:
     USER      PID     PPID     PGID  %CPU  %MEM   VSZ NI S    STIME        TIME COMMAND
     root        1        0        0   0.0   0.0   784 20 A   Nov 28    00:00:00 /etc/init
@@ -891,6 +902,7 @@ Solaris 9:
         bool cmd = (strcmp(names[field], "CMD") == 0 ||
                     strcmp(names[field], "COMMAND") == 0);
         bool stime = !cmd && (strcmp(names[field], "STIME") == 0);
+        bool is_user_field = StringEqual(names[field], "USER");
 
         // Equal boolean results, either both must be true, or both must be
         // false. IOW we must either both be at the last field, and it must be
@@ -981,6 +993,41 @@ Solaris 9:
                 last++;
             }
         }
+        else if (is_user_field)
+        {
+            bool done = false;
+            while (!done)
+            {
+                while (line[last] != '\0' && !isspace(line[last]))
+                {
+                    last++;
+                }
+
+                /* On windows the USER field can contain spaces. We know that
+                 * the next field will be PID. Hence, we seek past the spaces
+                 * to see if the next thing is a number. If this is not the
+                 * case, we assume it is still the USER field. This is not
+                 * bulletproof. However, this parser never was. */
+                int seek_past = last;
+                while (line[seek_past] != '\0' && isspace(line[seek_past]))
+                {
+                    seek_past++;
+                }
+
+                if (line[seek_past] == '\0')
+                {
+                    done = true;
+                }
+                else if (isdigit(line[seek_past]))
+                {
+                    done = true;
+                }
+                else
+                {
+                    last = seek_past;
+                }
+            }
+        }
         else
         {
             // Generic fields

tests/unit/Makefile.am

@@ -86,6 +86,7 @@ libdb_la_LIBADD = ../../libntech/libutils/libutils.la
 libdb_la_CFLAGS = $(AM_CFLAGS)
 
 check_PROGRAMS = \
+	processes_select_test \
 	arg_split_test \
 	assoc_test \
 	getopt_test \
@@ -187,6 +188,10 @@ if HPUX
 XFAIL_TESTS = mon_load_test # Redmine #3569
 endif
 
+
+processes_select_test_SOURCES = processes_select_test.c
+processes_select_test_LDADD = libtest.la ../../libpromises/libpromises.la
+
 #
 # OS X uses real system calls instead of our stubs unless this option is used
 #

tests/unit/processes_select_test.c

@@ -0,0 +1,45 @@
+#include <test.h>
+
+#include <item_lib.h>
+#include <cf3.defs.h>
+#include <processes_select.c>
+
+static void test_SplitProcLine_windows(void)
+{
+
+    char buf[CF_BUFSIZE];
+    snprintf(buf, sizeof(buf), "%-20s %5s %s %s %8s %8s %-3s %s %s %5s %s",
+             "USER", "PID", "%CPU", "%MEM", "VSZ", "RSS", "TTY", "STAT", "START", "TIME", "COMMAND");
+
+    char *names[CF_PROCCOLS] = {0};
+    int start[CF_PROCCOLS];
+    int end[CF_PROCCOLS];
+
+    GetProcessColumnNames(buf, names, start, end);
+
+    const char *const proc_line = "NETWORK SERVICE        540  0.0  0.3     5092     11180 ?   ?    Apr28 00:00 C:\\Windows\\system32\\svchost.exe -k RPCSS -p";
+    time_t pstime = time(NULL);
+
+    char *column[CF_PROCCOLS] = {0};
+
+    bool ret = SplitProcLine(proc_line, pstime, names, start, end, PCA_AllColumnsPresent, column);
+    assert_true(ret);
+    assert_string_equal(column[0], "NETWORK SERVICE");
+
+    for (int i = 0; i < CF_PROCCOLS; i++)
+    {
+        free(names[i]);
+        free(column[i]);
+    }
+}
+
+int main()
+{
+    PRINT_TEST_BANNER();
+    const UnitTest tests[] =
+    {
+          unit_test(test_SplitProcLine_windows),
+    };
+
+    return run_tests(tests);
+}