Use the command line utility dropdb instead of the psql command

[bacula/bacula] / bacula / src / stored / authenticate.c

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index dd76c767b50651e6612580021b61008df3f2b75e..5b0ce30e9eac0a0c098eedb1258c792b80a78c40 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -2,6 +2,8 @@
  * Authenticate caller
  *
  *   Kern Sibbald, October 2000
+ *
+ *   Version $Id$
  * 
  */
 /*
@@ -37,34 +39,52 @@ static char OK_hello[]  = "3000 OK Hello\n";
  */
 static int authenticate(int rcode, BSOCK *bs)
 {
-   char *name;
-   DIRRES *director;
+   POOLMEM *dirname;
+   DIRRES *director = NULL;
+   int ssl_need = BNET_SSL_NONE;
 
    if (rcode != R_DIRECTOR) {
       Emsg1(M_FATAL, 0, _("I only authenticate Directors, not %d\n"), rcode);
       return 0;
    }
-   name = (char *) get_pool_memory(PM_MESSAGE);
-   name = (char *) check_pool_memory_size(name, bs->msglen);
+   if (bs->msglen < 25 || bs->msglen > 200) {
+      Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s. Len=%d.\n"), 
+           bs->who, bs->msglen);
+      return 0;
+   }
+   dirname = get_pool_memory(PM_MESSAGE);
+   dirname = check_pool_memory_size(dirname, bs->msglen);
 
-   if (sscanf(bs->msg, "Hello Director %127s calling\n", name) != 1) {
-      free_pool_memory(name);
-      Emsg1(M_FATAL, 0, _("Authentication failure: %s\n"), bs->msg);
+   if (sscanf(bs->msg, "Hello Director %127s calling\n", dirname) != 1) {
+      bs->msg[100] = 0;
+      Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s: %s\n"), 
+           bs->who, bs->msg);
       return 0;
    }
    director = NULL;
+   unbash_spaces(dirname);
    LockRes();
    while ((director=(DIRRES *)GetNextRes(rcode, (RES *)director))) {
-      if (strcmp(director->hdr.name, name) == 0)
+      if (strcmp(director->hdr.name, dirname) == 0)
         break;
    }
    UnlockRes();
-   if (director && (!cram_md5_auth(bs, director->password) ||
-       !cram_md5_get_auth(bs, director->password))) {
-      director = NULL;
+   if (!director) {
+      Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"), 
+           dirname, bs->who);
+      goto bail_out;
    }
-   free_pool_memory(name);
-   return (director != NULL);
+   if (!cram_md5_auth(bs, director->password, ssl_need) ||
+       !cram_md5_get_auth(bs, director->password, ssl_need)) {
+      Emsg0(M_FATAL, 0, _("Incorrect password given by Director.\n"));
+      goto bail_out;
+   }
+   free_pool_memory(dirname);
+   return 1;
+
+bail_out:
+   free_pool_memory(dirname);
+   return 0;
 }
 
 /*
@@ -85,7 +105,8 @@ int authenticate_director(JCR *jcr)
 
    if (!authenticate(R_DIRECTOR, dir)) {
       bnet_fsend(dir, "%s", Dir_sorry);
-      Emsg0(M_ERROR, 0, _("Unable to authenticate Director\n"));
+      Emsg1(M_ERROR, 0, _("Unable to authenticate Director at %s.\n"), dir->who);
+      bmicrosleep(5, 0);
       return 0;
    }
    return bnet_fsend(dir, "%s", OK_hello);
@@ -94,10 +115,15 @@ int authenticate_director(JCR *jcr)
 int authenticate_filed(JCR *jcr)
 {
    BSOCK *fd = jcr->file_bsock;
+   int ssl_need = BNET_SSL_NONE;
 
-   if (cram_md5_auth(fd, jcr->sd_auth_key) &&
-       cram_md5_get_auth(fd, jcr->sd_auth_key)) {
+   if (cram_md5_auth(fd, jcr->sd_auth_key, ssl_need) &&
+       cram_md5_get_auth(fd, jcr->sd_auth_key, ssl_need)) {
       jcr->authenticated = TRUE;
    }
+   if (!jcr->authenticated) {
+      Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"), 
+          fd->who);
+   }
    return jcr->authenticated;
 }