Merged revisions 221153,221157,221303 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r221153 | mnick | 2009-09-30 10:37:39 -0500 (Wed, 30 Sep 2009) | 2 lines

  check bounds - prevents for buffer overflow
........
  r221157 | mnick | 2009-09-30 10:41:46 -0500 (Wed, 30 Sep 2009) | 8 lines

  added a new dialplan function 'CSV_QUOTE' and changed the cdr_custom.sample.conf

  (closes issue #15471)
  Reported by: dkerr
  Patches:
        csv_quote_14.txt uploaded by mnick (license )
  Tested by: mnick
........
  r221303 | mnick | 2009-09-30 14:02:00 -0500 (Wed, 30 Sep 2009) | 2 lines

  changed the prototype definition of csv_quote
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@221368 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/cdr_custom.conf.sample b/configs/cdr_custom.conf.sample
index 3df11f296b405e056b657199bd1d0506c975e96b..4a533a462b7c1bae3d0026d3139eb2187752df02 100644 (file)
--- a/configs/cdr_custom.conf.sample
+++ b/configs/cdr_custom.conf.sample
@@ -7,6 +7,6 @@
 ; Master.csv, Simple.csv, or both.
 ;
 ;[mappings]
-;Master.csv => "${CDR(clid)}","${CDR(src)}","${CDR(dst)}","${CDR(dcontext)}","${CDR(channel)}","${CDR(dstchannel)}","${CDR(lastapp)}","${CDR(lastdata)}","${CDR(start)}","${CDR(answer)}","${CDR(end)}","${CDR(duration)}","${CDR(billsec)}","${CDR(disposition)}","${CDR(amaflags)}","${CDR(accountcode)}","${CDR(uniqueid)}","${CDR(userfield)}"
-;Simple.csv => "${EPOCH}","${CDR(src)}","${CDR(dst)}"
+;Master.csv => ${CSV_QUOTE(${CDR(clid)})},${CSV_QUOTE(${CDR(src)})},${CSV_QUOTE(${CDR(dst)})},${CSV_QUOTE(${CDR(dcontext)})},${CSV_QUOTE(${CDR(channel)})},${CSV_QUOTE(${CDR(dstchannel)})},${CSV_QUOTE(${CDR(lastapp)})},${CSV_QUOTE(${CDR(lastdata)})},${CSV_QUOTE(${CDR(start)})},${CSV_QUOTE(${CDR(answer)})},${CSV_QUOTE(${CDR(end)})},${CSV_QUOTE(${CDR(duration)})},${CSV_QUOTE(${CDR(billsec)})},${CSV_QUOTE(${CDR(disposition)})},${CSV_QUOTE(${CDR(amaflags)})},${CSV_QUOTE(${CDR(accountcode)})},${CSV_QUOTE(${CDR(uniqueid)})},${CSV_QUOTE(${CDR(userfield)})}
+;Simple.csv => ${CSV_QUOTE(${EPOCH})},${CSV_QUOTE(${CDR(src)})},${CSV_QUOTE(${CDR(dst)})}
 

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 9fc8577f679b335a015930d32288e30e872b2328..86336002fe8553e5e239117b7d374e34ea0e59d9 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -276,6 +276,17 @@ AST_THREADSTORAGE(result_buf);
                        <para>Example: ${QUOTE(ab"c"de)} will return "abcde"</para>
                </description>
        </function>
+       <function name="CSV_QUOTE" language="en_US">
+               <synopsis>
+                       Quotes a given string for use in a CSV file, escaping embedded quotes as necessary
+               </synopsis>
+               <syntax>
+                       <parameter name="string" required="true" />
+               </syntax>
+               <description>
+                       <para>Example: ${CSV_QUOTE("a,b" 123)} will return """a,b"" 123"</para>
+               </description>
+       </function>
        <function name="SHIFT" language="en_US">
                <synopsis>
                        Removes and returns the first item off of a variable containing delimited text
@@ -862,6 +873,12 @@ static struct ast_custom_function array_function = {
 static int quote(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
 {
        char *bufptr = buf, *dataptr = data;
+
+       if (len < 3){ /* at least two for quotes and one for binary zero */
+               ast_log(LOG_ERROR, "Not enough buffer");
+               return -1;
+       }
+
        if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "No argument specified!\n");
                ast_copy_string(buf, "\"\"", len);
@@ -869,7 +886,7 @@ static int quote(struct ast_channel *chan, const char *cmd, char *data, char *bu
        }
 
        *bufptr++ = '"';
-       for (; bufptr < buf + len - 1; dataptr++) {
+       for (; bufptr < buf + len - 3; dataptr++) {
                if (*dataptr == '\\') {
                        *bufptr++ = '\\';
                        *bufptr++ = '\\';
@@ -892,9 +909,43 @@ static struct ast_custom_function quote_function = {
        .read = quote,
 };
 
+static int csv_quote(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
+{
+       char *bufptr = buf, *dataptr = data;
+
+       if (len < 3){ /* at least two for quotes and one for binary zero */
+               ast_log(LOG_ERROR, "Not enough buffer");
+               return -1;
+       }
+
+       if (ast_strlen_zero(data)) {
+               ast_log(LOG_WARNING, "No argument specified!\n");
+               ast_copy_string(buf,"\"\"",len);
+               return 0;
+       }
+
+       *bufptr++ = '"';
+       for (; bufptr < buf + len - 3; dataptr++){
+               if (*dataptr == '"') {
+                       *bufptr++ = '"';
+                       *bufptr++ = '"';
+               } else if (*dataptr == '\0') {
+                       break;
+               } else {
+                       *bufptr++ = *dataptr;
+               }
+       }
+       *bufptr++ = '"';
+       *bufptr='\0';
+       return 0;
+}
+
+static struct ast_custom_function csv_quote_function = {
+       .name = "CSV_QUOTE",
+       .read = csv_quote,
+};
 
-static int len(struct ast_channel *chan, const char *cmd, char *data, char *buf,
-              size_t buflen)
+static int len(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t buflen)
 {
        int length = 0;
 
@@ -1262,6 +1313,7 @@ static int unload_module(void)
        res |= ast_custom_function_unregister(&regex_function);
        res |= ast_custom_function_unregister(&array_function);
        res |= ast_custom_function_unregister(&quote_function);
+       res |= ast_custom_function_unregister(&csv_quote_function);
        res |= ast_custom_function_unregister(&len_function);
        res |= ast_custom_function_unregister(&strftime_function);
        res |= ast_custom_function_unregister(&strptime_function);
@@ -1290,6 +1342,7 @@ static int load_module(void)
        res |= ast_custom_function_register(&regex_function);
        res |= ast_custom_function_register(&array_function);
        res |= ast_custom_function_register(&quote_function);
+       res |= ast_custom_function_register(&csv_quote_function);
        res |= ast_custom_function_register(&len_function);
        res |= ast_custom_function_register(&strftime_function);
        res |= ast_custom_function_register(&strptime_function);