[asterisk-commits] russell: branch 1.6.0 r114602 - in /branches/1.6.0: ./ main/http.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Apr 23 17:54:41 2008
New Revision: 114602

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114602
Log:
Merged revisions 114601 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114601 | russell | 2008-04-23 17:53:20 -0500 (Wed, 23 Apr 2008) | 14 lines

Merged revisions 114600 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114600 | russell | 2008-04-23 17:18:12 -0500 (Wed, 23 Apr 2008) | 6 lines

Improve some broken cookie parsing code.  Previously, manager login over HTTP
would only work if the mansession_id cookie was first.  Now, the code builds
a list of all of the cookies in the Cookie header.  This fixes a problem
observed by users of the Asterisk GUI.
(closes AST-20)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/http.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/http.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/http.c?view=diff&rev=114602&r1=114601&r2=114602
==============================================================================
--- branches/1.6.0/main/http.c (original)
+++ branches/1.6.0/main/http.c Wed Apr 23 17:54:41 2008
@@ -699,12 +699,49 @@
 }*/
 #endif	/* DO_SSL */
 
+static struct ast_variable *parse_cookies(char *cookies)
+{
+	char *cur;
+	struct ast_variable *vars = NULL, *var;
+
+	/* Skip Cookie: */
+	cookies += 8;
+
+	while ((cur = strsep(&cookies, ";"))) {
+		char *name, *val;
+		
+		name = val = cur;
+		strsep(&val, "=");
+
+		if (ast_strlen_zero(name) || ast_strlen_zero(val)) {
+			continue;
+		}
+
+		name = ast_strip(name);
+		val = ast_strip_quoted(val, "\"", "\"");
+
+		if (ast_strlen_zero(name) || ast_strlen_zero(val)) {
+			continue;
+		}
+
+		if (option_debug) {
+			ast_log(LOG_DEBUG, "mmm ... cookie!  Name: '%s'  Value: '%s'\n", name, val);
+		}
+
+		var = ast_variable_new(name, val, __FILE__);
+		var->next = vars;
+		vars = var;
+	}
+
+	return vars;
+}
+
 static void *httpd_helper_thread(void *data)
 {
 	char buf[4096];
 	char cookie[4096];
 	struct ast_tcptls_session_instance *ser = data;
-	struct ast_variable *var, *prev=NULL, *vars=NULL, *headers = NULL;
+	struct ast_variable *vars=NULL, *headers = NULL;
 	char *uri, *title=NULL;
 	int status = 200, contentlength = 0;
 	struct ast_str *out = NULL;
@@ -727,15 +764,13 @@
 
 	/* process "Cookie: " lines */
 	while (fgets(cookie, sizeof(cookie), ser->f)) {
-		char *vname, *vval;
-		int l;
-
 		/* Trim trailing characters */
 		ast_trim_blanks(cookie);
 		if (ast_strlen_zero(cookie))
 			break;
 		if (strncasecmp(cookie, "Cookie: ", 8)) {
 			char *name, *value;
+			struct ast_variable *var;
 
 			value = ast_strdupa(cookie);
 			name = strsep(&value, ":");
@@ -752,46 +787,10 @@
 			continue;
 		}
 
-		/* TODO - The cookie parsing code below seems to work   
-		   in IE6 and FireFox 1.5.  However, it is not entirely 
-		   correct, and therefore may not work in all           
-		   circumstances.		                        
-		      For more details see RFC 2109 and RFC 2965        */
-	
-		/* FireFox cookie strings look like:                    
-		     Cookie: mansession_id="********"                   
-		   InternetExplorer's look like:                        
-		     Cookie: $Version="1"; mansession_id="********"     */
-		
-		/* If we got a FireFox cookie string, the name's right  
-		    after "Cookie: "                                    */
-		vname = ast_skip_blanks(cookie + 8);
-			
-		/* If we got an IE cookie string, we need to skip to    
-		    past the version to get to the name                 */
-		if (*vname == '$') {
-			strsep(&vname, ";");
-			if (!vname)	/* no name ? */
-				continue;
-			vname = ast_skip_blanks(vname);
-		}
-		vval = strchr(vname, '=');
-		if (!vval)
-			continue;
-		/* Ditch the = and the quotes */
-		*vval++ = '\0';
-		if (*vval)
-			vval++;
-		if ( (l = strlen(vval)) )
-			vval[l - 1] = '\0';	/* trim trailing quote */
-		var = ast_variable_new(vname, vval, "");
-		if (var) {
-			if (prev)
-				prev->next = var;
-			else
-				vars = var;
-			prev = var;
-		}
+		if (vars) {
+			ast_variables_destroy(vars);
+		}
+		vars = parse_cookies(cookie);
 	}
 
 	if (!*uri) {