X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_gss.c;h=cd4b2785f43449dc264c71bb2c6e2131968097d5;hp=780e3034eada6c66c83a2d498a70e0df14a85256;hb=ea912b20ba2b3b9dfdbbae758ad56263c9aa41b3;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/imap/auth_gss.c b/imap/auth_gss.c index 780e303..cd4b278 100644 --- a/imap/auth_gss.c +++ b/imap/auth_gss.c @@ -17,6 +17,9 @@ #include "imap_private.h" #include "auth.h" +#include "lib/intl.h" +#include "lib/debug.h" + #include #ifdef HAVE_HEIMDAL @@ -57,18 +60,18 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) /* get an IMAP service ticket for the server */ snprintf (buf1, sizeof (buf1), "imap@%s", idata->conn->account.host); request_buf.value = buf1; - request_buf.length = strlen (buf1) + 1; + request_buf.length = str_len (buf1) + 1; maj_stat = gss_import_name (&min_stat, &request_buf, gss_nt_service_name, &target_name); if (maj_stat != GSS_S_COMPLETE) { - dprint (2, (debugfile, "Couldn't get service name for [%s]\n", buf1)); + debug_print (2, ("Couldn't get service name for [%s]\n", buf1)); return IMAP_AUTH_UNAVAIL; } #ifdef DEBUG - else if (debuglevel >= 2) { + else if (DebugLevel >= 2) { maj_stat = gss_display_name (&min_stat, target_name, &request_buf, &mech_name); - dprint (2, (debugfile, "Using service name [%s]\n", + debug_print (2, ("Using service name [%s]\n", (char *) request_buf.value)); maj_stat = gss_release_buffer (&min_stat, &request_buf); } @@ -85,7 +88,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) &send_token, (unsigned int *) &cflags, NULL); if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) { - dprint (1, (debugfile, "Error acquiring credentials - no TGT?\n")); + debug_print (1, ("Error acquiring credentials - no TGT?\n")); gss_release_name (&min_stat, &target_name); return IMAP_AUTH_UNAVAIL; @@ -102,17 +105,17 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) while (rc == IMAP_CMD_CONTINUE); if (rc != IMAP_CMD_RESPOND) { - dprint (2, (debugfile, "Invalid response from server: %s\n", buf1)); + debug_print (2, ("Invalid response from server: %s\n", buf1)); gss_release_name (&min_stat, &target_name); goto bail; } /* now start the security context initialisation loop... */ - dprint (2, (debugfile, "Sending credentials\n")); + debug_print (2, ("Sending credentials\n")); mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length, sizeof (buf1) - 2); gss_release_buffer (&min_stat, &send_token); - safe_strcat (buf1, sizeof (buf1), "\r\n"); + str_cat (buf1, sizeof (buf1), "\r\n"); mutt_socket_write (idata->conn, buf1); while (maj_stat == GSS_S_CONTINUE_NEEDED) { @@ -122,7 +125,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) while (rc == IMAP_CMD_CONTINUE); if (rc != IMAP_CMD_RESPOND) { - dprint (1, (debugfile, "Error receiving server response.\n")); + debug_print (1, ("Error receiving server response.\n")); gss_release_name (&min_stat, &target_name); goto bail; } @@ -139,7 +142,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) NULL, &send_token, (unsigned int *) &cflags, NULL); if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) { - dprint (1, (debugfile, "Error exchanging credentials\n")); + debug_print (1, ("Error exchanging credentials\n")); gss_release_name (&min_stat, &target_name); goto err_abort_cmd; @@ -147,7 +150,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length, sizeof (buf1) - 2); gss_release_buffer (&min_stat, &send_token); - safe_strcat (buf1, sizeof (buf1), "\r\n"); + str_cat (buf1, sizeof (buf1), "\r\n"); mutt_socket_write (idata->conn, buf1); } @@ -159,7 +162,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) while (rc == IMAP_CMD_CONTINUE); if (rc != IMAP_CMD_RESPOND) { - dprint (1, (debugfile, "Error receiving server response.\n")); + debug_print (1, ("Error receiving server response.\n")); goto bail; } request_buf.length = mutt_from_base64 (buf2, idata->cmd.buf + 2); @@ -168,16 +171,16 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) maj_stat = gss_unwrap (&min_stat, context, &request_buf, &send_token, &cflags, &quality); if (maj_stat != GSS_S_COMPLETE) { - dprint (2, (debugfile, "Couldn't unwrap security level data\n")); + debug_print (2, ("Couldn't unwrap security level data\n")); gss_release_buffer (&min_stat, &send_token); goto err_abort_cmd; } - dprint (2, (debugfile, "Credential exchange complete\n")); + debug_print (2, ("Credential exchange complete\n")); /* first octet is security levels supported. We want NONE */ server_conf_flags = ((char *) send_token.value)[0]; if (!(((char *) send_token.value)[0] & GSS_AUTH_P_NONE)) { - dprint (2, (debugfile, "Server requires integrity or privacy\n")); + debug_print (2, ("Server requires integrity or privacy\n")); gss_release_buffer (&min_stat, &send_token); goto err_abort_cmd; } @@ -186,11 +189,11 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) ((char *) send_token.value)[0] = 0; buf_size = ntohl (*((long *) send_token.value)); gss_release_buffer (&min_stat, &send_token); - dprint (2, (debugfile, "Unwrapped security level flags: %c%c%c\n", + debug_print (2, ("Unwrapped security level flags: %c%c%c\n", server_conf_flags & GSS_AUTH_P_NONE ? 'N' : '-', server_conf_flags & GSS_AUTH_P_INTEGRITY ? 'I' : '-', server_conf_flags & GSS_AUTH_P_PRIVACY ? 'P' : '-')); - dprint (2, (debugfile, "Maximum GSS token size is %ld\n", buf_size)); + debug_print (2, ("Maximum GSS token size is %ld\n", buf_size)); /* agree to terms (hack!) */ buf_size = htonl (buf_size); /* not relevant without integrity/privacy */ @@ -199,19 +202,18 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) /* server decides if principal can log in as user */ strncpy (buf1 + 4, idata->conn->account.user, sizeof (buf1) - 4); request_buf.value = buf1; - request_buf.length = 4 + strlen (idata->conn->account.user) + 1; + request_buf.length = 4 + str_len (idata->conn->account.user) + 1; maj_stat = gss_wrap (&min_stat, context, 0, GSS_C_QOP_DEFAULT, &request_buf, &cflags, &send_token); if (maj_stat != GSS_S_COMPLETE) { - dprint (2, (debugfile, "Error creating login request\n")); + debug_print (2, ("Error creating login request\n")); goto err_abort_cmd; } mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length, sizeof (buf1) - 2); - dprint (2, (debugfile, "Requesting authorisation as %s\n", - idata->conn->account.user)); - safe_strcat (buf1, sizeof (buf1), "\r\n"); + debug_print (2, ("Requesting authorisation as %s\n", idata->conn->account.user)); + str_cat (buf1, sizeof (buf1), "\r\n"); mutt_socket_write (idata->conn, buf1); /* Joy of victory or agony of defeat? */ @@ -219,15 +221,15 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method) rc = imap_cmd_step (idata); while (rc == IMAP_CMD_CONTINUE); if (rc == IMAP_CMD_RESPOND) { - dprint (1, (debugfile, "Unexpected server continuation request.\n")); + debug_print (1, ("Unexpected server continuation request.\n")); goto err_abort_cmd; } if (imap_code (idata->cmd.buf)) { /* flush the security context */ - dprint (2, (debugfile, "Releasing GSS credentials\n")); + debug_print (2, ("Releasing GSS credentials\n")); maj_stat = gss_delete_sec_context (&min_stat, &context, &send_token); if (maj_stat != GSS_S_COMPLETE) - dprint (1, (debugfile, "Error releasing credentials\n")); + debug_print (1, ("Error releasing credentials\n")); /* send_token may contain a notification to the server to flush * credentials. RFC 1731 doesn't specify what to do, and since this