For symmetry, add this file. At present, all it does is update the version table.

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

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index cecf3e52ca587198c6a77634637456100ae77d36..ac4867c1341476749567feafd4b3007ec07b965a 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -2,6 +2,8 @@
  * Authenticate Director who is attempting to connect.
  *
  *   Kern Sibbald, October 2000
+ *
+ *   Version $Id$
  * 
  */
 /*
@@ -36,33 +38,50 @@ static char Dir_sorry[] = "2999 No go\n";
  */
 static int authenticate(int rcode, BSOCK *bs)
 {
-   char *name;
+   POOLMEM *dirname;
    DIRRES *director;
+   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 %s calling\n", name) != 1) {
-      free_pool_memory(name);
-      Emsg1(M_FATAL, 0, _("Authentication failure: %s"), bs->msg);
+   if (sscanf(bs->msg, "Hello Director %s calling\n", dirname) != 1) {
+      free_pool_memory(dirname);
+      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))) {
+   if (!director) {
+      Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"), 
+           dirname, bs->who);
+      free_pool_memory(dirname);
+      return 0;
+   }
+   if (!cram_md5_auth(bs, director->password, ssl_need) ||
+       !cram_md5_get_auth(bs, director->password, ssl_need)) {
+      Emsg1(M_FATAL, 0, _("Incorrect password given by Director at %s.\n"),
+           bs->who);
       director = NULL;
    }
-   free_pool_memory(name);
+   free_pool_memory(dirname);
    return (director != NULL);
 }
 
@@ -80,7 +99,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"));
+      Emsg0(M_FATAL, 0, _("Unable to authenticate Director\n"));
+      bmicrosleep(5, 0);
       return 0;
    }
    return bnet_fsend(dir, "%s", OK_hello);
@@ -93,7 +113,14 @@ int authenticate_director(JCR *jcr)
 int authenticate_storagedaemon(JCR *jcr)
 {
    BSOCK *sd = jcr->store_bsock;
+   int stat;
+   int ssl_need = BNET_SSL_NONE;
 
-   return cram_md5_get_auth(sd, jcr->sd_auth_key) &&
-         cram_md5_auth(sd, jcr->sd_auth_key);
+   stat = cram_md5_get_auth(sd, jcr->sd_auth_key, ssl_need) &&
+         cram_md5_auth(sd, jcr->sd_auth_key, ssl_need);
+   memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
+   if (!stat) {
+      Jmsg(jcr, M_FATAL, 0, _("Authorization key rejected by Storage daemon.\n"));
+   }
+   return stat;
 }