-/*
- *
- * Bacula Director -- authorize.c -- handles authorization of
- * Storage and File daemons.
- *
- * Kern Sibbald, May MMI
- *
- * This routine runs as a thread and must be thread reentrant.
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2007 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 plus additions
- that are listed in the file LICENSE.
+ 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
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * Bacula Director -- authorize.c -- handles authorization of
+ * Storage and File daemons.
+ *
+ * Kern Sibbald, May MMI
+ *
+ * This routine runs as a thread and must be thread reentrant.
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
#include "dird.h"
bash_spaces(dirname);
/* Timeout Hello after 1 min */
btimer_t *tid = start_bsock_timer(sd, AUTH_TIMEOUT);
- if (!bnet_fsend(sd, hello, dirname)) {
+ if (!sd->fsend(hello, dirname)) {
stop_bsock_timer(tid);
Dmsg1(50, _("Error sending Hello to Storage daemon. ERR=%s\n"), bnet_strerror(sd));
Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to Storage daemon. ERR=%s\n"), bnet_strerror(sd));
if (auth_success) {
auth_success = cram_md5_challenge(sd, store->password, tls_local_need, compatible);
if (!auth_success) {
- Dmsg1(50, "cram_challenge failed for %s\n", sd->who);
+ Dmsg1(50, "cram_challenge failed for %s\n", sd->who());
}
} else {
- Dmsg1(50, "cram_respond failed for %s\n", sd->who);
+ Dmsg1(50, "cram_respond failed for %s\n", sd->who());
}
if (!auth_success) {
stop_bsock_timer(tid);
Dmsg0(50, _("Director and Storage daemon passwords or names not the same.\n"));
Jmsg2(jcr, M_FATAL, 0,
- _("Director unable to authenticate with Storage daemon on \"%s:%d\". Possible causes:\n"
+ _("Director unable to authenticate with Storage daemon at \"%s:%d\". Possible causes:\n"
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the SD or\n"
"SD networking messed up (restart daemon).\n"
"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"),
- sd->host, sd->port);
+ sd->host(), sd->port());
return 0;
}
/* Is TLS Enabled? */
if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
/* Engage TLS! Full Speed Ahead! */
- if (!bnet_tls_client(store->tls_ctx, sd)) {
+ if (!bnet_tls_client(store->tls_ctx, sd, NULL)) {
stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with SD on \"%s:%d\"\n"),
- sd->host, sd->port);
+ Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with SD at \"%s:%d\"\n"),
+ sd->host(), sd->port());
return 0;
}
}
Dmsg1(116, ">stored: %s", sd->msg);
- if (bnet_recv(sd) <= 0) {
+ if (sd->recv() <= 0) {
stop_bsock_timer(tid);
Jmsg3(jcr, M_FATAL, 0, _("bdird<stored: \"%s:%s\" bad response to Hello command: ERR=%s\n"),
- sd->who, sd->host, bnet_strerror(sd));
+ sd->who(), sd->host(), sd->bstrerror());
return 0;
}
Dmsg1(110, "<stored: %s", sd->msg);
stop_bsock_timer(tid);
if (strncmp(sd->msg, OKhello, sizeof(OKhello)) != 0) {
Dmsg0(50, _("Storage daemon rejected Hello command\n"));
- Jmsg2(jcr, M_FATAL, 0, _("Storage daemon on \"%s:%d\" rejected Hello command\n"),
- sd->host, sd->port);
+ Jmsg2(jcr, M_FATAL, 0, _("Storage daemon at \"%s:%d\" rejected Hello command\n"),
+ sd->host(), sd->port());
return 0;
}
return 1;
/*
* Send my name to the File daemon then do authentication
*/
- bstrncpy(dirname, director->hdr.name, sizeof(dirname));
+ bstrncpy(dirname, director->name(), sizeof(dirname));
bash_spaces(dirname);
- /* Timeout Hello after 10 mins */
+ /* Timeout Hello after 1 min */
btimer_t *tid = start_bsock_timer(fd, AUTH_TIMEOUT);
- if (!bnet_fsend(fd, hello, dirname)) {
+ if (!fd->fsend(hello, dirname)) {
stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon on \"%s:%d\". ERR=%s\n"),
- fd->host, fd->port, bnet_strerror(fd));
+ Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon at \"%s:%d\". ERR=%s\n"),
+ fd->host(), fd->port(), fd->bstrerror());
return 0;
}
Dmsg1(50, "Sent: %s", fd->msg);
if (auth_success) {
auth_success = cram_md5_challenge(fd, client->password, tls_local_need, compatible);
if (!auth_success) {
- Dmsg1(50, "cram_auth failed for %s\n", fd->who);
+ Dmsg1(50, "cram_auth failed for %s\n", fd->who());
}
} else {
- Dmsg1(50, "cram_get_auth failed for %s\n", fd->who);
+ Dmsg1(50, "cram_get_auth failed for %s\n", fd->who());
}
if (!auth_success) {
stop_bsock_timer(tid);
Dmsg0(50, _("Director and File daemon passwords or names not the same.\n"));
Jmsg(jcr, M_FATAL, 0,
- _("Unable to authenticate with File daemon on \"%s:%d\". Possible causes:\n"
+ _("Unable to authenticate with File daemon at \"%s:%d\". Possible causes:\n"
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the FD or\n"
"FD networking messed up (restart daemon).\n"
"Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"),
- fd->host, fd->port);
+ fd->host(), fd->port());
return 0;
}
if (tls_remote_need < tls_local_need && tls_local_need != BNET_TLS_OK && tls_remote_need != BNET_TLS_OK) {
stop_bsock_timer(tid);
Jmsg(jcr, M_FATAL, 0, _("Authorization problem: FD \"%s:%s\" did not advertise required TLS support.\n"),
- fd->who, fd->host);
+ fd->who(), fd->host());
return 0;
}
/* Verify that we are willing to meet the remote host's requirements */
if (tls_remote_need > tls_local_need && tls_local_need != BNET_TLS_OK && tls_remote_need != BNET_TLS_OK) {
stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("Authorization problem: FD on \"%s:%d\" requires TLS.\n"),
- fd->host, fd->port);
+ Jmsg(jcr, M_FATAL, 0, _("Authorization problem: FD at \"%s:%d\" requires TLS.\n"),
+ fd->host(), fd->port());
return 0;
}
/* Is TLS Enabled? */
if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
/* Engage TLS! Full Speed Ahead! */
- if (!bnet_tls_client(client->tls_ctx, fd)) {
+ if (!bnet_tls_client(client->tls_ctx, fd, client->tls_allowed_cns)) {
+
stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with FD on \"%s:%d\".\n"),
- fd->host, fd->port);
+ Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with FD at \"%s:%d\".\n"),
+ fd->host(), fd->port());
return 0;
}
}
Dmsg1(116, ">filed: %s", fd->msg);
- if (bnet_recv(fd) <= 0) {
+ if (fd->recv() <= 0) {
stop_bsock_timer(tid);
Dmsg1(50, _("Bad response from File daemon to Hello command: ERR=%s\n"),
bnet_strerror(fd));
- Jmsg(jcr, M_FATAL, 0, _("Bad response from File daemon on \"%s:%d\" to Hello command: ERR=%s\n"),
- fd->host, fd->port, bnet_strerror(fd));
+ Jmsg(jcr, M_FATAL, 0, _("Bad response from File daemon at \"%s:%d\" to Hello command: ERR=%s\n"),
+ fd->host(), fd->port(), fd->bstrerror());
return 0;
}
Dmsg1(110, "<stored: %s", fd->msg);
stop_bsock_timer(tid);
if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0) {
Dmsg0(50, _("File daemon rejected Hello command\n"));
- Jmsg(jcr, M_FATAL, 0, _("File daemon on \"%s:%d\" rejected Hello command\n"),
- fd->host, fd->port);
+ Jmsg(jcr, M_FATAL, 0, _("File daemon at \"%s:%d\" rejected Hello command\n"),
+ fd->host(), fd->port());
return 0;
}
return 1;
TLS_CONTEXT *tls_ctx = NULL;
alist *verify_list = NULL;
-
-// Emsg4(M_INFO, 0, _("UA Hello from %s:%s:%d is invalid. Len=%d\n"), ua->who,
-// ua->host, ua->port, ua->msglen);
if (ua->msglen < 16 || ua->msglen >= MAX_NAME_LENGTH + 15) {
- Emsg4(M_ERROR, 0, _("UA Hello from %s:%s:%d is invalid. Len=%d\n"), ua->who,
- ua->host, ua->port, ua->msglen);
+ Emsg4(M_ERROR, 0, _("UA Hello from %s:%s:%d is invalid. Len=%d\n"), ua->who(),
+ ua->host(), ua->port(), ua->msglen);
return 0;
}
if (sscanf(ua->msg, "Hello %127s calling\n", name) != 1) {
ua->msg[100] = 0; /* terminate string */
- Emsg4(M_ERROR, 0, _("UA Hello from %s:%s:%d is invalid. Got: %s\n"), ua->who,
- ua->host, ua->port, ua->msg);
+ Emsg4(M_ERROR, 0, _("UA Hello from %s:%s:%d is invalid. Got: %s\n"), ua->who(),
+ ua->host(), ua->port(), ua->msg);
return 0;
}
/* Authorization Completed */
auth_done:
if (!auth_success) {
- bnet_fsend(ua, "%s", _(Dir_sorry));
+ ua->fsend("%s", _(Dir_sorry));
Emsg4(M_ERROR, 0, _("Unable to authenticate console \"%s\" at %s:%s:%d.\n"),
- name, ua->who, ua->host, ua->port);
+ name, ua->who(), ua->host(), ua->port());
sleep(5);
return 0;
}
- bnet_fsend(ua, _("1000 OK: %s Version: %s (%s)\n"), my_name, VERSION, BDATE);
+ ua->fsend(_("1000 OK: %s Version: %s (%s)\n"), my_name, VERSION, BDATE);
return 1;
}
projects / bacula / bacula / blobdiff