Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
#include "bacula.h"
#include "stored.h"
+const int dbglvl = 50;
+
static char Dir_sorry[] = "3999 No go\n";
static char OK_hello[] = "3000 OK Hello\n";
alist *verify_list = NULL;
if (rcode != R_DIRECTOR) {
- Dmsg1(50, "I only authenticate Directors, not %d\n", rcode);
- Emsg1(M_FATAL, 0, _("I only authenticate Directors, not %d\n"), rcode);
+ Dmsg1(dbglvl, "I only authenticate Directors, not %d\n", rcode);
+ Jmsg1(jcr, M_FATAL, 0, _("I only authenticate Directors, not %d\n"), rcode);
return 0;
}
if (bs->msglen < 25 || bs->msglen > 500) {
- Dmsg2(50, "Bad Hello command from Director at %s. Len=%d.\n",
+ Dmsg2(dbglvl, "Bad Hello command from Director at %s. Len=%d.\n",
bs->who(), bs->msglen);
- Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s. Len=%d.\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Bad Hello command from Director at %s. Len=%d.\n"),
bs->who(), bs->msglen);
return 0;
}
if (sscanf(bs->msg, "Hello Director %127s calling", dirname) != 1) {
bs->msg[100] = 0;
- Dmsg2(50, "Bad Hello command from Director at %s: %s\n",
+ Dmsg2(dbglvl, "Bad Hello command from Director at %s: %s\n",
bs->who(), bs->msg);
- Emsg2(M_FATAL, 0, _("Bad Hello command from Director at %s: %s\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Bad Hello command from Director at %s: %s\n"),
bs->who(), bs->msg);
return 0;
}
break;
}
if (!director) {
- Dmsg2(50, "Connection from unknown Director %s at %s rejected.\n",
+ Dmsg2(dbglvl, "Connection from unknown Director %s at %s rejected.\n",
dirname, bs->who());
- Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"
- "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"
+ "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
dirname, bs->who());
free_pool_memory(dirname);
return 0;
}
}
+ if (director->tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
if (director->tls_verify_peer) {
verify_list = director->tls_allowed_cns;
}
if (auth_success) {
auth_success = cram_md5_respond(bs, director->password, &tls_remote_need, &compatible);
if (!auth_success) {
- Dmsg1(50, "cram_get_auth failed with %s\n", bs->who());
+ Dmsg1(dbglvl, "cram_get_auth failed with %s\n", bs->who());
}
} else {
- Dmsg1(50, "cram_auth failed with %s\n", bs->who());
+ Dmsg1(dbglvl, "cram_auth failed with %s\n", bs->who());
}
if (!auth_success) {
- Emsg0(M_FATAL, 0, _("Incorrect password given by Director.\n"
- "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"));
+ Jmsg0(jcr, M_FATAL, 0, _("Incorrect password given by Director.\n"
+ "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
auth_success = false;
goto auth_fatal;
}
/* 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) {
- Emsg0(M_FATAL, 0, _("Authorization problem: Remote server did not"
- " advertise required TLS support.\n"));
+ Jmsg0(jcr, M_FATAL, 0, _("Authorization problem: Remote server did not"
+ " advertize required TLS support.\n"));
+ Dmsg2(dbglvl, "remote_need=%d local_need=%d\n", tls_remote_need, tls_local_need);
auth_success = false;
goto auth_fatal;
}
/* 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) {
- Emsg0(M_FATAL, 0, _("Authorization problem: Remote server requires TLS.\n"));
+ Jmsg0(jcr, M_FATAL, 0, _("Authorization problem: Remote server requires TLS.\n"));
+ Dmsg2(dbglvl, "remote_need=%d local_need=%d\n", tls_remote_need, tls_local_need);
auth_success = false;
goto auth_fatal;
}
if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
/* Engage TLS! Full Speed Ahead! */
if (!bnet_tls_server(director->tls_ctx, bs, verify_list)) {
- Emsg0(M_FATAL, 0, _("TLS negotiation failed.\n"));
+ Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with DIR at \"%s:%d\"\n"),
+ bs->host(), bs->port());
auth_success = false;
goto auth_fatal;
}
+ if (director->tls_authenticate) { /* authenticate with tls only? */
+ bs->free_tls(); /* yes, shut it down */
+ }
}
auth_fatal:
BSOCK *dir = jcr->dir_bsock;
if (!authenticate(R_DIRECTOR, dir, jcr)) {
- bnet_fsend(dir, "%s", Dir_sorry);
- Dmsg1(50, "Unable to authenticate Director at %s.\n", dir->who());
- Emsg1(M_ERROR, 0, _("Unable to authenticate Director at %s.\n"), dir->who());
+ dir->fsend("%s", Dir_sorry);
+ Dmsg1(dbglvl, "Unable to authenticate Director at %s.\n", dir->who());
+ Jmsg1(jcr, M_ERROR, 0, _("Unable to authenticate Director at %s.\n"), dir->who());
bmicrosleep(5, 0);
return 0;
}
- return bnet_fsend(dir, "%s", OK_hello);
+ return dir->fsend("%s", OK_hello);
}
int authenticate_filed(JCR *jcr)
}
}
+ if (me->tls_authenticate) {
+ tls_local_need = BNET_TLS_REQUIRED;
+ }
+
if (me->tls_verify_peer) {
verify_list = me->tls_allowed_cns;
}
/* Timeout Hello after 5 mins */
btimer_t *tid = start_bsock_timer(fd, AUTH_TIMEOUT);
/* Challenge FD */
- if (debug_level == 3) {
- Pmsg1(000, "sd_auth_key=%s\n", jcr->sd_auth_key);
- }
auth_success = cram_md5_challenge(fd, jcr->sd_auth_key, tls_local_need, compatible);
if (auth_success) {
/* Respond to his challenge */
auth_success = cram_md5_respond(fd, jcr->sd_auth_key, &tls_remote_need, &compatible);
if (!auth_success) {
- Dmsg1(50, "cram-get-auth failed with %s\n", fd->who());
+ Dmsg1(dbglvl, "cram-get-auth failed with %s\n", fd->who());
}
} else {
- Dmsg1(50, "cram-auth failed with %s\n", fd->who());
+ Dmsg1(dbglvl, "cram-auth failed with %s\n", fd->who());
}
if (!auth_success) {
Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"
- "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"),
+ "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
fd->who());
auth_success = false;
goto auth_fatal;
/* 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) {
Jmsg(jcr, M_FATAL, 0, _("Authorization problem: Remote server did not"
- " advertise required TLS support.\n"));
+ " advertize required TLS support.\n"));
+ Dmsg2(dbglvl, "remote_need=%d local_need=%d\n", tls_remote_need, tls_local_need);
auth_success = false;
goto auth_fatal;
}
/* 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) {
Jmsg(jcr, M_FATAL, 0, _("Authorization problem: Remote server requires TLS.\n"));
+ Dmsg2(dbglvl, "remote_need=%d local_need=%d\n", tls_remote_need, tls_local_need);
auth_success = false;
goto auth_fatal;
}
if (tls_local_need >= BNET_TLS_OK && tls_remote_need >= BNET_TLS_OK) {
/* Engage TLS! Full Speed Ahead! */
if (!bnet_tls_server(me->tls_ctx, fd, verify_list)) {
- Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
+ Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed with FD at \"%s:%d\"\n"),
+ fd->host(), fd->port());
auth_success = false;
goto auth_fatal;
}
+ if (me->tls_authenticate) { /* tls authenticate only? */
+ fd->free_tls(); /* yes, shut it down */
+ }
}
auth_fatal:
stop_bsock_timer(tid);
if (!auth_success) {
Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"
- "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"),
+ "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
fd->who());
}
jcr->authenticated = auth_success;
projects / bacula / bacula / blobdiff