X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fconsole%2Fconsole.c;h=f02f5ff391257fb1568401f22d79923205de002a;hb=10cfd798ced2d27f61ead2de6fe9b1bcc8e3468d;hp=9b88aa801e9ad557c0e32ba7c0785d13bcfd9f46;hpb=8b04726b7e73e294a39f818d9d2867b5718c8522;p=bacula%2Fbacula diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c index 9b88aa801e..f02f5ff391 100644 --- a/bacula/src/console/console.c +++ b/bacula/src/console/console.c @@ -1,29 +1,20 @@ /* - Bacula® - The Network Backup Solution - - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. - - The main author of Bacula is Kern Sibbald, with contributions from - many others, a complete list can be found in the file AUTHORS. - This program is Free Software; you can redistribute it and/or - modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation and included - in the file LICENSE. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. - - Bacula® is a registered trademark of John Walker. - The licensor of Bacula is the Free Software Foundation Europe - (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, - Switzerland, email:ftf@fsfeurope.org. + Bacula(R) - The Network Backup Solution + + Copyright (C) 2000-2018 Kern Sibbald + + The original author of Bacula is Kern Sibbald, with contributions + from many others, a complete list can be found in the file AUTHORS. + + You may use this file and others of this release according to the + license defined in the LICENSE file, which includes the Affero General + Public License, v3.0 ("AGPLv3") and some additional permissions and + terms pursuant to its AGPLv3 Section 7. + + This notice must be preserved when any source code is + conveyed and/or propagated. + + Bacula(R) is a registered trademark of Kern Sibbald. */ /* * @@ -31,7 +22,6 @@ * * Kern Sibbald, September MM * - * Version $Id$ */ #include "bacula.h" @@ -39,18 +29,20 @@ #include "jcr.h" -#ifdef HAVE_CONIO +#if defined(HAVE_CONIO) #include "conio.h" //#define CONIO_FIX 1 -#else +#else /* defined(HAVE_READLINE) || "DUMB" */ #define con_init(x) #define con_term() #define con_set_zed_keys(); -#define trapctlc() -#define clrbrk() -#define usrbrk() 0 #endif +void trapctlc(); +void clrbrk(); +int usrbrk(); +static int brkflg = 0; /* set on user break */ + #if defined(HAVE_WIN32) #define isatty(fd) (fd==0) #endif @@ -60,7 +52,7 @@ //extern int rl_catch_signals; /* Imported functions */ -int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons); +int authenticate_director(BSOCK *dir, DIRRES *director, CONRES *cons); /* Forward referenced functions */ static void terminate_console(int sig); @@ -83,14 +75,16 @@ static DIRRES *dir = NULL; static CONRES *cons = NULL; static FILE *output = stdout; static bool teeout = false; /* output to output and stdout */ +static bool teein = false; /* input to output and stdout */ static bool stop = false; static bool no_conio = false; +static int timeout = 0; static int argc; static int numdir; -static int numcon; static POOLMEM *args; static char *argk[MAX_CMD_ARGS]; static char *argv[MAX_CMD_ARGS]; +static CONFIG *config; /* Command prototypes */ @@ -98,11 +92,25 @@ static int versioncmd(FILE *input, BSOCK *UA_sock); static int inputcmd(FILE *input, BSOCK *UA_sock); static int outputcmd(FILE *input, BSOCK *UA_sock); static int teecmd(FILE *input, BSOCK *UA_sock); +static int teeallcmd(FILE *input, BSOCK *UA_sock); static int quitcmd(FILE *input, BSOCK *UA_sock); +static int helpcmd(FILE *input, BSOCK *UA_sock); static int echocmd(FILE *input, BSOCK *UA_sock); static int timecmd(FILE *input, BSOCK *UA_sock); static int sleepcmd(FILE *input, BSOCK *UA_sock); static int execcmd(FILE *input, BSOCK *UA_sock); +static int putfilecmd(FILE *input, BSOCK *UA_sock); + +#ifdef HAVE_READLINE +static int eolcmd(FILE *input, BSOCK *UA_sock); + +# ifndef HAVE_REGEX_H +# include "lib/bregex.h" +# else +# include +# endif + +#endif #define CONFIG_FILE "bconsole.conf" /* default configuration file */ @@ -111,16 +119,21 @@ static void usage() { fprintf(stderr, _( PROG_COPYRIGHT -"\nVersion: " VERSION " (" BDATE ") %s %s %s\n\n" +"\n%sVersion: " VERSION " (" BDATE ") %s %s %s\n\n" "Usage: bconsole [-s] [-c config_file] [-d debug_level]\n" +" -D select a Director\n" +" -l list Directors defined\n" +" -L list Consoles defined\n" +" -C select a console\n" " -c set configuration file to file\n" " -d set debug level to \n" " -dt print timestamp in debug output\n" " -n no conio\n" " -s no signals\n" +" -u set command execution timeout to seconds\n" " -t test - read configuration and exit\n" " -? print this message.\n" -"\n"), 2000, HOST_OS, DISTNAME, DISTVER); +"\n"), 2000, BDEMO, HOST_OS, DISTNAME, DISTVER); } @@ -164,15 +177,21 @@ static struct cmdstruct commands[] = { { N_("output"), outputcmd, _("output to file")}, { N_("quit"), quitcmd, _("quit")}, { N_("tee"), teecmd, _("output to file and terminal")}, + { N_("tall"), teeallcmd, _("output everything to file and terminal (tee all)")}, { N_("sleep"), sleepcmd, _("sleep specified time")}, { N_("time"), timecmd, _("print current time")}, { N_("version"), versioncmd, _("print Console's version")}, { N_("echo"), echocmd, _("echo command string")}, { N_("exec"), execcmd, _("execute an external command")}, { N_("exit"), quitcmd, _("exit = quit")}, + { N_("putfile"), putfilecmd, _("send a file to the director")}, { N_("zed_keys"), zed_keyscmd, _("zed_keys = use zed keys instead of bash keys")}, + { N_("help"), helpcmd, _("help listing")}, +#ifdef HAVE_READLINE + { N_("separator"), eolcmd, _("set command separator")}, +#endif }; -#define comsize (sizeof(commands)/sizeof(struct cmdstruct)) +#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct))) static int do_a_command(FILE *input, BSOCK *UA_sock) { @@ -210,6 +229,38 @@ static int do_a_command(FILE *input, BSOCK *UA_sock) return stat; } +/* When getting .api command, we can ignore some signals, so we set + * api_mode=true + */ +static bool api_mode=false; + +static bool ignore_signal(int stat, BSOCK *s) +{ + /* Not in API mode */ + if (!api_mode) { + return false; + } + + /* not a signal */ + if (stat != -1) { + return false; + } + + /* List signal that should not stop the read loop */ + Dmsg1(100, "Got signal %s\n", bnet_sig_to_ascii(s->msglen)); + switch(s->msglen) { + case BNET_CMD_BEGIN: + case BNET_CMD_FAILED: /* might want to print **ERROR** */ + case BNET_CMD_OK: /* might want to print **OK** */ + case BNET_MSGS_PENDING: + return true; + default: + break; + } + + /* The signal should break the read loop */ + return false; +} static void read_and_process_input(FILE *input, BSOCK *UA_sock) { @@ -217,6 +268,7 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) bool at_prompt = false; int tty_input = isatty(fileno(input)); int stat; + btimer_t *tid=NULL; for ( ;; ) { if (at_prompt) { /* don't prompt multiple times */ @@ -227,7 +279,7 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) } if (tty_input) { stat = get_cmd(input, prompt, UA_sock, 30); - if (usrbrk() == 1) { + if (usrbrk() >= 1) { clrbrk(); } if (usrbrk()) { @@ -235,11 +287,10 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) } } else { /* Reading input from a file */ - int len = sizeof_pool_memory(UA_sock->msg) - 1; if (usrbrk()) { break; } - if (fgets(UA_sock->msg, len, input) == NULL) { + if (bfgets(UA_sock->msg, input) == NULL) { stat = -1; } else { sendit(UA_sock->msg); /* echo to terminal */ @@ -252,12 +303,14 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) break; /* error or interrupt */ } else if (stat == 0) { /* timeout */ if (strcmp(prompt, "*") == 0) { - bnet_fsend(UA_sock, ".messages"); + tid = start_bsock_timer(UA_sock, timeout); + UA_sock->fsend(".messages"); + stop_bsock_timer(tid); } else { continue; } } else { - at_prompt = FALSE; + at_prompt = false; /* @ => internal command for us */ if (UA_sock->msg[0] == '@') { parse_args(UA_sock->msg, &args, &argc, argk, argv, MAX_CMD_ARGS); @@ -266,14 +319,30 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) } continue; } - if (!bnet_send(UA_sock)) { /* send command */ + tid = start_bsock_timer(UA_sock, timeout); + if (!UA_sock->send()) { /* send command */ + stop_bsock_timer(tid); break; /* error */ } + stop_bsock_timer(tid); + } + if (strncasecmp(UA_sock->msg, ".api", 4) == 0) { + api_mode = true; } - if (strcmp(UA_sock->msg, ".quit") == 0 || strcmp(UA_sock->msg, ".exit") == 0) { + if (strcasecmp(UA_sock->msg, ".quit") == 0 || strcasecmp(UA_sock->msg, ".exit") == 0) { break; } - while ((stat = bnet_recv(UA_sock)) >= 0) { + tid = start_bsock_timer(UA_sock, timeout); + while (1) { + stat = UA_sock->recv(); + if (ignore_signal(stat, UA_sock)) { + continue; + } + + if (stat < 0) { + break; + } + if (at_prompt) { if (!stop) { sendit("\n"); @@ -285,6 +354,7 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) sendit(UA_sock->msg); } } + stop_bsock_timer(tid); if (usrbrk() > 1) { break; } else { @@ -293,20 +363,20 @@ static void read_and_process_input(FILE *input, BSOCK *UA_sock) if (!stop) { fflush(stdout); } - if (is_bnet_stop(UA_sock)) { + if (UA_sock->is_stop()) { break; /* error or term */ } else if (stat == BNET_SIGNAL) { - if (UA_sock->msglen == BNET_PROMPT) { + if (UA_sock->msglen == BNET_SUB_PROMPT) { at_prompt = true; } - Dmsg1(100, "Got poll %s\n", bnet_sig_to_ascii(UA_sock)); + Dmsg1(100, "Got poll %s\n", bnet_sig_to_ascii(UA_sock->msglen)); } } } /* * Call-back for reading a passphrase for an encrypted PEM file - * This function uses getpass(), + * This function uses getpass(), * which uses a static buffer and is NOT thread-safe. */ static int tls_pem_callback(char *buf, int size, const void *userdata) @@ -336,33 +406,399 @@ static int tls_pem_callback(char *buf, int size, const void *userdata) #ifdef HAVE_READLINE #define READLINE_LIBRARY 1 -#undef free #include "readline.h" #include "history.h" +/* Get the first keyword of the line */ +static char * +get_first_keyword() +{ + char *ret=NULL; + int len; + char *first_space = strchr(rl_line_buffer, ' '); + if (first_space) { + len = first_space - rl_line_buffer; + ret = (char *) malloc((len + 1) * sizeof(char)); + memcpy(ret, rl_line_buffer, len); + ret[len]=0; + } + return ret; +} + +/* + * Return the command before the current point. + * Set nb to the number of command to skip + */ +static char * +get_previous_keyword(int current_point, int nb) +{ + int i, end=-1, start, inquotes=0; + char *s=NULL; + + while (nb-- >= 0) { + /* first we look for a space before the current word */ + for (i = current_point; i >= 0; i--) { + if (rl_line_buffer[i] == ' ' || rl_line_buffer[i] == '=') { + break; + } + } + + /* find the end of the command */ + for (; i >= 0; i--) { + if (rl_line_buffer[i] != ' ') { + end = i; + break; + } + } + + /* no end of string */ + if (end == -1) { + return NULL; + } + + /* look for the start of the command */ + for (start = end; start > 0; start--) { + if (rl_line_buffer[start] == '"') { + inquotes = !inquotes; + } + if ((rl_line_buffer[start - 1] == ' ') && inquotes == 0) { + break; + } + current_point = start; + } + } + + s = (char *)malloc(end - start + 2); + memcpy(s, rl_line_buffer + start, end - start + 1); + s[end - start + 1] = 0; + + // printf("=======> %i:%i <%s>\n", start, end, s); + + return s; +} + +/* Simple structure that will contain the completion list */ +struct ItemList { + alist list; +}; + +static ItemList *items = NULL; +void init_items() +{ + if (!items) { + items = (ItemList*) malloc(sizeof(ItemList)); + memset(items, 0, sizeof(ItemList)); + + } else { + items->list.destroy(); + } + + items->list.init(); +} + +/* Match a regexp and add the result to the items list + * This function is recursive + */ +static void match_kw(regex_t *preg, const char *what, int len, POOLMEM **buf) +{ + int rc, size; + int nmatch=20; + regmatch_t pmatch[nmatch]; + + if (len <= 0) { + return; + } + rc = regexec(preg, what, nmatch, pmatch, 0); + if (rc == 0) { +#if 0 + Pmsg1(0, "\n\n%s\n0123456789012345678901234567890123456789\n 10 20 30\n", what); + Pmsg2(0, "%i-%i\n", pmatch[0].rm_so, pmatch[0].rm_eo); + Pmsg2(0, "%i-%i\n", pmatch[1].rm_so, pmatch[1].rm_eo); + Pmsg2(0, "%i-%i\n", pmatch[2].rm_so, pmatch[2].rm_eo); + Pmsg2(0, "%i-%i\n", pmatch[3].rm_so, pmatch[3].rm_eo); +#endif + size = pmatch[1].rm_eo - pmatch[1].rm_so; + *buf = check_pool_memory_size(*buf, size + 1); + memcpy(*buf, what+pmatch[1].rm_so, size); + (*buf)[size] = 0; + + items->list.append(bstrdup(*buf)); + /* We search for the next keyword in the line */ + match_kw(preg, what + pmatch[1].rm_eo, len - pmatch[1].rm_eo, buf); + } +} + +/* fill the items list with the output of the help command */ +void get_arguments(const char *what) +{ + regex_t preg; + POOLMEM *buf; + int rc; + init_items(); + + rc = regcomp(&preg, "(([a-z]+=)|([a-z]+)( |$))", REG_EXTENDED); + if (rc != 0) { + return; + } + + buf = get_pool_memory(PM_MESSAGE); + UA_sock->fsend(".help item=%s", what); + while (UA_sock->recv() > 0) { + strip_trailing_junk(UA_sock->msg); + match_kw(&preg, UA_sock->msg, UA_sock->msglen, &buf); + } + free_pool_memory(buf); + regfree(&preg); +} + +/* retreive a simple list (.pool, .client) and store it into items */ +void get_items(const char *what) +{ + init_items(); + + UA_sock->fsend("%s", what); + while (UA_sock->recv() > 0) { + strip_trailing_junk(UA_sock->msg); + items->list.append(bstrdup(UA_sock->msg)); + } +} + +typedef enum +{ + ITEM_ARG, /* item with simple list like .jobs */ + ITEM_HELP /* use help item=xxx and detect all arguments */ +} cpl_item_t; + +/* Generator function for command completion. STATE lets us know whether + * to start from scratch; without any state (i.e. STATE == 0), then we + * start at the top of the list. + */ +static char *item_generator(const char *text, int state, + const char *item, cpl_item_t type) +{ + static int list_index, len; + char *name; + + /* If this is a new word to complete, initialize now. This includes + * saving the length of TEXT for efficiency, and initializing the index + * variable to 0. + */ + if (!state) + { + list_index = 0; + len = strlen(text); + switch(type) { + case ITEM_ARG: + get_items(item); + break; + case ITEM_HELP: + get_arguments(item); + break; + } + } + + /* Return the next name which partially matches from the command list. */ + while (items && list_index < items->list.size()) + { + name = (char *)items->list[list_index]; + list_index++; + + if (strncmp(name, text, len) == 0) { + char *ret = (char *) actuallymalloc(strlen(name)+1); + strcpy(ret, name); + return ret; + } + } + + /* If no names matched, then return NULL. */ + return ((char *)NULL); +} + +/* gobal variables for the type and the item to search + * the readline API doesn' permit to pass user data. + */ +static const char *cpl_item; +static cpl_item_t cpl_type; + +static char *cpl_generator(const char *text, int state) +{ + return item_generator(text, state, cpl_item, cpl_type); +} + +/* this function is used to not use the default filename completion */ +static char *dummy_completion_function(const char *text, int state) +{ + return NULL; +} + +struct cpl_keywords_t { + const char *key; + const char *cmd; +}; + +static struct cpl_keywords_t cpl_keywords[] = { + {"pool=", ".pool" }, + {"fileset=", ".fileset" }, + {"client=", ".client" }, + {"job=", ".jobs" }, + {"restore_job=",".jobs type=R" }, + {"level=", ".level" }, + {"storage=", ".storage" }, + {"schedule=", ".schedule" }, + {"volume=", ".media" }, + {"oldvolume=", ".media" }, + {"volstatus=", ".volstatus" }, + {"ls", ".ls" }, + {"cd", ".lsdir" }, + {"mark", ".ls" }, + {"m", ".ls" }, + {"unmark", ".lsmark" }, + {"catalog=", ".catalogs" }, + {"actiononpurge=", ".actiononpurge" }, + {"tags=", ".tags" }, + {"recylepool=", ".pool" }, + {"allfrompool=",".pool" } +}; +#define key_size ((int)(sizeof(cpl_keywords)/sizeof(struct cpl_keywords_t))) + +/* Attempt to complete on the contents of TEXT. START and END bound the + * region of rl_line_buffer that contains the word to complete. TEXT is + * the word to complete. We can use the entire contents of rl_line_buffer + * in case we want to do some simple parsing. Return the array of matches, + * or NULL if there aren't any. + */ +static char **readline_completion(const char *text, int start, int end) +{ + bool found=false; + char **matches; + char *s, *cmd; + matches = (char **)NULL; + + /* If this word is at the start of the line, then it is a command + * to complete. Otherwise it is the name of a file in the current + * directory. + */ + s = get_previous_keyword(start, 0); + cmd = get_first_keyword(); + if (s) { + for (int i=0; i < key_size; i++) { + if (!strcasecmp(s, cpl_keywords[i].key)) { + cpl_item = cpl_keywords[i].cmd; + cpl_type = ITEM_ARG; + matches = rl_completion_matches(text, cpl_generator); + found=true; + break; + } + } + + if (!found) { /* we try to get help with the first command */ + cpl_item = cmd; + cpl_type = ITEM_HELP; + /* we don't want to append " " at the end */ + rl_completion_suppress_append=true; + matches = rl_completion_matches(text, cpl_generator); + } + free(s); + } else { /* nothing on the line, display all commands */ + cpl_item = ".help all"; + cpl_type = ITEM_ARG; + matches = rl_completion_matches(text, cpl_generator); + } + if (cmd) { + free(cmd); + } + return (matches); +} + +static char eol = '\0'; +static int eolcmd(FILE *input, BSOCK *UA_sock) +{ + if ((argc > 1) && (strchr("!$%&'()*+,-/:;<>?[]^`{|}~", argk[1][0]) != NULL)) { + eol = argk[1][0]; + } else if (argc == 1) { + eol = '\0'; + } else { + sendit(_("Illegal separator character.\n")); + } + return 1; +} + +/* + * Return 1 if OK + * 0 if no input + * -1 error (must stop) + */ int get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec) { - char *line; + static char *line = NULL; + static char *next = NULL; + static int do_history = 0; + char *command; + + if (line == NULL) { + do_history = 0; + rl_catch_signals = 0; /* do it ourselves */ + /* Here, readline does ***real*** malloc + * so, be we have to use the real free + */ + line = readline((char *)prompt); /* cast needed for old readlines */ + if (!line) { + return -1; /* error return and exit */ + } + strip_trailing_junk(line); + command = line; + } else if (next) { + command = next + 1; + } else { + sendit(_("Command logic problem\n")); + sock->msglen = 0; + sock->msg[0] = 0; + return 0; /* No input */ + } - rl_catch_signals = 0; /* do it ourselves */ - line = readline((char *)prompt); /* cast needed for old readlines */ + /* + * Split "line" into multiple commands separated by the eol character. + * Each part is pointed to by "next" until finally it becomes null. + */ + if (eol == '\0') { + next = NULL; + } else { + next = strchr(command, eol); + if (next) { + *next = '\0'; + } + } + if (command != line && isatty(fileno(input))) { + senditf("%s%s\n", prompt, command); - if (!line) { - exit(1); + } else { + /* Send the intput to the output file if needed */ + if (teein && output != stdout) { + fputs(prompt, output); + fputs(command, output); + fputs("\n", output); + } } - strip_trailing_junk(line); - sock->msglen = pm_strcpy(&sock->msg, line); + + sock->msglen = pm_strcpy(&sock->msg, command); if (sock->msglen) { - add_history(sock->msg); + do_history++; } - free(line); - return 1; + + if (!next) { + if (do_history) { + add_history(line); + } + actuallyfree(line); /* allocated by readline() malloc */ + line = NULL; + } + return 1; /* OK */ } #else /* no readline, do it ourselves */ -#if !defined(HAVE_WIN32) +#ifdef HAVE_CONIO static bool bisatty(int fd) { if (no_conio) { @@ -383,15 +819,8 @@ wait_for_data(int fd, int sec) #if defined(HAVE_WIN32) return 1; #else - fd_set fdset; - struct timeval tv; - - tv.tv_sec = sec; - tv.tv_usec = 0; for ( ;; ) { - FD_ZERO(&fdset); - FD_SET((unsigned)fd, &fdset); - switch(select(fd + 1, &fdset, NULL, NULL, &tv)) { + switch(fd_wait_data(fd, WAIT_READ, sec, 0)) { case 0: /* timeout */ return 0; case -1: @@ -448,7 +877,7 @@ again: } else #endif - if (fgets(sock->msg, len, input) == NULL) { + if (bfgets(sock->msg, input) == NULL) { return -1; } @@ -459,19 +888,54 @@ again: } strip_trailing_junk(sock->msg); sock->msglen = strlen(sock->msg); + + /* Send input to log file if needed */ + if (teein && output != stdout) { + fputs(sock->msg, output); + fputs("\n", output); + } + return 1; } #endif /* ! HAVE_READLINE */ +/* Routine to return true if user types break */ +int usrbrk() +{ + return brkflg; +} + +/* Clear break flag */ +void clrbrk() +{ + brkflg = 0; +} + +/* Interrupt caught here */ +static void sigintcatcher(int sig) +{ + brkflg++; + if (brkflg > 3) { + terminate_console(sig); + } + signal(SIGINT, sigintcatcher); +} + +/* Trap Ctl-C */ +void trapctlc() +{ + signal(SIGINT, sigintcatcher); +} static int console_update_history(const char *histfile) { int ret=0; #ifdef HAVE_READLINE -/* first, try to truncate the history file, and if it - * fail, the file is probably not present, and we +/* + * first, try to truncate the history file, and if it + * fails, the file is probably not present, and we * can use write_history to create it */ @@ -480,7 +944,6 @@ static int console_update_history(const char *histfile) } else { ret = write_history(histfile); } - #endif return ret; @@ -491,15 +954,141 @@ static int console_init_history(const char *histfile) int ret=0; #ifdef HAVE_READLINE - using_history(); ret = read_history(histfile); - + /* Tell the completer that we want a complete . */ + rl_completion_entry_function = dummy_completion_function; + rl_attempted_completion_function = readline_completion; + rl_filename_completion_desired = 0; + stifle_history(100); #endif return ret; } +static bool select_director(const char *director, const char *console, + DIRRES **ret_dir, CONRES **ret_cons) +{ + int numcon=0, numdir=0; + int i=0, item=0; + BSOCK *UA_sock; + DIRRES *dir = NULL; + CONRES *cons = NULL; + + *ret_cons = NULL; + *ret_dir = NULL; + + LockRes(); + numdir = 0; + foreach_res(dir, R_DIRECTOR) { + numdir++; + } + numcon = 0; + foreach_res(cons, R_CONSOLE) { + numcon++; + } + UnlockRes(); + + if (numdir == 1) { /* No choose */ + dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL); + } + + if (director) { /* Command line choice overwrite the no choose option */ + LockRes(); + foreach_res(dir, R_DIRECTOR) { + if (bstrcasecmp(dir->hdr.name, director)) { + break; + } + } + UnlockRes(); + if (!dir) { /* Can't find Director used as argument */ + senditf(_("Can't find %s in Director list\n"), director); + return 0; + } + } + + if (dir == NULL) { /* prompt for director */ + UA_sock = new_bsock(); +try_again: + sendit(_("Available Directors:\n")); + LockRes(); + numdir = 0; + foreach_res(dir, R_DIRECTOR) { + senditf( _("%2d: %s at %s:%d\n"), 1+numdir++, dir->hdr.name, + dir->address, dir->DIRport); + } + UnlockRes(); + if (get_cmd(stdin, _("Select Director by entering a number: "), + UA_sock, 600) < 0) + { + (void)WSACleanup(); /* Cleanup Windows sockets */ + return 0; + } + if (!is_a_number(UA_sock->msg)) { + senditf(_("%s is not a number. You must enter a number between " + "1 and %d\n"), + UA_sock->msg, numdir); + goto try_again; + } + item = atoi(UA_sock->msg); + if (item < 0 || item > numdir) { + senditf(_("You must enter a number between 1 and %d\n"), numdir); + goto try_again; + } + free_bsock(UA_sock); + LockRes(); + for (i=0; ihdr.name, console) == 0) { + break; + } + } else if (cons->director && strcasecmp(cons->director, dir->hdr.name) == 0) { + break; + } + if (i == (numcon - 1)) { + cons = NULL; + } + } + + if (cons == NULL && console != NULL) { + UnlockRes(); + senditf(_("Can't find %s in Console list\n"), console); + return 0; + } + + /* Look for the first non-linked console */ + if (cons == NULL) { + for (i=0; idirector == NULL) { + break; + } + if (i == (numcon - 1)) { + cons = NULL; + } + } + } + + /* If no console, take first one */ + if (!cons) { + cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL); + } + UnlockRes(); + + *ret_dir = dir; + *ret_cons = cons; + + return 1; +} + /********************************************************************* * * Main Bacula Console -- User Interface Program @@ -507,7 +1096,10 @@ static int console_init_history(const char *histfile) */ int main(int argc, char *argv[]) { - int ch, i, item; + int ch; + char *director = NULL; + char *console = NULL; + bool list_directors=false, list_consoles=false; bool no_signals = false; bool test_config = false; JCR jcr; @@ -518,13 +1110,38 @@ int main(int argc, char *argv[]) textdomain("bacula"); init_stack_dump(); + lmgr_init_thread(); my_name_is(argc, argv, "bconsole"); init_msg(NULL, NULL); working_directory = "/tmp"; args = get_pool_memory(PM_FNAME); - while ((ch = getopt(argc, argv, "bc:d:nst?")) != -1) { + while ((ch = getopt(argc, argv, "D:lc:d:nstu:?C:L")) != -1) { switch (ch) { + case 'D': /* Director */ + if (director) { + free(director); + } + director = bstrdup(optarg); + break; + + case 'C': /* Console */ + if (console) { + free(console); + } + console = bstrdup(optarg); + break; + + case 'L': /* Console */ + list_consoles = true; + test_config = true; + break; + + case 'l': + list_directors = true; + test_config = true; + break; + case 'c': /* configuration file */ if (configfile != NULL) { free(configfile); @@ -555,6 +1172,10 @@ int main(int argc, char *argv[]) test_config = true; break; + case 'u': + timeout = atoi(optarg); + break; + case '?': default: usage(); @@ -590,7 +1211,8 @@ int main(int argc, char *argv[]) configfile = bstrdup(CONFIG_FILE); } - parse_config(configfile); + config = New(CONFIG()); + parse_cons_config(config, configfile, M_ERROR_TERM); if (init_crypto() != 0) { Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n")); @@ -604,6 +1226,22 @@ int main(int argc, char *argv[]) con_init(stdin); } + if (list_directors) { + LockRes(); + foreach_res(dir, R_DIRECTOR) { + senditf("%s\n", dir->hdr.name); + } + UnlockRes(); + } + + if (list_consoles) { + LockRes(); + foreach_res(cons, R_CONSOLE) { + senditf("%s\n", cons->hdr.name); + } + UnlockRes(); + } + if (test_config) { terminate_console(0); exit(0); @@ -613,79 +1251,11 @@ int main(int argc, char *argv[]) (void)WSA_Init(); /* Initialize Windows sockets */ - LockRes(); - numdir = 0; - foreach_res(dir, R_DIRECTOR) { - numdir++; - } - numcon = 0; - foreach_res(cons, R_CONSOLE) { - numcon++; - } - UnlockRes(); + start_watchdog(); /* Start socket watchdog */ - if (numdir > 1) { - struct sockaddr client_addr; - memset(&client_addr, 0, sizeof(client_addr)); - UA_sock = init_bsock(NULL, 0, "", "", 0, &client_addr); -try_again: - sendit(_("Available Directors:\n")); - LockRes(); - numdir = 0; - foreach_res(dir, R_DIRECTOR) { - senditf( _("%2d: %s at %s:%d\n"), 1+numdir++, dir->hdr.name, dir->address, - dir->DIRport); - } - UnlockRes(); - if (get_cmd(stdin, _("Select Director by entering a number: "), UA_sock, 600) < 0) { - (void)WSACleanup(); /* Cleanup Windows sockets */ - return 1; - } - if (!is_a_number(UA_sock->msg)) { - senditf(_("%s is not a number. You must enter a number between 1 and %d\n"), - UA_sock->msg, numdir); - goto try_again; - } - item = atoi(UA_sock->msg); - if (item < 0 || item > numdir) { - senditf(_("You must enter a number between 1 and %d\n"), numdir); - goto try_again; - } - term_bsock(UA_sock); - LockRes(); - for (i=0; idirector && strcmp(cons->director, dir->hdr.name) == 0) { - break; - } - cons = NULL; - } - /* Look for the first non-linked console */ - if (cons == NULL) { - for (i=0; idirector == NULL) - break; - cons = NULL; - } - } - UnlockRes(); - } - /* If no director, take first one */ - if (!dir) { - LockRes(); - dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL); - UnlockRes(); - } - /* If no console, take first one */ - if (!cons) { - LockRes(); - cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL); - UnlockRes(); + if (!select_director(director, console, &dir, &cons)) { + terminate_console(0); + return 1; } senditf(_("Connecting to Director %s:%d\n"), dir->address,dir->DIRport); @@ -698,7 +1268,7 @@ try_again: /* Initialize TLS context: * Args: CA certfile, CA certdir, Certfile, Keyfile, - * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer + * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */ cons->tls_ctx = new_tls_context(cons->tls_ca_certfile, cons->tls_ca_certdir, cons->tls_certfile, @@ -739,16 +1309,20 @@ try_again: } else { heart_beat = 0; } - UA_sock = bnet_connect(NULL, 5, 15, heart_beat, "Director daemon", dir->address, - NULL, dir->DIRport, 0); - if (UA_sock == NULL) { + if (!UA_sock) { + UA_sock = new_bsock(); + } + if (!UA_sock->connect(NULL, 5, 15, heart_beat, "Director daemon", dir->address, + NULL, dir->DIRport, 0)) { + UA_sock->destroy(); + UA_sock = NULL; terminate_console(0); return 1; } jcr.dir_bsock = UA_sock; /* If cons==NULL, default console will be used */ - if (!authenticate_director(&jcr, dir, cons)) { + if (!authenticate_director(UA_sock, dir, cons)) { terminate_console(0); return 1; } @@ -802,12 +1376,24 @@ static void terminate_console(int sig) exit(1); } already_here = true; + stop_watchdog(); + delete(config); + config = NULL; cleanup_crypto(); + free(res_head); + res_head = NULL; free_pool_memory(args); +#if defined(HAVE_CONIO) if (!no_conio) { con_term(); } +#elif defined(HAVE_READLINE) + rl_cleanup_after_signal(); +#else /* !HAVE_CONIO && !HAVE_READLINE */ +#endif (void)WSACleanup(); /* Cleanup Windows sockets */ + lmgr_cleanup_main(); + if (sig != 0) { exit(1); } @@ -850,7 +1436,7 @@ static int check_resources() OK = false; } } - + if (numdir == 0) { Emsg1(M_FATAL, 0, _("No Director resource defined in %s\n" "Without that I don't how to speak to the Director :-(\n"), configfile); @@ -884,6 +1470,7 @@ static int check_resources() return OK; } +/* @version */ static int versioncmd(FILE *input, BSOCK *UA_sock) { senditf("Version: " VERSION " (" BDATE ") %s %s %s\n", @@ -891,6 +1478,7 @@ static int versioncmd(FILE *input, BSOCK *UA_sock) return 1; } +/* @input */ static int inputcmd(FILE *input, BSOCK *UA_sock) { FILE *fd; @@ -915,17 +1503,30 @@ static int inputcmd(FILE *input, BSOCK *UA_sock) return 1; } -/* Send output to both termina and specified file */ +/* @tall */ +/* Send input/output to both terminal and specified file */ +static int teeallcmd(FILE *input, BSOCK *UA_sock) +{ + teeout = true; + teein = true; + return do_outputcmd(input, UA_sock); +} + +/* @tee */ +/* Send output to both terminal and specified file */ static int teecmd(FILE *input, BSOCK *UA_sock) { teeout = true; + teein = false; return do_outputcmd(input, UA_sock); } +/* @output */ /* Send output to specified "file" */ static int outputcmd(FILE *input, BSOCK *UA_sock) { teeout = false; + teein = false; return do_outputcmd(input, UA_sock); } @@ -944,6 +1545,7 @@ static int do_outputcmd(FILE *input, BSOCK *UA_sock) fclose(output); output = stdout; teeout = false; + teein = false; } return 1; } @@ -962,7 +1564,7 @@ static int do_outputcmd(FILE *input, BSOCK *UA_sock) } /* - * exec "some-command" [wait-seconds] + * @exec "some-command" [wait-seconds] */ static int execcmd(FILE *input, BSOCK *UA_sock) { @@ -970,22 +1572,37 @@ static int execcmd(FILE *input, BSOCK *UA_sock) char line[5000]; int stat; int wait = 0; + char *cmd; if (argc > 3) { sendit(_("Too many arguments. Enclose command in double quotes.\n")); return 1; } + + /* old syntax */ if (argc == 3) { wait = atoi(argk[2]); } - bpipe = open_bpipe(argk[1], wait, "r"); + cmd = argk[1]; + + /* handle cmd=XXXX and wait=XXXX */ + for (int i=1; irfd)) { senditf("%s", line); } @@ -993,27 +1610,39 @@ static int execcmd(FILE *input, BSOCK *UA_sock) if (stat != 0) { berrno be; be.set_errno(stat); - senditf(_("Autochanger error: ERR=%s\n"), be.bstrerror()); + senditf(_("@exec error: ERR=%s\n"), be.bstrerror()); } return 1; } - +/* @echo xxx yyy */ static int echocmd(FILE *input, BSOCK *UA_sock) { for (int i=1; i < argc; i++) { - senditf("%s", argk[i]); - sendit(" "); + senditf("%s ", argk[i]); } sendit("\n"); return 1; } +/* @quit */ static int quitcmd(FILE *input, BSOCK *UA_sock) { return 0; } +/* @help */ +static int helpcmd(FILE *input, BSOCK *UA_sock) +{ + int i; + for (i=0; i 1) { @@ -1022,7 +1651,60 @@ static int sleepcmd(FILE *input, BSOCK *UA_sock) return 1; } +/* @putfile key /path/to/file + * + * The Key parameter is needed to use the file on the director side. + */ +static int putfilecmd(FILE *input, BSOCK *UA_sock) +{ + int i = 0; + const char *key = "putfile"; + const char *fname; + FILE *fp; + + if (argc != 3) { + sendit("Usage: @putfile key file\n"); + return 1; + } + + key = argk[1]; + fname = argk[2]; + + if (!key || !fname) { + senditf("Syntax error in @putfile command\n"); + return 1; + } + + fp = fopen(fname, "r"); + if (!fp) { + berrno be; + senditf("Unable to open %s. ERR=%s\n", fname, be.bstrerror(errno)); + return 1; + } + + UA_sock->fsend(".putfile key=\"%s\"", key); + + /* Just read the file and send it to the director */ + while (!feof(fp)) { + i = fread(UA_sock->msg, 1, sizeof_pool_memory(UA_sock->msg) - 1, fp); + if (i > 0) { + UA_sock->msg[i] = 0; + UA_sock->msglen = i; + UA_sock->send(); + } + } + + UA_sock->signal(BNET_EOD); + fclose(fp); + + /* Get the file name associated */ + while (UA_sock->recv() > 0) { + senditf("%s", UA_sock->msg); + } + return 1; +} +/* @time */ static int timecmd(FILE *input, BSOCK *UA_sock) { char sdt[50];