X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_cmds.c;h=7ae9ae8bae8b66d33047526faf638aa5f4a3761a;hb=4e502c79e55a6e7de8f9109e96322481d189acd9;hp=90b44cce687ee33309495bd0bcb516dc1c2ff28f;hpb=b17f2a2f67354c18b7e82fd69d21b0a3bc586b03;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 90b44cce68..7ae9ae8bae 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2008 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 Kern Sibbald. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* * * Bacula Director -- User Agent Commands @@ -6,144 +33,144 @@ * * Version $Id$ */ -/* - Copyright (C) 2000-2006 Kern Sibbald + +#include "bacula.h" +#include "dird.h" - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. +#ifdef HAVE_PYTHON - 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 - the file LICENSE for additional details. +#undef _POSIX_C_SOURCE +#include - */ +#include "lib/pythonlib.h" -#include "bacula.h" -#include "dird.h" +/* Imported Functions */ +extern PyObject *job_getattr(PyObject *self, char *attrname); +extern int job_setattr(PyObject *self, char *attrname, PyObject *value); + +#endif /* HAVE_PYTHON */ /* Imported subroutines */ /* Imported variables */ -extern int r_first; -extern int r_last; -extern struct s_res resources[]; extern jobq_t job_queue; /* job queue */ /* Imported functions */ -extern int status_cmd(UAContext *ua, const char *cmd); +extern int autodisplay_cmd(UAContext *ua, const char *cmd); +extern int gui_cmd(UAContext *ua, const char *cmd); +extern int label_cmd(UAContext *ua, const char *cmd); extern int list_cmd(UAContext *ua, const char *cmd); extern int llist_cmd(UAContext *ua, const char *cmd); -extern int show_cmd(UAContext *ua, const char *cmd); extern int messagescmd(UAContext *ua, const char *cmd); -extern int autodisplay_cmd(UAContext *ua, const char *cmd); -extern int gui_cmd(UAContext *ua, const char *cmd); -extern int sqlquerycmd(UAContext *ua, const char *cmd); -extern int querycmd(UAContext *ua, const char *cmd); -extern int retentioncmd(UAContext *ua, const char *cmd); extern int prunecmd(UAContext *ua, const char *cmd); extern int purgecmd(UAContext *ua, const char *cmd); -extern int restore_cmd(UAContext *ua, const char *cmd); -extern int label_cmd(UAContext *ua, const char *cmd); +extern int querycmd(UAContext *ua, const char *cmd); extern int relabel_cmd(UAContext *ua, const char *cmd); +extern int restore_cmd(UAContext *ua, const char *cmd); +extern int retentioncmd(UAContext *ua, const char *cmd); +extern int show_cmd(UAContext *ua, const char *cmd); +extern int sqlquerycmd(UAContext *ua, const char *cmd); +extern int status_cmd(UAContext *ua, const char *cmd); extern int update_cmd(UAContext *ua, const char *cmd); /* Forward referenced functions */ static int add_cmd(UAContext *ua, const char *cmd); -static int create_cmd(UAContext *ua, const char *cmd); +static int automount_cmd(UAContext *ua, const char *cmd); static int cancel_cmd(UAContext *ua, const char *cmd); -static int enable_cmd(UAContext *ua, const char *cmd); +static int create_cmd(UAContext *ua, const char *cmd); +static int delete_cmd(UAContext *ua, const char *cmd); static int disable_cmd(UAContext *ua, const char *cmd); -static int setdebug_cmd(UAContext *ua, const char *cmd); -static int trace_cmd(UAContext *ua, const char *cmd); -static int var_cmd(UAContext *ua, const char *cmd); +static int enable_cmd(UAContext *ua, const char *cmd); static int estimate_cmd(UAContext *ua, const char *cmd); static int help_cmd(UAContext *ua, const char *cmd); -static int delete_cmd(UAContext *ua, const char *cmd); -static int use_cmd(UAContext *ua, const char *cmd); -static int unmount_cmd(UAContext *ua, const char *cmd); -static int version_cmd(UAContext *ua, const char *cmd); -static int automount_cmd(UAContext *ua, const char *cmd); -static int time_cmd(UAContext *ua, const char *cmd); -static int reload_cmd(UAContext *ua, const char *cmd); -static int delete_volume(UAContext *ua); -static int delete_pool(UAContext *ua); -static void delete_job(UAContext *ua); +static int memory_cmd(UAContext *ua, const char *cmd); static int mount_cmd(UAContext *ua, const char *cmd); +static int python_cmd(UAContext *ua, const char *cmd); static int release_cmd(UAContext *ua, const char *cmd); -static int wait_cmd(UAContext *ua, const char *cmd); +static int reload_cmd(UAContext *ua, const char *cmd); +static int setdebug_cmd(UAContext *ua, const char *cmd); static int setip_cmd(UAContext *ua, const char *cmd); -static int python_cmd(UAContext *ua, const char *cmd); +static int time_cmd(UAContext *ua, const char *cmd); +static int trace_cmd(UAContext *ua, const char *cmd); +static int unmount_cmd(UAContext *ua, const char *cmd); +static int use_cmd(UAContext *ua, const char *cmd); +static int var_cmd(UAContext *ua, const char *cmd); +static int version_cmd(UAContext *ua, const char *cmd); +static int wait_cmd(UAContext *ua, const char *cmd); + static void do_job_delete(UAContext *ua, JobId_t JobId); static void delete_job_id_range(UAContext *ua, char *tok); +static int delete_volume(UAContext *ua); +static int delete_pool(UAContext *ua); +static void delete_job(UAContext *ua); int qhelp_cmd(UAContext *ua, const char *cmd); int quit_cmd(UAContext *ua, const char *cmd); -struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; }; -static struct cmdstruct commands[] = { - { NT_("add"), add_cmd, _("add media to a pool")}, - { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")}, - { NT_("automount"), automount_cmd, _("automount [on|off] -- after label")}, - { NT_("cancel"), cancel_cmd, _("cancel [ | ] -- cancel a job")}, - { NT_("create"), create_cmd, _("create DB Pool from resource")}, - { NT_("delete"), delete_cmd, _("delete [pool= | media volume=]")}, - { NT_("disable"), disable_cmd, _("disable -- disable a job")}, - { NT_("enable"), enable_cmd, _("enable -- enable a job")}, - { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")}, - { NT_("exit"), quit_cmd, _("exit = quit")}, - { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode")}, - { NT_("help"), help_cmd, _("print this command")}, - { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files ]; from catalog")}, - { NT_("label"), label_cmd, _("label a tape")}, - { NT_("llist"), llist_cmd, _("full or long list like list command")}, - { NT_("messages"), messagescmd, _("messages")}, - { NT_("mount"), mount_cmd, _("mount ")}, - { NT_("prune"), prunecmd, _("prune expired records from catalog")}, - { NT_("purge"), purgecmd, _("purge records from catalog")}, - { NT_("python"), python_cmd, _("python control commands")}, - { NT_("quit"), quit_cmd, _("quit")}, - { NT_("query"), querycmd, _("query catalog")}, - { NT_("restore"), restore_cmd, _("restore files")}, - { NT_("relabel"), relabel_cmd, _("relabel a tape")}, - { NT_("release"), release_cmd, _("release ")}, - { NT_("reload"), reload_cmd, _("reload conf file")}, - { NT_("run"), run_cmd, _("run ")}, - { NT_("status"), status_cmd, _("status [storage | client]=")}, - { NT_("setdebug"), setdebug_cmd, _("sets debug level")}, - { NT_("setip"), setip_cmd, _("sets new client address -- if authorized")}, - { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")}, - { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")}, - { NT_("time"), time_cmd, _("print current time")}, - { NT_("trace"), trace_cmd, _("turn on/off trace to file")}, - { NT_("unmount"), unmount_cmd, _("unmount ")}, - { NT_("umount"), unmount_cmd, _("umount for old-time Unix guys")}, - { NT_("update"), update_cmd, _("update Volume, Pool or slots")}, - { NT_("use"), use_cmd, _("use catalog xxx")}, - { NT_("var"), var_cmd, _("does variable expansion")}, - { NT_("version"), version_cmd, _("print Director version")}, - { NT_("wait"), wait_cmd, _("wait until no jobs are running [ | | ]")}, +struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; const bool use_in_rs;}; +static struct cmdstruct commands[] = { /* Can use it in Console RunScript*/ + { NT_("add"), add_cmd, _("add media to a pool"), false}, + { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages"),false}, + { NT_("automount"), automount_cmd, _("automount [on|off] -- after label"), false}, + { NT_("cancel"), cancel_cmd, _("cancel [ | ] -- cancel a job"), false}, + { NT_("create"), create_cmd, _("create DB Pool from resource"), false}, + { NT_("delete"), delete_cmd, _("delete [pool= | media volume=]"), true}, + { NT_("disable"), disable_cmd, _("disable -- disable a job"), true}, + { NT_("enable"), enable_cmd, _("enable -- enable a job"), true}, + { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing"), true}, + { NT_("exit"), quit_cmd, _("exit = quit"), false}, + { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode"), false}, + { NT_("help"), help_cmd, _("print this command"), false}, + { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files ]; from catalog"), true}, + { NT_("label"), label_cmd, _("label a tape"), false}, + { NT_("llist"), llist_cmd, _("full or long list like list command"), true}, + { NT_("messages"), messagescmd, _("messages"), false}, + { NT_("memory"), memory_cmd, _("print current memory usage"), true}, + { NT_("mount"), mount_cmd, _("mount "), false}, + { NT_("prune"), prunecmd, _("prune expired records from catalog"), true}, + { NT_("purge"), purgecmd, _("purge records from catalog"), true}, + { NT_("python"), python_cmd, _("python control commands"), false}, + { NT_("quit"), quit_cmd, _("quit"), false}, + { NT_("query"), querycmd, _("query catalog"), false}, + { NT_("restore"), restore_cmd, _("restore files"), false}, + { NT_("relabel"), relabel_cmd, _("relabel a tape"), false}, + { NT_("release"), release_cmd, _("release "), false}, + { NT_("reload"), reload_cmd, _("reload conf file"), true}, + { NT_("run"), run_cmd, _("run "), false}, /* need to be check */ + { NT_("status"), status_cmd, _("status [storage | client]="), true}, + { NT_("setdebug"), setdebug_cmd, _("sets debug level"), true}, + { NT_("setip"), setip_cmd, _("sets new client address -- if authorized"), false}, + { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]"), true}, + { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog"), false}, + { NT_("time"), time_cmd, _("print current time"), true}, + { NT_("trace"), trace_cmd, _("turn on/off trace to file"), true}, + { NT_("unmount"), unmount_cmd, _("unmount "), false}, + { NT_("umount"), unmount_cmd, _("umount for old-time Unix guys"),false}, + { NT_("update"), update_cmd, _("update Volume, Pool or slots"), true}, + { NT_("use"), use_cmd, _("use catalog xxx"), false}, + { NT_("var"), var_cmd, _("does variable expansion"), false}, + { NT_("version"), version_cmd, _("print Director version"), true}, + { NT_("wait"), wait_cmd, _("wait until no jobs are running [ | | ]"), false}, }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct)) /* * Execute a command from the UA */ -int do_a_command(UAContext *ua, const char *cmd) +bool do_a_command(UAContext *ua) { unsigned int i; - int len, stat; + int len; + bool ok = false; bool found = false; + BSOCK *user = ua->UA_sock; - stat = 1; - Dmsg1(900, "Command: %s\n", ua->UA_sock->msg); + Dmsg1(900, "Command: %s\n", ua->argk[0]); if (ua->argc == 0) { - return 1; + return false; } while (ua->jcr->wstorage->size()) { @@ -158,15 +185,23 @@ int do_a_command(UAContext *ua, const char *cmd) !acl_access_ok(ua, Command_ACL, ua->argk[0], len)) { break; } - stat = (*commands[i].func)(ua, cmd); /* go execute command */ + /* Check if this command is authorized in RunScript */ + if (ua->runscript && !commands[i].use_in_rs) { + ua->error_msg(_("Can't use %s command in a runscript"), ua->argk[0]); + break; + } + if (ua->api) user->signal(BNET_CMD_BEGIN); + ok = (*commands[i].func)(ua, ua->cmd); /* go execute command */ found = true; break; } } if (!found) { - bnet_fsend(ua->UA_sock, _("%s: is an illegal command.\n"), ua->argk[0]); + ua->error_msg(_("%s: is an invalid command.\n"), ua->argk[0]); + ok = false; } - return stat; + if (ua->api) user->signal(ok?BNET_CMD_OK:BNET_CMD_FAILED); + return ok; } /* @@ -181,6 +216,7 @@ void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr) mr->Recycle = pr->Recycle; mr->VolRetention = pr->VolRetention; mr->VolUseDuration = pr->VolUseDuration; + mr->RecyclePoolId = pr->RecyclePoolId; mr->MaxVolJobs = pr->MaxVolJobs; mr->MaxVolFiles = pr->MaxVolFiles; mr->MaxVolBytes = pr->MaxVolBytes; @@ -202,12 +238,12 @@ static int add_cmd(UAContext *ua, const char *cmd) STORE *store; int Slot = 0, InChanger = 0; - bsendmsg(ua, _( + ua->send_msg(_( "You probably don't want to be using this command since it\n" "creates database records without labeling the Volumes.\n" "You probably want to use the \"label\" command.\n\n")); - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } @@ -222,13 +258,11 @@ static int add_cmd(UAContext *ua, const char *cmd) pr.MaxVols, pr.PoolType); while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) { - bsendmsg(ua, _("Pool already has maximum volumes=%d\n"), pr.MaxVols); - for (;;) { - if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) { - return 1; - } - pr.MaxVols = ua->pint32_val; + ua->warning_msg(_("Pool already has maximum volumes=%d\n"), pr.MaxVols); + if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) { + return 1; } + pr.MaxVols = ua->pint32_val; } /* Get media type */ @@ -251,32 +285,35 @@ static int add_cmd(UAContext *ua, const char *cmd) } num = ua->pint32_val; if (num < 0 || num > max) { - bsendmsg(ua, _("The number must be between 0 and %d\n"), max); + ua->warning_msg(_("The number must be between 0 and %d\n"), max); continue; } break; } -getVolName: - if (num == 0) { - if (!get_cmd(ua, _("Enter Volume name: "))) { - return 1; + + for (;;) { + if (num == 0) { + if (!get_cmd(ua, _("Enter Volume name: "))) { + return 1; + } + } else { + if (!get_cmd(ua, _("Enter base volume name: "))) { + return 1; + } } - } else { - if (!get_cmd(ua, _("Enter base volume name: "))) { - return 1; + /* Don't allow | in Volume name because it is the volume separator character */ + if (!is_volume_name_legal(ua, ua->cmd)) { + continue; } - } - /* Don't allow | in Volume name because it is the volume separator character */ - if (!is_volume_name_legal(ua, ua->cmd)) { - goto getVolName; - } - if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) { - bsendmsg(ua, _("Volume name too long.\n")); - goto getVolName; - } - if (strlen(ua->cmd) == 0) { - bsendmsg(ua, _("Volume name must be at least one character long.\n")); - goto getVolName; + if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) { + ua->warning_msg(_("Volume name too long.\n")); + continue; + } + if (strlen(ua->cmd) == 0) { + ua->warning_msg(_("Volume name must be at least one character long.\n")); + continue; + } + break; } bstrncpy(name, ua->cmd, sizeof(name)); @@ -289,7 +326,7 @@ getVolName: } startnum = ua->pint32_val; if (startnum < 1) { - bsendmsg(ua, _("Start number must be greater than zero.\n")); + ua->warning_msg(_("Start number must be greater than zero.\n")); continue; } break; @@ -319,7 +356,7 @@ getVolName: mr.Enabled = 1; Dmsg1(200, "Create Volume %s\n", mr.VolumeName); if (!db_create_media_record(ua->jcr, ua->db, &mr)) { - bsendmsg(ua, "%s", db_strerror(ua->db)); + ua->error_msg("%s", db_strerror(ua->db)); return 1; } if (i == startnum) { @@ -329,10 +366,10 @@ getVolName: pr.NumVols += num; Dmsg0(200, "Update pool record.\n"); if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) { - bsendmsg(ua, "%s", db_strerror(ua->db)); + ua->warning_msg("%s", db_strerror(ua->db)); return 1; } - bsendmsg(ua, _("%d Volumes created in pool %s\n"), num, pr.Name); + ua->send_msg(_("%d Volumes created in pool %s\n"), num, pr.Name); return 1; } @@ -371,10 +408,6 @@ static int cancel_cmd(UAContext *ua, const char *cmd) JCR *jcr = NULL; char JobName[MAX_NAME_LENGTH]; - if (!open_db(ua)) { - return 1; - } - for (i=1; iargc; i++) { if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) { uint32_t JobId; @@ -383,7 +416,7 @@ static int cancel_cmd(UAContext *ua, const char *cmd) } JobId = str_to_int64(ua->argv[i]); if (!(jcr=get_jcr_by_id(JobId))) { - bsendmsg(ua, _("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]); + ua->error_msg(_("JobId %s is not running. Use Job name to cancel inactive jobs.\n"), ua->argv[i]); return 1; } break; @@ -392,7 +425,7 @@ static int cancel_cmd(UAContext *ua, const char *cmd) break; } if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) { - bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]); + ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]); jcr = new_jcr(sizeof(JCR), dird_free_jcr); bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job)); } @@ -402,7 +435,7 @@ static int cancel_cmd(UAContext *ua, const char *cmd) break; } if (!(jcr=get_jcr_by_full_name(ua->argv[i]))) { - bsendmsg(ua, _("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]); + ua->warning_msg(_("Warning Job %s is not running. Continuing anyway ...\n"), ua->argv[i]); jcr = new_jcr(sizeof(JCR), dird_free_jcr); bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job)); } @@ -410,30 +443,49 @@ static int cancel_cmd(UAContext *ua, const char *cmd) } } - /* If we still do not have a jcr, - * throw up a list and ask the user to select one. - */ - if (!jcr) { + if (jcr) { + if (jcr->job && !acl_access_ok(ua, Job_ACL, jcr->job->name())) { + ua->error_msg(_("Unauthorized command from this console.\n")); + return 1; + } + } else { + /* + * If we still do not have a jcr, + * throw up a list and ask the user to select one. + */ char buf[1000]; + int tjobs = 0; /* total # number jobs */ /* Count Jobs running */ foreach_jcr(jcr) { if (jcr->JobId == 0) { /* this is us */ continue; } - njobs++; + tjobs++; /* count of all jobs */ + if (!acl_access_ok(ua, Job_ACL, jcr->job->name())) { + continue; /* skip not authorized */ + } + njobs++; /* count of authorized jobs */ } endeach_jcr(jcr); - if (njobs == 0) { - bsendmsg(ua, _("No Jobs running.\n")); + if (njobs == 0) { /* no authorized */ + if (tjobs == 0) { + ua->send_msg(_("No Jobs running.\n")); + } else { + ua->send_msg(_("None of your jobs are running.\n")); + } return 1; } + start_prompt(ua, _("Select Job:\n")); foreach_jcr(jcr) { char ed1[50]; if (jcr->JobId == 0) { /* this is us */ continue; } + if (!acl_access_ok(ua, Job_ACL, jcr->job->name())) { + continue; /* skip not authorized */ + } bsnprintf(buf, sizeof(buf), _("JobId=%s Job=%s"), edit_int64(jcr->JobId, ed1), jcr->Job); add_prompt(ua, buf); } @@ -442,15 +494,24 @@ static int cancel_cmd(UAContext *ua, const char *cmd) if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), buf, sizeof(buf)) < 0) { return 1; } - if (njobs == 1) { - if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) { + if (ua->api && njobs == 1) { + char nbuf[1000]; + bsnprintf(nbuf, sizeof(nbuf), _("Cancel: %s\n\n%s"), buf, + _("Confirm cancel?")); + if (!get_yesno(ua, nbuf) || ua->pint32_val == 0) { return 1; } + } else { + if (njobs == 1) { + if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) { + return 1; + } + } } sscanf(buf, "JobId=%d Job=%127s", &njobs, JobName); jcr = get_jcr_by_full_name(JobName); if (!jcr) { - bsendmsg(ua, _("Job %s not found.\n"), JobName); + ua->warning_msg(_("Job \"%s\" not found.\n"), JobName); return 1; } } @@ -466,6 +527,10 @@ static int cancel_cmd(UAContext *ua, const char *cmd) * the setting of MaxVols and NumVols slightly differently * depending on if we are creating the Pool or we are * simply bringing it into agreement with the resource (updage). + * + * Caution : RecyclePoolId isn't setup in this function. + * You can use set_pooldbr_recyclepoolid(); + * */ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) { @@ -499,6 +564,62 @@ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) } } +/* set/update Pool.RecyclePoolId in Catalog */ +int update_pool_recyclepool(JCR *jcr, B_DB *db, POOL *pool) +{ + POOL_DBR pr; + + if (!pool->RecyclePool) { + return 1; + } + + memset(&pr, 0, sizeof(POOL_DBR)); + bstrncpy(pr.Name, pool->name(), sizeof(pr.Name)); + + if (!db_get_pool_record(jcr, db, &pr)) { + return -1; /* not exists in database */ + } + + set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE); + + if (!set_pooldbr_recyclepoolid(jcr, db, &pr, pool)) { + return -1; /* error */ + } + + if (!db_update_pool_record(jcr, db, &pr)) { + return -1; /* error */ + } + return 1; +} + +/* set POOL_DBR.RecyclePoolId from Pool resource + * works with set_pooldbr_from_poolres + */ +bool set_pooldbr_recyclepoolid(JCR *jcr, B_DB *db, POOL_DBR *pr, POOL *pool) +{ + POOL_DBR rpool; + bool ret = true; + + if (pool->RecyclePool) { + memset(&rpool, 0, sizeof(POOL_DBR)); + + bstrncpy(rpool.Name, pool->RecyclePool->name(), sizeof(rpool.Name)); + if (db_get_pool_record(jcr, db, &rpool)) { + pr->RecyclePoolId = rpool.PoolId; + } else { + Jmsg(jcr, M_WARNING, 0, + _("Can't set %s RecyclePool to %s, %s is not in database.\n" \ + "Try to update it with 'update pool=%s'\n"), + pool->name(), rpool.Name, rpool.Name,pool->name()); + + ret = false; + } + } else { /* no RecyclePool used, set it to 0 */ + pr->RecyclePoolId = 0; + } + return ret; +} + /* * Create a pool record from a given Pool resource @@ -514,7 +635,7 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) memset(&pr, 0, sizeof(POOL_DBR)); - bstrncpy(pr.Name, pool->hdr.name, sizeof(pr.Name)); + bstrncpy(pr.Name, pool->name(), sizeof(pr.Name)); if (db_get_pool_record(jcr, db, &pr)) { /* Pool Exists */ @@ -543,7 +664,7 @@ static int create_cmd(UAContext *ua, const char *cmd) { POOL *pool; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } @@ -554,23 +675,24 @@ static int create_cmd(UAContext *ua, const char *cmd) switch (create_pool(ua->jcr, ua->db, pool, POOL_OP_CREATE)) { case 0: - bsendmsg(ua, _("Error: Pool %s already exists.\n" - "Use update to change it.\n"), pool->hdr.name); + ua->error_msg(_("Error: Pool %s already exists.\n" + "Use update to change it.\n"), pool->name()); break; case -1: - bsendmsg(ua, "%s", db_strerror(ua->db)); + ua->error_msg("%s", db_strerror(ua->db)); break; default: break; } - bsendmsg(ua, _("Pool %s created.\n"), pool->hdr.name); + ua->send_msg(_("Pool %s created.\n"), pool->name()); return 1; } extern DIRRES *director; +extern char *configfile; /* * Python control command @@ -578,14 +700,29 @@ extern DIRRES *director; */ static int python_cmd(UAContext *ua, const char *cmd) { - if (ua->argc >= 1 && strcasecmp(ua->argk[1], NT_("restart")) == 0) { +#ifdef HAVE_PYTHON + init_python_interpreter_args python_args; + + if (ua->argc >= 2 && strcasecmp(ua->argk[1], NT_("restart")) == 0) { term_python_interpreter(); - init_python_interpreter(director->hdr.name, - director->scripts_directory, "DirStartUp"); - bsendmsg(ua, _("Python interpreter restarted.\n")); + + python_args.progname = director->name(); + python_args.scriptdir = director->scripts_directory; + python_args.modulename = "DirStartUp"; + python_args.configfile = configfile; + python_args.workingdir = director->working_directory; + python_args.job_getattr = job_getattr; + python_args.job_setattr = job_setattr; + + init_python_interpreter(&python_args); + + ua->send_msg(_("Python interpreter restarted.\n")); } else { - bsendmsg(ua, _("Nothing done.\n")); +#endif /* HAVE_PYTHON */ + ua->warning_msg(_("Nothing done.\n")); +#ifdef HAVE_PYTHON } +#endif /* HAVE_PYTHON */ return 1; } @@ -599,15 +736,15 @@ static int setip_cmd(UAContext *ua, const char *cmd) { CLIENT *client; char buf[1024]; - if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->hdr.name)) { - bsendmsg(ua, _("Illegal command from this console.\n")); + if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->name())) { + ua->error_msg(_("Unauthorized command from this console.\n")); return 1; } LockRes(); - client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->hdr.name); + client = GetClientResWithName(ua->cons->name()); if (!client) { - bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->hdr.name); + ua->error_msg(_("Client \"%s\" not found.\n"), ua->cons->name()); goto get_out; } if (client->address) { @@ -616,8 +753,8 @@ static int setip_cmd(UAContext *ua, const char *cmd) /* MA Bug 6 remove ifdef */ sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf)); client->address = bstrdup(buf); - bsendmsg(ua, _("Client \"%s\" address set to %s\n"), - client->hdr.name, client->address); + ua->send_msg(_("Client \"%s\" address set to %s\n"), + client->name(), client->address); get_out: UnlockRes(); return 1; @@ -637,20 +774,20 @@ static void do_en_disable_cmd(UAContext *ua, bool setting) } } else { LockRes(); - job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); + job = GetJobResWithName(ua->argv[i]); UnlockRes(); } if (!job) { - bsendmsg(ua, _("Job \"%s\" not found.\n"), ua->argv[i]); + ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]); return; } - if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) { - bsendmsg(ua, _("Illegal command from this console.\n")); + if (!acl_access_ok(ua, Job_ACL, job->name())) { + ua->error_msg(_("Unauthorized command from this console.\n")); return; } job->enabled = setting; - bsendmsg(ua, _("Job \"%s\" %sabled\n"), job->hdr.name, setting?"en":"dis"); + ua->send_msg(_("Job \"%s\" %sabled\n"), job->name(), setting?"en":"dis"); return; } @@ -671,23 +808,26 @@ static void do_storage_setdebug(UAContext *ua, STORE *store, int level, int trac { BSOCK *sd; JCR *jcr = ua->jcr; - - set_wstorage(jcr, store); + USTORE lstore; + + lstore.store = store; + pm_strcpy(lstore.store_source, _("unknown source")); + set_wstorage(jcr, &lstore); /* Try connecting for up to 15 seconds */ - bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"), + ua->send_msg(_("Connecting to Storage daemon %s at %s:%d\n"), store->name(), store->address, store->SDport); if (!connect_to_storage_daemon(jcr, 1, 15, 0)) { - bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); + ua->error_msg(_("Failed to connect to Storage daemon.\n")); return; } Dmsg0(120, _("Connected to storage daemon\n")); sd = jcr->store_bsock; - bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag); - if (bnet_recv(sd) >= 0) { - bsendmsg(ua, "%s", sd->msg); + sd->fsend("setdebug=%d trace=%d\n", level, trace_flag); + if (sd->recv() >= 0) { + ua->send_msg("%s", sd->msg); } - bnet_sig(sd, BNET_TERMINATE); - bnet_close(sd); + sd->signal(BNET_TERMINATE); + sd->close(); jcr->store_bsock = NULL; return; } @@ -700,20 +840,20 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int tra ua->jcr->client = client; /* Try to connect for 15 seconds */ - bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), - client->hdr.name, client->address, client->FDport); + ua->send_msg(_("Connecting to Client %s at %s:%d\n"), + client->name(), client->address, client->FDport); if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) { - bsendmsg(ua, _("Failed to connect to Client.\n")); + ua->error_msg(_("Failed to connect to Client.\n")); return; } Dmsg0(120, "Connected to file daemon\n"); fd = ua->jcr->file_bsock; - bnet_fsend(fd, "setdebug=%d trace=%d\n", level, trace_flag); - if (bnet_recv(fd) >= 0) { - bsendmsg(ua, "%s", fd->msg); + fd->fsend("setdebug=%d trace=%d\n", level, trace_flag); + if (fd->recv() >= 0) { + ua->send_msg("%s", fd->msg); } - bnet_sig(fd, BNET_TERMINATE); - bnet_close(fd); + fd->signal(BNET_TERMINATE); + fd->close(); ua->jcr->file_bsock = NULL; return; } @@ -808,9 +948,6 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) int trace_flag = -1; int i; - if (!open_db(ua)) { - return 1; - } Dmsg1(120, "setdebug:%s:\n", cmd); level = -1; @@ -850,7 +987,7 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) strcasecmp(ua->argk[i], "fd") == 0) { client = NULL; if (ua->argv[i]) { - client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); + client = GetClientResWithName(ua->argv[i]); if (client) { do_client_setdebug(ua, client, level, trace_flag); return 1; @@ -868,7 +1005,7 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) strcasecmp(ua->argk[i], NT_("sd")) == 0) { store = NULL; if (ua->argv[i]) { - store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]); + store = GetStoreResWithName(ua->argv[i]); if (store) { do_storage_setdebug(ua, store, level, trace_flag); return 1; @@ -942,7 +1079,7 @@ static int var_cmd(UAContext *ua, const char *cmd) POOLMEM *val = get_pool_memory(PM_FNAME); char *var; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } for (var=ua->cmd; *var != ' '; ) { /* skip command */ @@ -953,7 +1090,7 @@ static int var_cmd(UAContext *ua, const char *cmd) } Dmsg1(100, "Var=%s:\n", var); variable_expansion(ua->jcr, var, &val); - bsendmsg(ua, "%s\n", val); + ua->send_msg("%s\n", val); free_pool_memory(val); return 1; } @@ -967,25 +1104,55 @@ static int estimate_cmd(UAContext *ua, const char *cmd) char since[MAXSTRING]; JCR *jcr = ua->jcr; - jcr->JobLevel = L_FULL; + jcr->set_JobLevel(L_FULL); for (int i=1; iargc; i++) { if (strcasecmp(ua->argk[i], NT_("client")) == 0 || strcasecmp(ua->argk[i], NT_("fd")) == 0) { if (ua->argv[i]) { - client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); + client = GetClientResWithName(ua->argv[i]); + if (!client) { + ua->error_msg(_("Client \"%s\" not found.\n"), ua->argv[i]); + return 1; + } continue; + } else { + ua->error_msg(_("Client name missing.\n")); + return 1; } } if (strcasecmp(ua->argk[i], NT_("job")) == 0) { if (ua->argv[i]) { - job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); + job = GetJobResWithName(ua->argv[i]); + if (!job) { + ua->error_msg(_("Job \"%s\" not found.\n"), ua->argv[i]); + return 1; + } + if (!acl_access_ok(ua, Job_ACL, job->name())) { + ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name()); + return 1; + } continue; + } else { + ua->error_msg(_("Job name missing.\n")); + return 1; } + } if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) { if (ua->argv[i]) { - fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]); + fileset = GetFileSetResWithName(ua->argv[i]); + if (!fileset) { + ua->error_msg(_("Fileset \"%s\" not found.\n"), ua->argv[i]); + return 1; + } + if (!acl_access_ok(ua, FileSet_ACL, fileset->name())) { + ua->error_msg(_("No authorization for FileSet \"%s\"\n"), fileset->name()); + return 1; + } continue; + } else { + ua->error_msg(_("Fileset name missing.\n")); + return 1; } } if (strcasecmp(ua->argk[i], NT_("listing")) == 0) { @@ -993,10 +1160,15 @@ static int estimate_cmd(UAContext *ua, const char *cmd) continue; } if (strcasecmp(ua->argk[i], NT_("level")) == 0) { - if (!get_level_from_name(ua->jcr, ua->argv[i])) { - bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]); + if (ua->argv[i]) { + if (!get_level_from_name(ua->jcr, ua->argv[i])) { + ua->error_msg(_("Level \"%s\" not valid.\n"), ua->argv[i]); + } + continue; + } else { + ua->error_msg(_("Level value missing.\n")); + return 1; } - continue; } } if (!job && !(client && fileset)) { @@ -1005,9 +1177,13 @@ static int estimate_cmd(UAContext *ua, const char *cmd) } } if (!job) { - job = (JOB *)GetResWithName(R_JOB, ua->argk[1]); + job = GetJobResWithName(ua->argk[1]); if (!job) { - bsendmsg(ua, _("No job specified.\n")); + ua->error_msg(_("No job specified.\n")); + return 1; + } + if (!acl_access_ok(ua, Job_ACL, job->name())) { + ua->error_msg(_("No authorization for Job \"%s\"\n"), job->name()); return 1; } } @@ -1020,14 +1196,18 @@ static int estimate_cmd(UAContext *ua, const char *cmd) jcr->client = client; jcr->fileset = fileset; close_db(ua); - ua->catalog = client->catalog; + if (job->pool->catalog) { + ua->catalog = job->pool->catalog; + } else { + ua->catalog = client->catalog; + } if (!open_db(ua)) { return 1; } jcr->job = job; - jcr->JobType = JT_BACKUP; + jcr->set_JobType(JT_BACKUP); init_jcr_job_record(jcr); if (!get_or_create_client_record(jcr)) { @@ -1039,20 +1219,20 @@ static int estimate_cmd(UAContext *ua, const char *cmd) get_level_since_time(ua->jcr, since, sizeof(since)); - bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), - job->client->hdr.name, job->client->address, job->client->FDport); + ua->send_msg(_("Connecting to Client %s at %s:%d\n"), + jcr->client->name(), jcr->client->address, jcr->client->FDport); if (!connect_to_file_daemon(jcr, 1, 15, 0)) { - bsendmsg(ua, _("Failed to connect to Client.\n")); + ua->error_msg(_("Failed to connect to Client.\n")); return 1; } if (!send_include_list(jcr)) { - bsendmsg(ua, _("Error sending include list.\n")); + ua->error_msg(_("Error sending include list.\n")); goto bail_out; } if (!send_exclude_list(jcr)) { - bsendmsg(ua, _("Error sending exclude list.\n")); + ua->error_msg(_("Error sending exclude list.\n")); goto bail_out; } @@ -1062,7 +1242,7 @@ static int estimate_cmd(UAContext *ua, const char *cmd) bnet_fsend(jcr->file_bsock, "estimate listing=%d\n", listing); while (bnet_recv(jcr->file_bsock) >= 0) { - bsendmsg(ua, "%s", jcr->file_bsock->msg); + ua->send_msg("%s", jcr->file_bsock->msg); } bail_out: @@ -1085,7 +1265,7 @@ static int time_cmd(UAContext *ua, const char *cmd) struct tm tm; (void)localtime_r(&ttime, &tm); strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm); - bsendmsg(ua, "%s\n", sdt); + ua->send_msg("%s\n", sdt); return 1; } @@ -1115,7 +1295,7 @@ static int delete_cmd(UAContext *ua, const char *cmd) NT_("jobid"), NULL}; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return 1; } @@ -1137,7 +1317,7 @@ static int delete_cmd(UAContext *ua, const char *cmd) break; } - bsendmsg(ua, _( + ua->warning_msg(_( "In general it is not a good idea to delete either a\n" "Pool or a Volume since they may contain data.\n\n")); @@ -1152,7 +1332,7 @@ static int delete_cmd(UAContext *ua, const char *cmd) delete_job(ua); return 1; default: - bsendmsg(ua, _("Nothing done.\n")); + ua->warning_msg(_("Nothing done.\n")); break; } return 1; @@ -1237,24 +1417,14 @@ static void delete_job_id_range(UAContext *ua, char *tok) /* * do_job_delete now performs the actual delete operation atomically - * we always return 1 because C++ is pissy about void functions */ - static void do_job_delete(UAContext *ua, JobId_t JobId) { - POOLMEM *query = get_pool_memory(PM_MESSAGE); char ed1[50]; - Mmsg(query, "DELETE FROM Job WHERE JobId=%s", edit_int64(JobId, ed1)); - db_sql_query(ua->db, query, NULL, (void *)NULL); - Mmsg(query, "DELETE FROM MAC WHERE JobId=%s", ed1); - db_sql_query(ua->db, query, NULL, (void *)NULL); - Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1); - db_sql_query(ua->db, query, NULL, (void *)NULL); - Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1); - db_sql_query(ua->db, query, NULL, (void *)NULL); - free_pool_memory(query); - bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1)); + edit_int64(JobId, ed1); + purge_jobs_from_catalog(ua, ed1); + ua->send_msg(_("Job %s and associated records deleted from the catalog.\n"), ed1); } /* @@ -1263,16 +1433,23 @@ static void do_job_delete(UAContext *ua, JobId_t JobId) static int delete_volume(UAContext *ua) { MEDIA_DBR mr; + char buf[1000]; if (!select_media_dbr(ua, &mr)) { return 1; } - bsendmsg(ua, _("\nThis command will delete volume %s\n" + ua->warning_msg(_("\nThis command will delete volume %s\n" "and all Jobs saved on that volume from the Catalog\n"), mr.VolumeName); - if (!get_yesno(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) { - return 1; + if (find_arg(ua, "yes") >= 0) { + ua->pint32_val = 1; /* Have "yes" on command line already" */ + } else { + bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Volume \"%s\"? (yes/no): "), + mr.VolumeName); + if (!get_yesno(ua, buf)) { + return 1; + } } if (ua->pint32_val) { db_delete_media_record(ua->jcr, ua->db, &mr); @@ -1286,13 +1463,16 @@ static int delete_volume(UAContext *ua) static int delete_pool(UAContext *ua) { POOL_DBR pr; + char buf[200]; memset(&pr, 0, sizeof(pr)); if (!get_pool_dbr(ua, &pr)) { return 1; } - if (!get_yesno(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) { + bsnprintf(buf, sizeof(buf), _("Are you sure you want to delete Pool \"%s\"? (yes/no): "), + pr.Name); + if (!get_yesno(ua, buf)) { return 1; } if (ua->pint32_val) { @@ -1301,40 +1481,55 @@ static int delete_pool(UAContext *ua) return 1; } +int memory_cmd(UAContext *ua, const char *cmd) +{ + list_dir_status_header(ua); + sm_dump(false, true); + return 1; +} static void do_mount_cmd(UAContext *ua, const char *command) { - STORE *store; + USTORE store; BSOCK *sd; JCR *jcr = ua->jcr; char dev_name[MAX_NAME_LENGTH]; int drive; + int slot = -1; - if (!open_db(ua)) { + if (!open_client_db(ua)) { return; } Dmsg2(120, "%s: %s\n", command, ua->UA_sock->msg); - store = get_storage_resource(ua, true/*arg is storage*/); - if (!store) { + store.store = get_storage_resource(ua, true/*arg is storage*/); + if (!store.store) { return; } - set_wstorage(jcr, store); - drive = get_storage_drive(ua, store); + pm_strcpy(store.store_source, _("unknown source")); + set_wstorage(jcr, &store); + drive = get_storage_drive(ua, store.store); + if (strcmp(command, "mount") == 0) { + slot = get_storage_slot(ua, store.store); + } Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n", - store->media_type, store->dev_name(), drive); + store.store->media_type, store.store->dev_name(), drive); if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { - bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); + ua->error_msg(_("Failed to connect to Storage daemon.\n")); return; } sd = jcr->store_bsock; - bstrncpy(dev_name, store->dev_name(), sizeof(dev_name)); + bstrncpy(dev_name, store.store->dev_name(), sizeof(dev_name)); bash_spaces(dev_name); - bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive); + if (slot > 0) { + bnet_fsend(sd, "%s %s drive=%d slot=%d", command, dev_name, drive, slot); + } else { + bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive); + } while (bnet_recv(sd) >= 0) { - bsendmsg(ua, "%s", sd->msg); + ua->send_msg("%s", sd->msg); } bnet_sig(sd, BNET_TERMINATE); bnet_close(sd); @@ -1342,7 +1537,7 @@ static void do_mount_cmd(UAContext *ua, const char *command) } /* - * mount [storage=] [drive=nn] + * mount [storage=] [drive=nn] [slot=mm] */ static int mount_cmd(UAContext *ua, const char *cmd) { @@ -1389,15 +1584,15 @@ static int use_cmd(UAContext *ua, const char *cmd) ua->catalog = catalog; } if (open_db(ua)) { - bsendmsg(ua, _("Using Catalog name=%s DB=%s\n"), - ua->catalog->hdr.name, ua->catalog->db_name); + ua->send_msg(_("Using Catalog name=%s DB=%s\n"), + ua->catalog->name(), ua->catalog->db_name); } return 1; } int quit_cmd(UAContext *ua, const char *cmd) { - ua->quit = TRUE; + ua->quit = true; return 1; } @@ -1421,8 +1616,11 @@ static int status_handler(void *ctx, int num_fields, char **row) int wait_cmd(UAContext *ua, const char *cmd) { JCR *jcr; + int i; + time_t stop_time = 0; - /* no args + /* + * no args * Wait until no job is running */ if (ua->argc == 1) { @@ -1444,12 +1642,17 @@ int wait_cmd(UAContext *ua, const char *cmd) return 1; } + i = find_arg_with_value(ua, NT_("timeout")); + if (i > 0 && ua->argv[i]) { + stop_time = time(NULL) + str_to_int64(ua->argv[i]); + } + /* we have jobid, jobname or ujobid argument */ uint32_t jobid = 0 ; - if (!open_db(ua)) { - bsendmsg(ua, _("ERR: Can't open db\n")) ; + if (!open_client_db(ua)) { + ua->error_msg(_("ERR: Can't open db\n")) ; return 1; } @@ -1481,16 +1684,37 @@ int wait_cmd(UAContext *ua, const char *cmd) free_jcr(jcr); } break; + /* Wait for a mount request */ + } else if (strcasecmp(ua->argk[i], "mount") == 0) { + for (bool waiting=false; !waiting; ) { + foreach_jcr(jcr) { + if (jcr->JobId != 0 && + (jcr->JobStatus == JS_WaitMedia || jcr->JobStatus == JS_WaitMount)) { + waiting = true; + break; + } + } + endeach_jcr(jcr); + if (waiting) { + break; + } + if (stop_time && (time(NULL) >= stop_time)) { + ua->warning_msg(_("Wait on mount timed out\n")); + return 1; + } + bmicrosleep(1, 0); + } + return 1; } } if (jobid == 0) { - bsendmsg(ua, _("ERR: Job was not found\n")); + ua->error_msg(_("ERR: Job was not found\n")); return 1 ; } /* - * We wait the end of job + * We wait the end of a specific job */ bmicrosleep(0, 200000); /* let job actually start */ @@ -1544,13 +1768,13 @@ int wait_cmd(UAContext *ua, const char *cmd) break; } - bsendmsg(ua, "JobId=%i\n", jobid) ; - bsendmsg(ua, "JobStatus=%s (%c)\n", + ua->send_msg("JobId=%i\n", jobid) ; + ua->send_msg("JobStatus=%s (%c)\n", job_status_to_str(jobstatus), jobstatus) ; - if (ua->gui) { - bsendmsg(ua, "ExitStatus=%i\n", status) ; + if (ua->gui || ua->api) { + ua->send_msg("ExitStatus=%i\n", status) ; } return 1; @@ -1561,11 +1785,11 @@ static int help_cmd(UAContext *ua, const char *cmd) { unsigned int i; - bsendmsg(ua, _(" Command Description\n ======= ===========\n")); + ua->send_msg(_(" Command Description\n ======= ===========\n")); for (i=0; isend_msg(_(" %-10s %s\n"), _(commands[i].key), _(commands[i].help)); } - bsendmsg(ua, _("\nWhen at a prompt, entering a period cancels the command.\n\n")); + ua->send_msg(_("\nWhen at a prompt, entering a period cancels the command.\n\n")); return 1; } @@ -1574,21 +1798,120 @@ int qhelp_cmd(UAContext *ua, const char *cmd) unsigned int i; for (i=0; isend_msg("%s %s\n", commands[i].key, _(commands[i].help)); } return 1; } +#if 1 static int version_cmd(UAContext *ua, const char *cmd) { - bsendmsg(ua, _("%s Version: %s (%s)\n"), my_name, VERSION, BDATE); + ua->send_msg(_("%s Version: %s (%s) %s %s %s %s\n"), my_name, VERSION, BDATE, + NPRTB(director->verid), HOST_OS, DISTNAME, DISTVER); return 1; } +#else +/* + * Test code -- turned on only for debug testing + */ +static int version_cmd(UAContext *ua, const char *cmd) +{ + dbid_list ids; + POOL_MEM query(PM_MESSAGE); + open_db(ua); + Mmsg(query, "select MediaId from Media,Pool where Pool.PoolId=Media.PoolId and Pool.Name='Full'"); + db_get_query_dbids(ua->jcr, ua->db, query, ids); + ua->send_msg("num_ids=%d max_ids=%d tot_ids=%d\n", ids.num_ids, ids.max_ids, ids.tot_ids); + for (int i=0; i < ids.num_ids; i++) { + ua->send_msg("id=%d\n", ids.DBId[i]); + } + close_db(ua); + return 1; +} +#endif + +/* + * This call explicitly checks for a catalog=xxx and + * if given, opens that catalog. It also checks for + * client=xxx and if found, opens the catalog + * corresponding to that client. If we still don't + * have a catalog, look for a Job keyword and get the + * catalog from its client record. + */ +bool open_client_db(UAContext *ua) +{ + int i; + CAT *catalog; + CLIENT *client; + JOB *job; + + /* Try for catalog keyword */ + i = find_arg_with_value(ua, NT_("catalog")); + if (i >= 0) { + if (!acl_access_ok(ua, Catalog_ACL, ua->argv[i])) { + ua->error_msg(_("No authorization for Catalog \"%s\"\n"), ua->argv[i]); + return false; + } + catalog = GetCatalogResWithName(ua->argv[i]); + if (catalog) { + if (ua->catalog && ua->catalog != catalog) { + close_db(ua); + } + ua->catalog = catalog; + return open_db(ua); + } + } + + /* Try for client keyword */ + i = find_arg_with_value(ua, NT_("client")); + if (i >= 0) { + if (!acl_access_ok(ua, Client_ACL, ua->argv[i])) { + ua->error_msg(_("No authorization for Client \"%s\"\n"), ua->argv[i]); + return false; + } + client = GetClientResWithName(ua->argv[i]); + if (client) { + catalog = client->catalog; + if (ua->catalog && ua->catalog != catalog) { + close_db(ua); + } + if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) { + ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name()); + return false; + } + ua->catalog = catalog; + return open_db(ua); + } + } + + /* Try for Job keyword */ + i = find_arg_with_value(ua, NT_("job")); + if (i >= 0) { + if (!acl_access_ok(ua, Job_ACL, ua->argv[i])) { + ua->error_msg(_("No authorization for Job \"%s\"\n"), ua->argv[i]); + return false; + } + job = GetJobResWithName(ua->argv[i]); + if (job) { + catalog = job->client->catalog; + if (ua->catalog && ua->catalog != catalog) { + close_db(ua); + } + if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) { + ua->error_msg(_("No authorization for Catalog \"%s\"\n"), catalog->name()); + return false; + } + ua->catalog = catalog; + return open_db(ua); + } + } + + return open_db(ua); +} -/* A bit brain damaged in that if the user has not done - * a "use catalog xxx" command, we simply find the first - * catalog resource and open it. +/* + * Open the catalog database. */ bool open_db(UAContext *ua) { @@ -1596,39 +1919,34 @@ bool open_db(UAContext *ua) return true; } if (!ua->catalog) { - LockRes(); - ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL); - UnlockRes(); + ua->catalog = get_catalog_resource(ua); if (!ua->catalog) { - bsendmsg(ua, _("Could not find a Catalog resource\n")); + ua->error_msg( _("Could not find a Catalog resource\n")); return false; - } else if (!acl_access_ok(ua, Catalog_ACL, ua->catalog->hdr.name)) { - bsendmsg(ua, _("You must specify a \"use \" command before continuing.\n")); - ua->catalog = NULL; - return false; - } else { - bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"), - ua->catalog->hdr.name, ua->catalog->db_name); } } ua->jcr->catalog = ua->catalog; - Dmsg0(150, "Open database\n"); - ua->db = db_init_database(ua->jcr, ua->catalog->db_name, ua->catalog->db_user, + Dmsg0(100, "UA Open database\n"); + ua->db = db_init(ua->jcr, ua->catalog->db_driver, ua->catalog->db_name, + ua->catalog->db_user, ua->catalog->db_password, ua->catalog->db_address, ua->catalog->db_port, ua->catalog->db_socket, ua->catalog->mult_db_connections); if (!ua->db || !db_open_database(ua->jcr, ua->db)) { - bsendmsg(ua, _("Could not open database \"%s\".\n"), + ua->error_msg(_("Could not open catalog database \"%s\".\n"), ua->catalog->db_name); if (ua->db) { - bsendmsg(ua, "%s", db_strerror(ua->db)); + ua->error_msg("%s", db_strerror(ua->db)); } close_db(ua); return false; } ua->jcr->db = ua->db; + if (!ua->api) { + ua->send_msg(_("Using Catalog \"%s\"\n"), ua->catalog->name()); + } Dmsg1(150, "DB %s opened\n", ua->catalog->db_name); return true; }