kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_http_media_cache.c: Compare unaltered MIME types.

Browse Source 
Rather than stripping parameters from Content-Type headers before
comparison, first try to compare the whole string. If no match is
found, strip the parameters and try that way.

ASTERISK-29275 #close

Change-Id: I2963c8ecbb3a9605b78b6421c415108d77a66a0f
This commit is contained in:
Sean Bright
2021-09-10 10:40:00 -04:00
committed by Friendly Automation
parent a65bb134f5
commit b2c834e349
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
res/res_http_media_cache.c
View File

@@ -181,8 +181,10 @@ static char *file_extension_from_url(struct ast_bucket_file *bucket_file, char *
* \brief Normalize the value of a Content-Type header * \brief Normalize the value of a Content-Type header
* *
* This will trim off any optional parameters after the type/subtype. * This will trim off any optional parameters after the type/subtype.
*
* \return 0 if no normalization occurred, otherwise true (non-zero)
*/ */
static void normalize_content_type_header(char *content_type) static int normalize_content_type_header(char *content_type)
{ {
char *params = strchr(content_type, ';'); char *params = strchr(content_type, ';');
@@ -191,7 +193,27 @@ static void normalize_content_type_header(char *content_type)
while (params > content_type && (*params == ' ' || *params == '\t')) { while (params > content_type && (*params == ' ' || *params == '\t')) {
*params-- = 0; *params-- = 0;
} }
return 1;
} }
return 0;
}
static int derive_extension_from_mime_type(const char *mime_type, char *buffer, size_t capacity)
{
int res = 0;
/* Compare the provided Content-Type directly, parameters and all */
res = ast_get_extension_for_mime_type(mime_type, buffer, sizeof(buffer));
if (!res) {
char *m = ast_strdupa(mime_type);
/* Strip MIME type parameters and then check */
if (normalize_content_type_header(m)) {
res = ast_get_extension_for_mime_type(m, buffer, sizeof(buffer));
}
}
return res;
} }
static char *file_extension_from_content_type(struct ast_bucket_file *bucket_file, char *buffer, size_t capacity) static char *file_extension_from_content_type(struct ast_bucket_file *bucket_file, char *buffer, size_t capacity)
@@ -203,28 +225,20 @@ static char *file_extension_from_content_type(struct ast_bucket_file *bucket_fil
* corresponding to the mime-type and use that to rename the file */ * corresponding to the mime-type and use that to rename the file */
struct ast_bucket_metadata *header; struct ast_bucket_metadata *header;
char *mime_type;
header = ast_bucket_file_metadata_get(bucket_file, "content-type"); header = ast_bucket_file_metadata_get(bucket_file, "content-type");
if (!header) { if (!header) {
return NULL; return NULL;
} }
mime_type = ast_strdup(header->value); if (derive_extension_from_mime_type(header->value, buffer, capacity)) {
if (mime_type) { ast_debug(3, "Derived extension '%s' from MIME type %s\n",
normalize_content_type_header(mime_type); buffer,
if (!ast_strlen_zero(mime_type)) { header->value);
if (ast_get_extension_for_mime_type(mime_type, buffer, sizeof(buffer))) { ao2_ref(header, -1);
ast_debug(3, "Derived extension '%s' from MIME type %s\n", return buffer;
buffer,
mime_type);
ast_free(mime_type);
ao2_ref(header, -1);
return buffer;
}
}
} }
ast_free(mime_type);
ao2_ref(header, -1); ao2_ref(header, -1);
return NULL; return NULL;