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