cpw.sulabh.yahoo_16: c1ede5fa: Only log requested HTTP URL's when PURPL...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: c1ede5faf776dc1cc966dabb42c1ef0dbaea31db
Ancestor: 04904abc651379f22532195ebd3e8a04963f6c1f
Author: rekkanoryo at pidgin.im
Date: 2009-05-14T02:12:40
Branch: im.pidgin.cpw.sulabh.yahoo_16
URL: http://d.pidgin.im/viewmtn/revision/info/c1ede5faf776dc1cc966dabb42c1ef0dbaea31db

Modified files:
        libpurple/protocols/msn/soap.c libpurple/util.c

ChangeLog: 

Only log requested HTTP URL's when PURPLE_UNSAFE_DEBUG is set and change MSN
to use PURPLE_UNSAFE_DEBUG instead of PURPLE_MSN_UNSAFE_DEBUG for consistency.
Not logging URL's will prevent potential password disclosure for the Yahoo
HTTP login method.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/soap.c	c2484b6578c251aa8081f269eafd5f7198ae13f2
+++ libpurple/protocols/msn/soap.c	051fd6f91ad55f6647d1ad5dd7c325e103cab9b2
@@ -80,7 +80,7 @@ msn_soap_connection_new(MsnSession *sess
 	conn->session = session;
 	conn->host = g_strdup(host);
 	conn->queue = g_queue_new();
-	conn->unsafe_debug = g_getenv("PURPLE_MSN_UNSAFE_DEBUG") != NULL;
+	conn->unsafe_debug = g_getenv("PURPLE_UNSAFE_DEBUG") != NULL;
 	return conn;
 }
 
============================================================
--- libpurple/util.c	8c4e4787d5558dbb66ce2d53c3d42c468b95e4bf
+++ libpurple/util.c	3e91f5df8cf116170001659f9d6c8dc4bec94898
@@ -3920,7 +3920,10 @@ url_fetch_send_cb(gpointer data, gint so
 		}
 	}
 
-	purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	if(g_getenv("PURPLE_UNSAFE_DEBUG"))
+		purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	else
+		purple_debug_misc("util", "request constructed\n");
 
 	total_len = strlen(gfud->request);
 
@@ -4023,9 +4026,12 @@ purple_util_fetch_url_request_len(const 
 	g_return_val_if_fail(url      != NULL, NULL);
 	g_return_val_if_fail(callback != NULL, NULL);
 
-	purple_debug_info("util",
-			 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
-			 url, full, user_agent?user_agent:"(null)", http11);
+	if(g_getenv("PURPLE_UNSAFE_DEBUG"))
+		purple_debug_info("util",
+				 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
+				 url, full, user_agent?user_agent:"(null)", http11);
+	else
+		purple_debug_info("util", "requesting to fetch a URL\n");
 
 	gfud = g_new0(PurpleUtilFetchUrlData, 1);