Factor out argv splitting into rad_expand_xlat

[freeradius.git] / src / main / exec.c

diff --git a/src/main/exec.c b/src/main/exec.c
index 9b1279b..f068de8 100644 (file)
--- a/src/main/exec.c
+++ b/src/main/exec.c
@@ -90,8 +90,6 @@ pid_t radius_start_program(const char *cmd, REQUEST *request,
                        VALUE_PAIR *input_pairs,
                        int shell_escape)
 {
-       const char *from;
-       char *to;
 #ifndef __MINGW32__
        char *p;
        VALUE_PAIR *vp;
@@ -100,147 +98,20 @@ pid_t radius_start_program(const char *cmd, REQUEST *request,
        int from_child[2] = {-1, -1};
        pid_t pid;
 #endif
-       int argc = -1;
+       int argc;
        int i;
-       int left;
        char *argv[MAX_ARGV];
        char argv_buf[4096];
 #define MAX_ENVP 1024
        char *envp[MAX_ENVP];
-       char mycmd[1024];
 
-       if (strlen(cmd) > (sizeof(mycmd) - 1)) {
-               radlog(L_ERR, "Command line is too long");
-               return -1;
-       }
-
-       /*
-        *      Check for bad escapes.
-        */
-       if (cmd[strlen(cmd) - 1] == '\\') {
-               radlog(L_ERR, "Command line has final backslash, without a following character");
-               return -1;
-       }
-
-       strlcpy(mycmd, cmd, sizeof(mycmd));
-
-       /*
-        *      Split the string into argv's BEFORE doing radius_xlat...
-        */
-       from = cmd;
-       to = mycmd;
-       argc = 0;
-       while (*from) {
-               int length;
-
-               /*
-                *      Skip spaces.
-                */
-               if ((*from == ' ') || (*from == '\t')) {
-                       from++;
-                       continue;
-               }
-
-               argv[argc] = to;
-               argc++;
-
-               if (argc >= (MAX_ARGV - 1)) break;
-
-               /*
-                *      Copy the argv over to our buffer.
-                */
-               while (*from && (*from != ' ') && (*from != '\t')) {
-                       if (to >= mycmd + sizeof(mycmd) - 1) {
-                               return -1; /* ran out of space */
-                       }
-
-                       switch (*from) {
-                       case '"':
-                       case '\'':
-                               length = rad_copy_string(to, from);
-                               if (length < 0) {
-                                       radlog(L_ERR, "Invalid string passed as argument for external program");
-                                       return -1;
-                               }
-                               from += length;
-                               to += length;
-                               break;
-
-                       case '%':
-                               if (from[1] == '{') {
-                                       *(to++) = *(from++);
-
-                                       length = rad_copy_variable(to, from);
-                                       if (length < 0) {
-                                               radlog(L_ERR, "Invalid variable expansion passed as argument for external program");
-                                               return -1;
-                                       }
-                                       from += length;
-                                       to += length;
-                               } else { /* FIXME: catch %%{ ? */
-                                       *(to++) = *(from++);
-                               }
-                               break;
-
-                       case '\\':
-                               if (from[1] == ' ') from++;
-                               /* FALL-THROUGH */
-
-                       default:
-                               *(to++) = *(from++);
-                       }
-               } /* end of string, or found a space */
-
-               *(to++) = '\0'; /* terminate the string */
-       }
-
-       /*
-        *      We have to have SOMETHING, at least.
-        */
+       argc = rad_expand_xlat(request, cmd, MAX_ARGV, argv, 1,
+                               sizeof(argv_buf), argv_buf);
        if (argc <= 0) {
-               radlog(L_ERR, "Exec-Program: empty command line.");
+               radlog(L_ERR, "Exec-Program: invalid command line.");
                return -1;
        }
 
-       /*
-        *      Expand each string, as appropriate.
-        */
-       to = argv_buf;
-       left = sizeof(argv_buf);
-       for (i = 0; i < argc; i++) {
-               int sublen;
-
-               /*
-                *      Don't touch argv's which won't be translated.
-                */
-               if (strchr(argv[i], '%') == NULL) continue;
-
-               if (!request) continue;
-
-               sublen = radius_xlat(to, left - 1, argv[i], request, NULL, NULL);
-               if (sublen <= 0) {
-                       /*
-                        *      Fail to be backwards compatible.
-                        *
-                        *      It's yucky, but it won't break anything,
-                        *      and it won't cause security problems.
-                        */
-                       sublen = 0;
-               }
-
-               argv[i] = to;
-               to += sublen;
-               *(to++) = '\0';
-               left -= sublen;
-               left--;
-
-               if (left <= 0) {
-                       radlog(L_ERR, "Exec-Program: Ran out of space while expanding arguments.");
-                       return -1;
-               }
-       }
-       argv[argc] = NULL;
-
 #ifndef __MINGW32__
        /*
         *      Open a pipe for child/parent communication, if necessary.