mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
The ast_sip_sanitize_xml function is used to sanitize a string for placement into XML. This is done by examining an input string and then appending values to an output buffer. The function used by its implementation, strncat, has specific behavior that was not taken into account. If the size of the input string exceeded the available output buffer size it was possible for the sanitization function to write past the output buffer itself causing a crash. The crash would either occur because it was writing into memory it shouldn't be or because the resulting string was not NULL terminated. This change keeps count of how much remaining space is available in the output buffer for text and only allows strncat to use that amount. Since this was exposed by the res_pjsip_pidf_digium_body_supplement module attempting to send a large message the maximum allowed message size has also been increased in it. A unit test has also been added which confirms that the ast_sip_sanitize_xml function is providing NULL terminated output even when the input length exceeds the output buffer size. ASTERISK-25304 #close Change-Id: I743dd9809d3e13d722df1b0509dfe34621398302
175 lines
4.2 KiB
C
175 lines
4.2 KiB
C
/*
|
|
* asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2013, Digium, Inc.
|
|
*
|
|
* Kevin Harwell <kharwell@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
#include "asterisk.h"
|
|
|
|
#include <pjsip.h>
|
|
#include <pjsip_simple.h>
|
|
#include <pjlib.h>
|
|
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/pbx.h"
|
|
#include "asterisk/res_pjsip_presence_xml.h"
|
|
|
|
void ast_sip_sanitize_xml(const char *input, char *output, size_t len)
|
|
{
|
|
char *copy = ast_strdupa(input);
|
|
char *break_point;
|
|
size_t remaining = len - 1;
|
|
|
|
output[0] = '\0';
|
|
|
|
while ((break_point = strpbrk(copy, "<>\"&'\n\r")) && remaining) {
|
|
char to_escape = *break_point;
|
|
|
|
*break_point = '\0';
|
|
strncat(output, copy, remaining);
|
|
|
|
/* The strncat function will write remaining+1 if the string length is
|
|
* equal to or greater than the size provided to it. We take this into
|
|
* account by subtracting 1, which ensures that the NULL byte is written
|
|
* inside of the provided buffer.
|
|
*/
|
|
remaining = len - strlen(output) - 1;
|
|
|
|
switch (to_escape) {
|
|
case '<':
|
|
strncat(output, "<", remaining);
|
|
break;
|
|
case '>':
|
|
strncat(output, ">", remaining);
|
|
break;
|
|
case '"':
|
|
strncat(output, """, remaining);
|
|
break;
|
|
case '&':
|
|
strncat(output, "&", remaining);
|
|
break;
|
|
case '\'':
|
|
strncat(output, "'", remaining);
|
|
break;
|
|
case '\r':
|
|
strncat(output, " ", remaining);
|
|
break;
|
|
case '\n':
|
|
strncat(output, " ", remaining);
|
|
break;
|
|
};
|
|
|
|
copy = break_point + 1;
|
|
remaining = len - strlen(output) - 1;
|
|
}
|
|
|
|
/* Be sure to copy everything after the final bracket */
|
|
if (*copy && remaining) {
|
|
strncat(output, copy, remaining);
|
|
}
|
|
}
|
|
|
|
void ast_sip_presence_exten_state_to_str(int state, char **statestring, char **pidfstate,
|
|
char **pidfnote, enum ast_sip_pidf_state *local_state)
|
|
{
|
|
switch (state) {
|
|
case AST_EXTENSION_RINGING:
|
|
*statestring = "early";
|
|
*local_state = NOTIFY_INUSE;
|
|
*pidfstate = "busy";
|
|
*pidfnote = "Ringing";
|
|
break;
|
|
case AST_EXTENSION_INUSE:
|
|
*statestring = "confirmed";
|
|
*local_state = NOTIFY_INUSE;
|
|
*pidfstate = "busy";
|
|
*pidfnote = "On the phone";
|
|
break;
|
|
case AST_EXTENSION_BUSY:
|
|
*statestring = "confirmed";
|
|
*local_state = NOTIFY_CLOSED;
|
|
*pidfstate = "busy";
|
|
*pidfnote = "On the phone";
|
|
break;
|
|
case AST_EXTENSION_UNAVAILABLE:
|
|
*statestring = "terminated";
|
|
*local_state = NOTIFY_CLOSED;
|
|
*pidfstate = "away";
|
|
*pidfnote = "Unavailable";
|
|
break;
|
|
case AST_EXTENSION_ONHOLD:
|
|
*statestring = "confirmed";
|
|
*local_state = NOTIFY_CLOSED;
|
|
*pidfstate = "busy";
|
|
*pidfnote = "On hold";
|
|
break;
|
|
case AST_EXTENSION_NOT_INUSE:
|
|
default:
|
|
/* Default setting */
|
|
*statestring = "terminated";
|
|
*local_state = NOTIFY_OPEN;
|
|
*pidfstate = "--";
|
|
*pidfnote ="Ready";
|
|
break;
|
|
}
|
|
}
|
|
|
|
pj_xml_attr *ast_sip_presence_xml_create_attr(pj_pool_t *pool,
|
|
pj_xml_node *node, const char *name, const char *value)
|
|
{
|
|
pj_xml_attr *attr = PJ_POOL_ALLOC_T(pool, pj_xml_attr);
|
|
|
|
pj_strdup2(pool, &attr->name, name);
|
|
pj_strdup2(pool, &attr->value, value);
|
|
|
|
pj_xml_add_attr(node, attr);
|
|
return attr;
|
|
}
|
|
|
|
pj_xml_node *ast_sip_presence_xml_create_node(pj_pool_t *pool,
|
|
pj_xml_node *parent, const char* name)
|
|
{
|
|
pj_xml_node *node = PJ_POOL_ALLOC_T(pool, pj_xml_node);
|
|
|
|
pj_list_init(&node->attr_head);
|
|
pj_list_init(&node->node_head);
|
|
|
|
pj_strdup2(pool, &node->name, name);
|
|
|
|
node->content.ptr = NULL;
|
|
node->content.slen = 0;
|
|
|
|
if (parent) {
|
|
pj_xml_add_node(parent, node);
|
|
}
|
|
|
|
return node;
|
|
}
|
|
|
|
void ast_sip_presence_xml_find_node_attr(pj_pool_t* pool,
|
|
pj_xml_node *parent, const char *node_name, const char *attr_name,
|
|
pj_xml_node **node, pj_xml_attr **attr)
|
|
{
|
|
pj_str_t name;
|
|
|
|
if (!(*node = pj_xml_find_node(parent, pj_cstr(&name, node_name)))) {
|
|
*node = ast_sip_presence_xml_create_node(pool, parent, node_name);
|
|
}
|
|
|
|
if (!(*attr = pj_xml_find_attr(*node, pj_cstr(&name, attr_name), NULL))) {
|
|
*attr = ast_sip_presence_xml_create_attr(pool, *node, attr_name, "");
|
|
}
|
|
}
|