Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "voicemail: Fix various abuses of mkstemp" into 13

Browse Source
certified/13.18
Jenkins2 8 years ago committed by Gerrit Code Review
parent 71cc740828 9e6efcace5
commit 378e0f7764
2 changed files with 137 additions and 78 deletions
Show Stats Download Patch File Download Diff File

121
apps/app_minivm.c
Unescape View File

@ -1234,6 +1234,8 @@ static const char *ast_str_quote(struct ast_str **buf, ssize_t maxlen, const cha
* \brief Send voicemail with audio file as an attachment */ * \brief Send voicemail with audio file as an attachment */
static int sendmail(struct minivm_template *template, struct minivm_account *vmu, char *cidnum, char *cidname, const char *filename, char *format, int duration, int attach_user_voicemail, enum mvm_messagetype type, const char *counter) static int sendmail(struct minivm_template *template, struct minivm_account *vmu, char *cidnum, char *cidname, const char *filename, char *format, int duration, int attach_user_voicemail, enum mvm_messagetype type, const char *counter)
{ {
RAII_VAR(struct ast_str *, str1, ast_str_create(16), ast_free);
RAII_VAR(struct ast_str *, str2, ast_str_create(16), ast_free);
FILE *p = NULL; FILE *p = NULL;
int pfd; int pfd;
char email[256] = ""; char email[256] = "";
@ -1243,20 +1245,18 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
char fname[PATH_MAX]; char fname[PATH_MAX];
char dur[PATH_MAX]; char dur[PATH_MAX];
char tmp[80] = "/tmp/astmail-XXXXXX"; char tmp[80] = "/tmp/astmail-XXXXXX";
char tmp2[PATH_MAX]; char mail_cmd_buffer[PATH_MAX];
char newtmp[PATH_MAX]; /* Only used with volgain */ char sox_gain_tmpdir[PATH_MAX] = ""; /* Only used with volgain */
char *file_to_delete = NULL, *dir_to_delete = NULL;
struct timeval now; struct timeval now;
struct ast_tm tm; struct ast_tm tm;
struct minivm_zone *the_zone = NULL; struct minivm_zone *the_zone = NULL;
struct ast_channel *ast; struct ast_channel *chan = NULL;
char *finalfilename = "";
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *fromaddress; char *fromaddress;
char *fromemail; char *fromemail;
int res;
if (!str1 || !str2) { if (!str1 || !str2) {
ast_free(str1);
ast_free(str2);
return -1; return -1;
} }
@ -1271,9 +1271,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
if (ast_strlen_zero(email)) { if (ast_strlen_zero(email)) {
ast_log(LOG_WARNING, "No address to send message to.\n"); ast_log(LOG_WARNING, "No address to send message to.\n");
ast_free(str1); return -1;
ast_free(str2);
return -1;
} }
ast_debug(3, "Sending mail to %s@%s - Using template %s\n", vmu->username, vmu->domain, template->name); ast_debug(3, "Sending mail to %s@%s - Using template %s\n", vmu->username, vmu->domain, template->name);
@ -1281,35 +1279,30 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
if (!strcmp(format, "wav49")) if (!strcmp(format, "wav49"))
format = "WAV"; format = "WAV";
/* If we have a gain option, process it now with sox */ /* If we have a gain option, process it now with sox */
if (type == MVM_MESSAGE_EMAIL && (vmu->volgain < -.001 || vmu->volgain > .001) ) { if (type == MVM_MESSAGE_EMAIL && (vmu->volgain < -.001 || vmu->volgain > .001) ) {
char tmpcmd[PATH_MAX]; char sox_gain_cmd[PATH_MAX];
int tmpfd;
ast_copy_string(sox_gain_tmpdir, "/tmp/minivm-gain-XXXXXX", sizeof(sox_gain_tmpdir));
ast_copy_string(newtmp, "/tmp/XXXXXX", sizeof(newtmp)); ast_debug(3, "sox_gain_tmpdir: %s\n", sox_gain_tmpdir);
ast_debug(3, "newtmp: %s\n", newtmp); if (!mkdtemp(sox_gain_tmpdir)) {
tmpfd = mkstemp(newtmp); ast_log(LOG_WARNING, "Failed to create temporary directory for volgain: %d\n", errno);
if (tmpfd < 0) {
ast_log(LOG_WARNING, "Failed to create temporary file for volgain: %d\n", errno);
ast_free(str1);
ast_free(str2);
return -1; return -1;
} }
snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, filename, format, newtmp, format); snprintf(fname, sizeof(fname), "%s/output.%s", sox_gain_tmpdir, format);
ast_safe_system(tmpcmd); snprintf(sox_gain_cmd, sizeof(sox_gain_cmd), "sox -v %.4f %s.%s %s", vmu->volgain, filename, format, fname);
close(tmpfd); ast_safe_system(sox_gain_cmd);
finalfilename = newtmp;
ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username); ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username);
/* Mark some things for deletion */
file_to_delete = fname;
dir_to_delete = sox_gain_tmpdir;
} else { } else {
finalfilename = ast_strdupa(filename); snprintf(fname, sizeof(fname), "%s.%s", filename, format);
} }
/* Create file name */
snprintf(fname, sizeof(fname), "%s.%s", finalfilename, format);
if (template->attachment) if (template->attachment)
ast_debug(1, "Attaching file '%s', format '%s', uservm is '%d'\n", finalfilename, format, attach_user_voicemail); ast_debug(1, "Attaching file '%s', format '%s', uservm is '%d'\n", fname, format, attach_user_voicemail);
/* Make a temporary file instead of piping directly to sendmail, in case the mail /* Make a temporary file instead of piping directly to sendmail, in case the mail
command hangs */ command hangs */
@ -1324,16 +1317,12 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
} }
if (!p) { if (!p) {
ast_log(LOG_WARNING, "Unable to open temporary file '%s'\n", tmp); ast_log(LOG_WARNING, "Unable to open temporary file '%s'\n", tmp);
ast_free(str1); goto out;
ast_free(str2);
return -1;
} }
/* Allocate channel used for chanvar substitution */ /* Allocate channel used for chanvar substitution */
ast = ast_dummy_channel_alloc(); chan = ast_dummy_channel_alloc();
if (!ast) { if (!chan) {
ast_free(str1); goto out;
ast_free(str2);
return -1;
} }
snprintf(dur, sizeof(dur), "%d:%02d", duration / 60, duration % 60); snprintf(dur, sizeof(dur), "%d:%02d", duration / 60, duration % 60);
@ -1361,9 +1350,8 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
/* Set date format for voicemail mail */ /* Set date format for voicemail mail */
ast_strftime(date, sizeof(date), template->dateformat, &tm); ast_strftime(date, sizeof(date), template->dateformat, &tm);
/* Populate channel with channel variables for substitution */ /* Populate channel with channel variables for substitution */
prep_email_sub_vars(ast, vmu, cidnum, cidname, dur, date, counter); prep_email_sub_vars(chan, vmu, cidnum, cidname, dur, date, counter);
/* Find email address to use */ /* Find email address to use */
/* If there's a server e-mail address in the account, use that, othterwise template */ /* If there's a server e-mail address in the account, use that, othterwise template */
@ -1388,7 +1376,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
fprintf(p, "From: Asterisk PBX <%s>\n", who); fprintf(p, "From: Asterisk PBX <%s>\n", who);
} else { } else {
ast_debug(4, "Fromaddress template: %s\n", fromaddress); ast_debug(4, "Fromaddress template: %s\n", fromaddress);
ast_str_substitute_variables(&str1, 0, ast, fromaddress); ast_str_substitute_variables(&str1, 0, chan, fromaddress);
if (check_mime(ast_str_buffer(str1))) { if (check_mime(ast_str_buffer(str1))) {
int first_line = 1; int first_line = 1;
char *ptr; char *ptr;
@ -1431,7 +1419,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
} }
if (!ast_strlen_zero(template->subject)) { if (!ast_strlen_zero(template->subject)) {
ast_str_substitute_variables(&str1, 0, ast, template->subject); ast_str_substitute_variables(&str1, 0, chan, template->subject);
if (check_mime(ast_str_buffer(str1))) { if (check_mime(ast_str_buffer(str1))) {
int first_line = 1; int first_line = 1;
char *ptr; char *ptr;
@ -1464,7 +1452,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
fprintf(p, "--%s\n", bound); fprintf(p, "--%s\n", bound);
fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", template->charset); fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", template->charset);
if (!ast_strlen_zero(template->body)) { if (!ast_strlen_zero(template->body)) {
ast_str_substitute_variables(&str1, 0, ast, template->body); ast_str_substitute_variables(&str1, 0, chan, template->body);
ast_debug(3, "Message now: %s\n-----\n", ast_str_buffer(str1)); ast_debug(3, "Message now: %s\n-----\n", ast_str_buffer(str1));
fprintf(p, "%s\n", ast_str_buffer(str1)); fprintf(p, "%s\n", ast_str_buffer(str1));
} else { } else {
@ -1491,14 +1479,45 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
fprintf(p, "\n\n--%s--\n.\n", bound); fprintf(p, "\n\n--%s--\n.\n", bound);
} }
fclose(p); fclose(p);
snprintf(tmp2, sizeof(tmp2), "( %s < %s ; rm -f %s ) &", global_mailcmd, tmp, tmp);
ast_safe_system(tmp2); chan = ast_channel_unref(chan);
ast_debug(1, "Sent message to %s with command '%s' - %s\n", vmu->email, global_mailcmd, template->attachment ? "(media attachment)" : "");
ast_debug(3, "Actual command used: %s\n", tmp2); if (file_to_delete && dir_to_delete) {
ast = ast_channel_unref(ast); /* We can't delete these files ourselves because the mail command will execute in
ast_free(str1); the background and we'll end up deleting them out from under it. */
ast_free(str2); res = snprintf(mail_cmd_buffer, sizeof(mail_cmd_buffer),
return 0; "( %s < %s ; rm -f %s %s ; rmdir %s ) &",
global_mailcmd, tmp, tmp, file_to_delete, dir_to_delete);
} else {
res = snprintf(mail_cmd_buffer, sizeof(mail_cmd_buffer),
"( %s < %s ; rm -f %s ) &",
global_mailcmd, tmp, tmp);
}
if (res < sizeof(mail_cmd_buffer)) {
file_to_delete = dir_to_delete = NULL;
} else {
ast_log(LOG_ERROR, "Could not send message, command line too long\n");
res = -1;
goto out;
}
ast_safe_system(mail_cmd_buffer);
ast_debug(1, "Sent message to %s with command '%s'%s\n", vmu->email, global_mailcmd, template->attachment ? " - (media attachment)" : "");
ast_debug(3, "Actual command used: %s\n", mail_cmd_buffer);
res = 0;
out:
if (file_to_delete) {
unlink(file_to_delete);
}
if (dir_to_delete) {
rmdir(dir_to_delete);
}
return res;
} }
/*!\internal /*!\internal

94
apps/app_voicemail.c
Unescape View File

@ -5372,55 +5372,95 @@ plain_message:
static int add_email_attachment(FILE *p, struct ast_vm_user *vmu, char *format, char *attach, char *greeting_attachment, char *mailbox, char *bound, char *filename, int last, int msgnum) static int add_email_attachment(FILE *p, struct ast_vm_user *vmu, char *format, char *attach, char *greeting_attachment, char *mailbox, char *bound, char *filename, int last, int msgnum)
{ {
char tmpdir[256], newtmp[256]; char fname[PATH_MAX] = "";
char fname[256]; char *file_to_delete = NULL, *dir_to_delete = NULL;
char tmpcmd[256]; int res;
int tmpfd = -1;
int soxstatus = 0;
/* Eww. We want formats to tell us their own MIME type */ /* Eww. We want formats to tell us their own MIME type */
char *ctype = (!strcasecmp(format, "ogg")) ? "application/" : "audio/x-"; char *mime_type = (!strcasecmp(format, "ogg")) ? "application/" : "audio/x-";
/* This 'while' loop will only execute once. We use it so that we can 'break' */
while (vmu->volgain < -.001 || vmu->volgain > .001) {
char tmpdir[PATH_MAX];
char sox_gain_tmpdir[PATH_MAX];
if (vmu->volgain < -.001 || vmu->volgain > .001) {
create_dirpath(tmpdir, sizeof(tmpdir), vmu->context, vmu->mailbox, "tmp"); create_dirpath(tmpdir, sizeof(tmpdir), vmu->context, vmu->mailbox, "tmp");
snprintf(newtmp, sizeof(newtmp), "%s/XXXXXX", tmpdir);
tmpfd = mkstemp(newtmp); res = snprintf(sox_gain_tmpdir, sizeof(sox_gain_tmpdir), "%s/vm-gain-XXXXXX", tmpdir);
chmod(newtmp, VOICEMAIL_FILE_MODE & ~my_umask); if (res >= sizeof(sox_gain_tmpdir)) {
ast_debug(3, "newtmp: %s\n", newtmp); ast_log(LOG_ERROR, "Failed to create temporary directory path %s: Out of buffer space\n", tmpdir);
if (tmpfd > -1) { break;
snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format); }
if ((soxstatus = ast_safe_system(tmpcmd)) == 0) {
attach = newtmp; if (mkdtemp(sox_gain_tmpdir)) {
ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox); int soxstatus = 0;
char sox_gain_cmd[PATH_MAX];
ast_debug(3, "sox_gain_tmpdir: %s\n", sox_gain_tmpdir);
/* Save for later */
dir_to_delete = sox_gain_tmpdir;
res = snprintf(fname, sizeof(fname), "%s/output.%s", sox_gain_tmpdir, format);
if (res >= sizeof(fname)) {
ast_log(LOG_ERROR, "Failed to create filename buffer for %s/output.%s: Too long\n", sox_gain_tmpdir, format);
break;
}
res = snprintf(sox_gain_cmd, sizeof(sox_gain_cmd), "sox -v %.4f %s.%s %s",
vmu->volgain, attach, format, fname);
if (res >= sizeof(sox_gain_cmd)) {
ast_log(LOG_ERROR, "Failed to generate sox command, out of buffer space\n");
break;
}
soxstatus = ast_safe_system(sox_gain_cmd);
if (!soxstatus) {
/* Save for later */
file_to_delete = fname;
ast_debug(3, "VOLGAIN: Stored at: %s - Level: %.4f - Mailbox: %s\n", fname, vmu->volgain, mailbox);
} else { } else {
ast_log(LOG_WARNING, "Sox failed to re-encode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format, ast_log(LOG_WARNING, "Sox failed to re-encode %s: %s (have you installed support for all sox file formats?)\n",
soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing"); fname,
soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing");
ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n"); ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n");
} }
} }
break;
}
if (!file_to_delete) {
res = snprintf(fname, sizeof(fname), "%s.%s", attach, format);
if (res >= sizeof(fname)) {
ast_log(LOG_ERROR, "Failed to create filename buffer for %s.%s: Too long\n", attach, format);
return -1;
}
} }
fprintf(p, "--%s" ENDL, bound); fprintf(p, "--%s" ENDL, bound);
if (msgnum > -1) if (msgnum > -1)
fprintf(p, "Content-Type: %s%s; name=\"%s\"" ENDL, ctype, format, filename); fprintf(p, "Content-Type: %s%s; name=\"%s\"" ENDL, mime_type, format, filename);
else else
fprintf(p, "Content-Type: %s%s; name=\"%s.%s\"" ENDL, ctype, format, greeting_attachment, format); fprintf(p, "Content-Type: %s%s; name=\"%s.%s\"" ENDL, mime_type, format, greeting_attachment, format);
fprintf(p, "Content-Transfer-Encoding: base64" ENDL); fprintf(p, "Content-Transfer-Encoding: base64" ENDL);
fprintf(p, "Content-Description: Voicemail sound attachment." ENDL); fprintf(p, "Content-Description: Voicemail sound attachment." ENDL);
if (msgnum > -1) if (msgnum > -1)
fprintf(p, "Content-Disposition: attachment; filename=\"%s\"" ENDL ENDL, filename); fprintf(p, "Content-Disposition: attachment; filename=\"%s\"" ENDL ENDL, filename);
else else
fprintf(p, "Content-Disposition: attachment; filename=\"%s.%s\"" ENDL ENDL, greeting_attachment, format); fprintf(p, "Content-Disposition: attachment; filename=\"%s.%s\"" ENDL ENDL, greeting_attachment, format);
snprintf(fname, sizeof(fname), "%s.%s", attach, format);
base_encode(fname, p); base_encode(fname, p);
if (last) if (last)
fprintf(p, ENDL ENDL "--%s--" ENDL "." ENDL, bound); fprintf(p, ENDL ENDL "--%s--" ENDL "." ENDL, bound);
if (tmpfd > -1) {
if (soxstatus == 0) { if (file_to_delete) {
unlink(fname); unlink(file_to_delete);
}
close(tmpfd);
unlink(newtmp);
} }
if (dir_to_delete) {
rmdir(dir_to_delete);
}
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save