Merged revisions 374586 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r374586 | dlee | 2012-10-05 15:23:14 -0500 (Fri, 05 Oct 2012) | 34 lines

  Multiple revisions 374570,374581

  ........
    r374570 | dlee | 2012-10-05 15:14:41 -0500 (Fri, 05 Oct 2012) | 22 lines

    Improve AMI long line error handling

    In AMI's parser, when it receives a long line (> 1024 characters), it discards
    that line, but continues to process the message normally.

    Typically, this is not a problem because a) who has lines that long and b)
    usually a discarded line results in an invalid message. But if that line is
    specifying an optional field, then the message will be processed, you get a
    'Response: Success', but things don't work the way you expected them to.

    This patch changes the behavior when a line-too-long parse error occurs.

    * Changes the log message to avoid way-too-long (and truncated anyways) log
      messages
    * Adds a 'parsing' status flag to Response: Success
    * Sets parsing = MESSAGE_LINE_TOO_LONG if, well, a line is too long
    * Responds with an appropriate error if parsing != MESSAGE_OKAY

    (closes issue AST-961)
    Reported by: John Bigelow
    Review: https://reviewboard.asterisk.org/r/2142/
  ........
    r374581 | dlee | 2012-10-05 15:20:28 -0500 (Fri, 05 Oct 2012) | 1 line

    I've committed too much. Reverting part of r374570.
  ........

  Merged revisions 374570,374581 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@374610 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index 09fb51f8d681726ca32c6b3a758f369f16b5eb7f..a8e48c25e0fa0665b547af703c111b59ab1cebfc 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -1038,6 +1038,11 @@ struct mansession_session {
        AST_LIST_ENTRY(mansession_session) list;
 };
 
+enum mansession_message_parsing {
+       MESSAGE_OKAY,
+       MESSAGE_LINE_TOO_LONG
+};
+
 /*! \brief In case you didn't read that giant block of text above the mansession_session struct, the
  * \ref struct mansession is named this solely to keep the API the same in Asterisk. This structure really
  * represents data that is different from Manager action to Manager action. The mansession_session pointer
@@ -1048,6 +1053,7 @@ struct mansession {
        struct ast_tcptls_session_instance *tcptls_session;
        FILE *f;
        int fd;
+       enum mansession_message_parsing parsing;
        int write_error:1;
        struct manager_custom_hook *hook;
        ast_mutex_t lock;
@@ -4941,8 +4947,9 @@ static int get_input(struct mansession *s, char *output)
        }
        if (s->session->inlen >= maxlen) {
                /* no crlf found, and buffer full - sorry, too long for us */
-               ast_log(LOG_WARNING, "Dumping long line with no return from %s: %s\n", ast_inet_ntoa(s->session->sin.sin_addr), src);
+               ast_log(LOG_WARNING, "Discarding message from %s. Line too long: %.25s...\n", ast_inet_ntoa(s->session->sin.sin_addr), src);
                s->session->inlen = 0;
+               s->parsing = MESSAGE_LINE_TOO_LONG;
        }
        res = 0;
        while (res == 0) {
@@ -4999,6 +5006,23 @@ static int get_input(struct mansession *s, char *output)
        return res;
 }
 
+/*!
+ * \internal
+ * \brief Error handling for sending parse errors. This function handles locking, and clearing the
+ * parse error flag.
+ *
+ * \param s AMI session to process action request.
+ * \param m Message that's in error.
+ * \param error Error message to send.
+ */
+static void handle_parse_error(struct mansession *s, struct message *m, char *error)
+{
+       mansession_lock(s);
+       astman_send_error(s, m, error);
+       s->parsing = MESSAGE_OKAY;
+       mansession_unlock(s);
+}
+
 /*!
  * \internal
  * \brief Read and process an AMI action request.
@@ -5052,7 +5076,15 @@ static int do_message(struct mansession *s)
                                        mansession_unlock(s);
                                        res = 0;
                                } else {
-                                       res = process_message(s, &m) ? -1 : 0;
+                                       switch (s->parsing) {
+                                       case MESSAGE_OKAY:
+                                               res = process_message(s, &m) ? -1 : 0;
+                                               break;
+                                       case MESSAGE_LINE_TOO_LONG:
+                                               handle_parse_error(s, &m, "Failed to parse message: line too long");
+                                               res = 0;
+                                               break;
+                                       }
                                }
                                break;
                        } else if (m.hdrcount < ARRAY_LEN(m.headers)) {