*/
static int authenticate(int rcode, BSOCK *bs)
{
- char *name;
- DIRRES *director;
+ POOLMEM *dirname;
+ DIRRES *director = NULL;
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 > 200) {
+ bs->msglen = 200;
+ }
+ 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;
+ Emsg1(M_FATAL, 0, _("Bad Hello command from Director: %s\n"), 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) {
+ Emsg1(M_FATAL, 0, _("Connection from unknown Director %s rejected.\n"), dirname);
+ goto bail_out;
+ }
+ if (!cram_md5_auth(bs, director->password) ||
+ !cram_md5_get_auth(bs, director->password)) {
+ Emsg0(M_FATAL, 0, _("Incorrect password given by Director.\n"));
+ goto bail_out;
}
- free_pool_memory(name);
- return (director != NULL);
+ free_pool_memory(dirname);
+ return 1;
+
+bail_out:
+ free_pool_memory(dirname);
+ return 0;
}
/*
if (!authenticate(R_DIRECTOR, dir)) {
bnet_fsend(dir, "%s", Dir_sorry);
Emsg0(M_ERROR, 0, _("Unable to authenticate Director\n"));
+ sleep(5);
return 0;
}
return bnet_fsend(dir, "%s", OK_hello);
cram_md5_get_auth(fd, jcr->sd_auth_key)) {
jcr->authenticated = TRUE;
}
+ if (!jcr->authenticated) {
+ Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon rejected.\n"));
+ }
return jcr->authenticated;
}