git:4.0: Merge branch 'luismartingil/msrp_crash' - sr-dev

17 Apr 2014

Module: sip-router
Branch: 4.0
Commit: 577d0a83bab49e723a0be8b1ef8f3005e039bad6
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=577d0a83...
Author: Luis Martin Gil martingil.luis@gmail.com
Committer: Luis Martin Gil martingil.luis@gmail.com
Date:   Thu Apr 17 12:56:11 2014 +0000
Merge branch 'luismartingil/msrp_crash'
(cherry picked from commit 4a9a98a07869a2415b82b70b23907ccd490d6c12)
---
modules/msrp/msrp_parser.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c
index d7a2ced..fc81798 100644
--- a/modules/msrp/msrp_parser.c
+++ b/modules/msrp/msrp_parser.c
@@ -81,7 +81,7 @@ int msrp_parse_frame(msrp_frame_t *mf)
    }
    if(msrp_parse_headers(mf)<0)
    {
-		LM_ERR("unable to parse first line\n");
+		LM_ERR("unable to parse headers\n");
    	return -1;
    }
    return 0;
@@ -220,6 +220,9 @@ int msrp_parse_headers(msrp_frame_t *mf)
    char *s; /* start for search */
    msrp_hdr_t *hdr;
    msrp_hdr_t *last;
+	int fpath = 0; /* From path set */
+	int tpath = 0; /* To path set */
+	int any = 0; /* Any header set */
/* already parsed?!? */
    if(mf->headers != NULL)
@@ -290,13 +293,48 @@ int msrp_parse_headers(msrp_frame_t *mf)
    		last = hdr;
    	}
    	msrp_hdr_set_type(hdr);
-	
+
+		/* Checking for well-formed MSRP rfc4975 messages */
+		if (hdr->htype == MSRP_HDR_TO_PATH) {
+			if (tpath) {
+				LM_ERR("broken msrp frame message, Multiple To-Path not allowed.\n");
+				return -1;				
+			} else if (fpath || any) {
+				LM_ERR("broken msrp frame message, To-Path must be the first header.\n");
+				return -1;
+			} else {
+				tpath = 1;
+			}
+		} else if (hdr->htype == MSRP_HDR_FROM_PATH) {
+			if (fpath) {
+				LM_ERR("broken msrp frame message, Multiple From-Path not allowed.\n");
+				return -1;
+			} else if (!tpath || any) {
+				LM_ERR("broken msrp frame message, From-Path must be after To-Path.\n");
+				return -1;
+			} else {
+				fpath = 1;
+			}
+		} else {
+			if (!tpath || !fpath) {
+				LM_ERR("broken msrp frame message, To-Path and From-Path must be defined before any header.\n");
+				return -1;
+			} else {
+				any = 1;
+			}
+		}
+		
    	LM_DBG("MSRP Header: (%p) [%.*s] [%d] [%.*s]\n",
    			hdr, hdr->name.len, hdr->name.s, hdr->htype,
    			hdr->body.len, hdr->body.s);
    	s = l + 1;
    }
+	if (!tpath || !fpath) {
+		LM_ERR("broken msrp frame message, To-Path and From-Path must be defined.\n");
+		return -1;
+	}
+
 ateoh:
    if(mf->mbody.s!=NULL)
    {

    