+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2001-2014 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.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+*/
/*
*
- * Bacula Director -- authorize.c -- handles authorization of
+ * Bacula Director -- authenticate.c -- handles authorization of
* Storage and File daemons.
*
- * Kern Sibbald, May MMI
+ * Written by: Kern Sibbald, May MMI
*
* This routine runs as a thread and must be thread reentrant.
*
- * Version $Id$
- *
*/
-/*
- Copyright (C) 2001-2004 Kern Sibbald and John Walker
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+#include "bacula.h"
+#include "dird.h"
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+static const int dbglvl = 50;
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+extern DIRRES *director;
+/* Version at end of Hello
+ * prior to 06Aug13 no version
+ * 1 06Aug13 - added comm line compression
*/
+#define DIR_VERSION 1
-#include "bacula.h"
-#include "dird.h"
-
-extern DIRRES *director;
-extern char my_name[];
-/* Commands sent to Storage daemon and File daemon and received
- * from the User Agent */
-static char hello[] = "Hello Director %s calling\n";
+/* Command sent to SD */
+static char hello[] = "Hello %sDirector %s calling %d\n";
-/* Response from Storage daemon */
-static char OKhello[] = "3000 OK Hello\n";
-static char FDOKhello[] = "2000 OK Hello\n";
+/* Responses from Storage and File daemons */
+static char OKhello[] = "3000 OK Hello";
+static char SDOKnewHello[] = "3000 OK Hello %d";
+static char FDOKhello[] = "2000 OK Hello";
+static char FDOKnewHello[] = "2000 OK Hello %d";
/* Sent to User Agent */
static char Dir_sorry[] = "1999 You are not authorized.\n";
char dirname[MAX_NAME_LENGTH];
int tls_local_need = BNET_TLS_NONE;
int tls_remote_need = BNET_TLS_NONE;
+ int compatible = true;
bool auth_success = false;
/*
bash_spaces(dirname);
/* Timeout Hello after 1 min */
btimer_t *tid = start_bsock_timer(sd, AUTH_TIMEOUT);
- if (!bnet_fsend(sd, hello, dirname)) {
+ /* Sent Hello SD: Bacula Director <dirname> calling <version> */
+ if (!sd->fsend(hello, "SD: Bacula ", dirname, DIR_VERSION)) {
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));
+ Dmsg1(dbglvl, _("Error sending Hello to Storage daemon. ERR=%s\n"), sd->bstrerror());
+ Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to Storage daemon. ERR=%s\n"), sd->bstrerror());
return 0;
}
-#ifdef HAVE_TLS
/* TLS Requirement */
if (store->tls_enable) {
if (store->tls_require) {
- tls_local_need = BNET_TLS_REQUIRED;
+ tls_local_need = BNET_TLS_REQUIRED;
} else {
- tls_local_need = BNET_TLS_OK;
+ tls_local_need = BNET_TLS_OK;
}
}
-#endif
- auth_success = cram_md5_get_auth(sd, store->password, &tls_remote_need);
+ if (store->tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
+ auth_success = cram_md5_respond(sd, store->password, &tls_remote_need, &compatible);
if (auth_success) {
- auth_success = cram_md5_auth(sd, store->password, tls_local_need);
+ auth_success = cram_md5_challenge(sd, store->password, tls_local_need, compatible);
if (!auth_success) {
- Dmsg1(50, "cram_auth failed for %s\n", sd->who);
+ Dmsg1(dbglvl, "cram_challenge failed for %s\n", sd->who());
}
} else {
- Dmsg1(50, "cram_get_auth failed for %s\n", sd->who);
+ Dmsg1(dbglvl, "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"));
- Jmsg0(jcr, M_FATAL, 0,
- _("Unable to authenticate with Storage daemon. 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/html-manual/faq.html#AuthorizationErrors for help.\n"));
+ Dmsg0(dbglvl, _("Director and Storage daemon passwords or names not the same.\n"));
+ Jmsg2(jcr, M_FATAL, 0,
+ _("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 " MANUAL_AUTH_URL " for help.\n"),
+ sd->host(), sd->port());
return 0;
}
return 0;
}
-#ifdef HAVE_TLS
/* 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)) {
- stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
- return 0;
+ if (!bnet_tls_client(store->tls_ctx, sd, NULL)) {
+ stop_bsock_timer(tid);
+ Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with SD at \"%s:%d\"\n"),
+ sd->host(), sd->port());
+ return 0;
+ }
+ if (store->tls_authenticate) { /* authentication only? */
+ sd->free_tls(); /* yes, stop tls */
}
}
-#endif
Dmsg1(116, ">stored: %s", sd->msg);
- if (bnet_recv(sd) <= 0) {
+ if (sd->recv() <= 0) {
stop_bsock_timer(tid);
- Jmsg1(jcr, M_FATAL, 0, _("bdird<stored: bad response to Hello command: ERR=%s\n"),
- bnet_strerror(sd));
+ Jmsg3(jcr, M_FATAL, 0, _("bdird<stored: \"%s:%s\" bad response to Hello command: ERR=%s\n"),
+ 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"));
- Jmsg0(jcr, M_FATAL, 0, _("Storage daemon rejected Hello command\n"));
+ jcr->SDVersion = 0;
+ if (sscanf(sd->msg, SDOKnewHello, &jcr->SDVersion) != 1 &&
+ strncmp(sd->msg, OKhello, sizeof(OKhello)) != 0) {
+ Dmsg0(dbglvl, _("Storage daemon rejected Hello command\n"));
+ Jmsg2(jcr, M_FATAL, 0, _("Storage daemon at \"%s:%d\" rejected Hello command\n"),
+ sd->host(), sd->port());
return 0;
}
return 1;
char dirname[MAX_NAME_LENGTH];
int tls_local_need = BNET_TLS_NONE;
int tls_remote_need = BNET_TLS_NONE;
+ int compatible = true;
bool auth_success = false;
/*
* 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, DIR_VERSION)) {
stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon. ERR=%s\n"), 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());
+ Dmsg3(50, _("Error sending Hello to File daemon at \"%s:%d\". ERR=%s\n"),
+ fd->host(), fd->port(), fd->bstrerror());
return 0;
}
+ Dmsg1(dbglvl, "Sent: %s", fd->msg);
-#ifdef HAVE_TLS
/* TLS Requirement */
if (client->tls_enable) {
if (client->tls_require) {
- tls_local_need = BNET_TLS_REQUIRED;
+ tls_local_need = BNET_TLS_REQUIRED;
} else {
- tls_local_need = BNET_TLS_OK;
+ tls_local_need = BNET_TLS_OK;
}
}
-#endif
- auth_success = cram_md5_get_auth(fd, client->password, &tls_remote_need);
+ if (client->tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
+ auth_success = cram_md5_respond(fd, client->password, &tls_remote_need, &compatible);
if (auth_success) {
- auth_success = cram_md5_auth(fd, client->password, tls_local_need);
+ 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(dbglvl, "cram_auth failed for %s\n", fd->who());
}
} else {
- Dmsg1(50, "cram_get_auth failed for %s\n", fd->who);
+ Dmsg1(dbglvl, "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"));
+ Dmsg0(dbglvl, _("Director and File daemon passwords or names not the same.\n"));
Jmsg(jcr, M_FATAL, 0,
- _("Unable to authenticate with File daemon. 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/html-manual/faq.html#AuthorizationErrors for help.\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 " MANUAL_AUTH_URL " for help.\n"),
+ fd->host(), fd->port());
return 0;
}
/* Verify that the remote host is willing to meet our TLS 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: Remote server did not advertise required TLS support.\n"));
+ Jmsg(jcr, M_FATAL, 0, _("Authorization problem: FD \"%s:%s\" did not advertise required TLS support.\n"),
+ 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: Remote server requires TLS.\n"));
+ Jmsg(jcr, M_FATAL, 0, _("Authorization problem: FD at \"%s:%d\" requires TLS.\n"),
+ fd->host(), fd->port());
return 0;
}
-#ifdef HAVE_TLS
/* 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)) {
- stop_bsock_timer(tid);
- Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
- return 0;
+ 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 at \"%s:%d\".\n"),
+ fd->host(), fd->port());
+ return 0;
+ }
+ if (client->tls_authenticate) { /* tls authentication only? */
+ fd->free_tls(); /* yes, shutdown tls */
}
}
-#endif
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 to Hello command: ERR=%s\n"),
- bnet_strerror(fd));
+ Dmsg1(dbglvl, _("Bad response from File daemon to Hello command: ERR=%s\n"),
+ fd->bstrerror());
+ 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);
+ Dmsg1(110, "<filed: %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 rejected Hello command\n"));
+ jcr->FDVersion = 0;
+ if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0 &&
+ sscanf(fd->msg, FDOKnewHello, &jcr->FDVersion) != 1) {
+ Dmsg0(dbglvl, _("File daemon rejected Hello command\n"));
+ Jmsg(jcr, M_FATAL, 0, _("File daemon at \"%s:%d\" rejected Hello command\n"),
+ fd->host(), fd->port());
return 0;
}
return 1;
char name[MAX_NAME_LENGTH];
int tls_local_need = BNET_TLS_NONE;
int tls_remote_need = BNET_TLS_NONE;
+ bool tls_authenticate;
+ int compatible = true;
CONRES *cons = NULL;
BSOCK *ua = uac->UA_sock;
bool auth_success = false;
-#ifdef HAVE_TLS
TLS_CONTEXT *tls_ctx = NULL;
alist *verify_list = NULL;
-#endif /* HAVE_TLS */
-
+ int ua_version = 0;
-// 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);
+ if (sscanf(ua->msg, "Hello %127s calling %d", name, &ua_version) != 2 &&
+ sscanf(ua->msg, "Hello %127s calling", 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);
return 0;
}
- name[sizeof(name)-1] = 0; /* terminate name */
+ name[sizeof(name)-1] = 0; /* terminate name */
if (strcmp(name, "*UserAgent*") == 0) { /* default console */
-#ifdef HAVE_TLS
/* TLS Requirement */
if (director->tls_enable) {
if (director->tls_require) {
tls_local_need = BNET_TLS_REQUIRED;
} else {
- tls_local_need = BNET_TLS_OK;
+ tls_local_need = BNET_TLS_OK;
}
}
+ tls_authenticate = director->tls_authenticate;
+
+ if (tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
if (director->tls_verify_peer) {
verify_list = director->tls_allowed_cns;
}
-#endif /* HAVE_TLS */
- auth_success = cram_md5_auth(ua, director->password, tls_local_need) &&
- cram_md5_get_auth(ua, director->password, &tls_remote_need);
+ auth_success = cram_md5_challenge(ua, director->password, tls_local_need,
+ compatible) &&
+ cram_md5_respond(ua, director->password, &tls_remote_need, &compatible);
} else {
unbash_spaces(name);
cons = (CONRES *)GetResWithName(R_CONSOLE, name);
if (cons) {
-#ifdef HAVE_TLS
- /* TLS Requirement */
+ /* TLS Requirement */
if (cons->tls_enable) {
if (cons->tls_require) {
- tls_local_need = BNET_TLS_REQUIRED;
+ tls_local_need = BNET_TLS_REQUIRED;
} else {
- tls_local_need = BNET_TLS_OK;
+ tls_local_need = BNET_TLS_OK;
}
}
- if (cons->tls_verify_peer) {
+ tls_authenticate = cons->tls_authenticate;
+
+ if (tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
+ if (cons->tls_verify_peer) {
verify_list = cons->tls_allowed_cns;
- }
-#endif /* HAVE_TLS */
+ }
- auth_success = cram_md5_auth(ua, cons->password, tls_local_need) &&
- cram_md5_get_auth(ua, cons->password, &tls_remote_need);
+ auth_success = cram_md5_challenge(ua, cons->password, tls_local_need,
+ compatible) &&
+ cram_md5_respond(ua, cons->password, &tls_remote_need, &compatible);
- if (auth_success) {
- uac->cons = cons; /* save console resource pointer */
- }
+ if (auth_success) {
+ uac->cons = cons; /* save console resource pointer */
+ }
} else {
- auth_success = false;
- goto auth_done;
+ auth_success = false;
+ goto auth_done;
}
}
+
/* Verify that the remote peer is willing to meet our TLS requirements */
if (tls_remote_need < tls_local_need && tls_local_need != BNET_TLS_OK && tls_remote_need != BNET_TLS_OK) {
Emsg0(M_FATAL, 0, _("Authorization problem:"
goto auth_done;
}
-#ifdef HAVE_TLS
if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
if (cons) {
- tls_ctx = cons->tls_ctx;
+ tls_ctx = cons->tls_ctx;
} else {
- tls_ctx = director->tls_ctx;
+ tls_ctx = director->tls_ctx;
}
/* Engage TLS! Full Speed Ahead! */
if (!bnet_tls_server(tls_ctx, ua, verify_list)) {
- Emsg0(M_ERROR, 0, "TLS negotiation failed.\n");
- auth_success = false;
- goto auth_done;
+ Emsg0(M_ERROR, 0, _("TLS negotiation failed.\n"));
+ auth_success = false;
+ goto auth_done;
+ }
+ if (tls_authenticate) { /* authentication only? */
+ ua->free_tls(); /* stop tls */
}
}
-#endif /* HAVE_TLS */
/* 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: " VERSION " (" BDATE ")\n", my_name);
+ ua->fsend(_("1000 OK: %d %s Version: %s (%s)\n"),
+ DIR_VERSION, my_name, VERSION, BDATE);
return 1;
}
projects / bacula / bacula / blobdiff