[libgdata] Bug 644940 — Use HTTPS only

[Philip Withnall <pwithnall src gnome org>]

commit bbd37f5f81ae16457c0569f208090114bed1a8c0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Mar 22 13:08:58 2011 +0000

    Bug 644940 â?? Use HTTPS only
    
    Use HTTPS for all communications with the server, removing the
    LIBGDATA_FORCE_HTTP environment variable. Closes: bgo#644940

 README                                             |    4 --
 docs/reference/gdata-running.xml                   |    6 ---
 gdata/gdata-private.h                              |    3 +-
 gdata/gdata-service.c                              |   27 +++++---------
 .../services/documents/gdata-documents-document.c  |    2 +-
 gdata/services/documents/gdata-documents-service.c |    8 ++--
 .../documents/gdata-documents-spreadsheet.c        |    6 +--
 gdata/services/picasaweb/gdata-picasaweb-service.c |    4 +-
 gdata/tests/picasaweb.c                            |   36 +++++++++++---------
 9 files changed, 40 insertions(+), 56 deletions(-)
---
diff --git a/README b/README
index 7a66aff..06fbfaf 100644
--- a/README
+++ b/README
@@ -24,10 +24,6 @@ If compiling with --enable-gnome (for GNOME support):
 Environment variables
 =====================
 
-If the environment variable LIBGDATA_FORCE_HTTP is defined, libgdata will
-force the use of HTTP for requests which would otherwise normally use
-HTTPS. This allows the network traffic to be debugged more easily.
-
 If the environment variable LIGDATA_DEBUG is set to one of the following
 values, libgdata will give debug output (at various levels):
  0: Output no debug messages or network logs
diff --git a/docs/reference/gdata-running.xml b/docs/reference/gdata-running.xml
index 4458497..3a6fe04 100644
--- a/docs/reference/gdata-running.xml
+++ b/docs/reference/gdata-running.xml
@@ -18,12 +18,6 @@
 			<title>Environment variables</title>
 			<para>libgdata makes use of a few environment variables which affect how it runs, mainly with respect to debugging.</para>
 
-			<formalpara id="LIBGDATA_FORCE_HTTP">
-				<title><envar>LIBGDATA_FORCE_HTTP</envar></title>
-				<para>If this environment variable is defined, libgdata will force the use of HTTP for requests which would otherwise
-					normally use HTTPS. This allows the network traffic to be debugged more easily.</para>
-			</formalpara>
-
 			<formalpara id="LIBGDATA_DEBUG">
 				<title><envar>LIBGDATA_DEBUG</envar></title>
 				<para>If this environment variable is set to one of the following values, libgdata will give debug output
diff --git a/gdata/gdata-private.h b/gdata/gdata-private.h
index 020c3ce..61cd1ee 100644
--- a/gdata/gdata-private.h
+++ b/gdata/gdata-private.h
@@ -53,8 +53,7 @@ G_GNUC_INTERNAL guint _gdata_service_send_message (GDataService *self, SoupMessa
 G_GNUC_INTERNAL SoupMessage *_gdata_service_query (GDataService *self, const gchar *feed_uri, GDataQuery *query, GCancellable *cancellable,
                                                    GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 G_GNUC_INTERNAL const gchar *_gdata_service_get_scheme (void) G_GNUC_CONST;
-G_GNUC_INTERNAL gchar *_gdata_service_build_uri (gboolean force_http,
-                                                 const gchar *format, ...) G_GNUC_PRINTF (2, 3) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+G_GNUC_INTERNAL gchar *_gdata_service_build_uri (const gchar *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 G_GNUC_INTERNAL GDataLogLevel _gdata_service_get_log_level (void) G_GNUC_CONST;
 
 #include "gdata-query.h"
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index 53b7b60..06ac033 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -2163,30 +2163,24 @@ _gdata_service_get_session (GDataService *self)
 /*
  * _gdata_service_get_scheme:
  *
- * Returns the name of the scheme to use (either "http" or "https") for network operations if a request should use HTTPS. This allows
- * requests to normally use HTTPS, but have the option of using HTTP for debugging purposes. If a request should normally use HTTP, that
- * should be hard-coded in the relevant code, and this function needn't be called.
+ * Returns the name of the scheme to use, which will always be <code class="literal">https</code>. The return type used to vary according to the
+ * environment variable <code class="literal">LIBGDATA_FORCE_HTTP</code>, but Google has since switched to using HTTPS exclusively.
  *
- * Return value: the scheme to use
+ * See <ulink type="http" url="http://googlecode.blogspot.com/2011/03/improving-security-of-google-apis-with.html";>Improving the security of Google
+ * APIs with SSL</ulink>.
+ *
+ * Return value: the scheme to use (<code class="literal">https</code>)
  *
  * Since: 0.6.0
  */
 const gchar *
 _gdata_service_get_scheme (void)
 {
-	static gint force_http = -1;
-
-	if (force_http == -1)
-		force_http = (g_getenv ("LIBGDATA_FORCE_HTTP") != NULL);
-
-	if (force_http)
-		return "http";
 	return "https";
 }
 
 /*
  * _gdata_service_build_uri:
- * @force_http: %TRUE to force the outputted URI to use HTTP, %FALSE to use the scheme returned by _gdata_service_get_scheme()
  * @format: a standard printf() format string
  * @...: the arguments to insert in the output
  *
@@ -2195,14 +2189,13 @@ _gdata_service_get_scheme (void)
  * other printf() format placeholders are supported at the moment except <code class="literal">%%d</code>, which prints a signed integer; and
  * <code class="literal">%%</code>, which prints a literal percent symbol.
  *
- * The returned URI is guaranteed to use the scheme returned by _gdata_service_get_scheme(), unless the @force_http argument is %TRUE; in that case,
- * the returned URI is guaranteed to use HTTP. The format string, once all the arguments have been inserted into it, must include a service, but it
- * doesn't matter which one.
+ * The returned URI is guaranteed to use the scheme returned by _gdata_service_get_scheme(). The format string, once all the arguments have been
+ * inserted into it, must include a scheme, but it doesn't matter which one.
  *
  * Return value: a newly allocated URI string; free with g_free()
  */
 gchar *
-_gdata_service_build_uri (gboolean force_http, const gchar *format, ...)
+_gdata_service_build_uri (const gchar *format, ...)
 {
 	const gchar *p, *scheme;
 	gchar *built_uri;
@@ -2245,7 +2238,7 @@ _gdata_service_build_uri (gboolean force_http, const gchar *format, ...)
 	va_end (args);
 
 	built_uri = g_string_free (uri, FALSE);
-	scheme = (force_http == FALSE) ? _gdata_service_get_scheme () : "http";
+	scheme = _gdata_service_get_scheme ();
 
 	/* Ensure we're using the correct scheme (HTTP or HTTPS) */
 	if (g_str_has_prefix (built_uri, scheme) == FALSE) {
diff --git a/gdata/services/documents/gdata-documents-document.c b/gdata/services/documents/gdata-documents-document.c
index 548a1c8..6f8ef61 100644
--- a/gdata/services/documents/gdata-documents-document.c
+++ b/gdata/services/documents/gdata-documents-document.c
@@ -305,5 +305,5 @@ gdata_documents_document_get_download_uri (GDataDocumentsDocument *self, const g
 	g_return_val_if_fail (GDATA_IS_DOCUMENTS_DOCUMENT (self), NULL);
 	g_return_val_if_fail (export_format != NULL && *export_format != '\0', NULL);
 
-	return _gdata_service_build_uri (FALSE, "%p&exportFormat=%s", gdata_entry_get_content_uri (GDATA_ENTRY (self)), export_format);
+	return _gdata_service_build_uri ("%p&exportFormat=%s", gdata_entry_get_content_uri (GDATA_ENTRY (self)), export_format);
 }
diff --git a/gdata/services/documents/gdata-documents-service.c b/gdata/services/documents/gdata-documents-service.c
index 96bc76d..092bcb6 100644
--- a/gdata/services/documents/gdata-documents-service.c
+++ b/gdata/services/documents/gdata-documents-service.c
@@ -890,16 +890,16 @@ gdata_documents_service_remove_entry_from_folder (GDataDocumentsService *self, G
 	g_assert (entry_id != NULL);
 
 	if (GDATA_IS_DOCUMENTS_PRESENTATION (entry)) {
-		uri = _gdata_service_build_uri (FALSE, "http://docs.google.com/feeds/folders/private/full/folder%%3A%s/presentation%%3A%s";,
+		uri = _gdata_service_build_uri ("http://docs.google.com/feeds/folders/private/full/folder%%3A%s/presentation%%3A%s";,
 		                                folder_id, entry_id);
 	} else if (GDATA_IS_DOCUMENTS_SPREADSHEET (entry)) {
-		uri = _gdata_service_build_uri (FALSE, "http://docs.google.com/feeds/folders/private/full/folder%%3A%s/spreadsheet%%3A%s";,
+		uri = _gdata_service_build_uri ("http://docs.google.com/feeds/folders/private/full/folder%%3A%s/spreadsheet%%3A%s";,
 		                                folder_id, entry_id);
 	} else if (GDATA_IS_DOCUMENTS_TEXT (entry)) {
-		uri = _gdata_service_build_uri (FALSE, "http://docs.google.com/feeds/folders/private/full/folder%%3A%s/document%%3A%s";,
+		uri = _gdata_service_build_uri ("http://docs.google.com/feeds/folders/private/full/folder%%3A%s/document%%3A%s";,
 		                                folder_id, entry_id);
 	} else if (GDATA_IS_DOCUMENTS_FOLDER (entry)) {
-		uri = _gdata_service_build_uri (FALSE, "http://docs.google.com/feeds/folders/private/full/folder%%3A%s/folder%%3A%s";,
+		uri = _gdata_service_build_uri ("http://docs.google.com/feeds/folders/private/full/folder%%3A%s/folder%%3A%s";,
 		                                folder_id, entry_id);
 	} else {
 		g_assert_not_reached ();
diff --git a/gdata/services/documents/gdata-documents-spreadsheet.c b/gdata/services/documents/gdata-documents-spreadsheet.c
index dc974cb..155651c 100644
--- a/gdata/services/documents/gdata-documents-spreadsheet.c
+++ b/gdata/services/documents/gdata-documents-spreadsheet.c
@@ -176,12 +176,10 @@ gdata_documents_spreadsheet_get_download_uri (GDataDocumentsSpreadsheet *self, c
 	g_assert (document_id != NULL);
 
 	if (gid != -1) {
-		return _gdata_service_build_uri (FALSE,
-		                                 "http://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=%s&exportFormat=%s&gid=%d";,
+		return _gdata_service_build_uri ("http://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=%s&exportFormat=%s&gid=%d";,
 		                                 document_id, export_format, gid);
 	} else {
-		return _gdata_service_build_uri (FALSE,
-		                                 "http://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=%s&exportFormat=%s";,
+		return _gdata_service_build_uri ("http://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=%s&exportFormat=%s";,
 		                                 document_id, export_format);
 	}
 }
diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.c b/gdata/services/picasaweb/gdata-picasaweb-service.c
index 20d5e20..5a5b14b 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-service.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-service.c
@@ -177,7 +177,7 @@ create_uri (GDataPicasaWebService *self, const gchar *username, const gchar *typ
 		username = "default";
 	}
 
-	return _gdata_service_build_uri (TRUE, "http://picasaweb.google.com/data/%s/api/user/%s";, type, username);
+	return _gdata_service_build_uri ("http://picasaweb.google.com/data/%s/api/user/%s";, type, username);
 }
 
 /**
@@ -502,7 +502,7 @@ gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWeb
 	user_id = gdata_service_get_username (GDATA_SERVICE (self));
 
 	/* Build the upload URI and upload stream */
-	upload_uri = _gdata_service_build_uri (TRUE, "http://picasaweb.google.com/data/feed/api/user/%s/albumid/%s";, user_id, album_id);
+	upload_uri = _gdata_service_build_uri ("http://picasaweb.google.com/data/feed/api/user/%s/albumid/%s";, user_id, album_id);
 	upload_stream = GDATA_UPLOAD_STREAM (gdata_upload_stream_new (GDATA_SERVICE (self), SOUP_METHOD_POST, upload_uri, GDATA_ENTRY (file_entry),
 	                                                              slug, content_type, cancellable));
 	g_free (upload_uri);
diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c
index 21949c4..806e4be 100644
--- a/gdata/tests/picasaweb.c
+++ b/gdata/tests/picasaweb.c
@@ -384,7 +384,7 @@ test_photo (gconstpointer service)
 
 	content = GDATA_MEDIA_CONTENT (list->data);
 	g_assert_cmpstr (gdata_media_content_get_uri (content), ==,
-			 "http://lh3.ggpht.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/100_0269.jpg";);
+	                 "https://lh3.googleusercontent.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/100_0269.jpg";);
 	g_assert_cmpstr (gdata_media_content_get_content_type (content), ==, "image/jpeg");
 	g_assert_cmpuint (gdata_media_content_get_width (content), ==, 1600);
 	g_assert_cmpuint (gdata_media_content_get_height (content), ==, 1200);
@@ -401,7 +401,7 @@ test_photo (gconstpointer service)
 
 	thumbnail = GDATA_MEDIA_THUMBNAIL (list->data);
 	g_assert_cmpstr (gdata_media_thumbnail_get_uri (thumbnail), ==,
-			 "http://lh3.ggpht.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/s288/100_0269.jpg";);
+	                 "https://lh3.googleusercontent.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/s288/100_0269.jpg";);
 	g_assert_cmpuint (gdata_media_thumbnail_get_width (thumbnail), ==, 288);
 	g_assert_cmpuint (gdata_media_thumbnail_get_height (thumbnail), ==, 216);
 	g_assert_cmpint (gdata_media_thumbnail_get_time (thumbnail), ==, -1); /* PicasaWeb doesn't set anything better */
@@ -447,13 +447,14 @@ test_photo_feed_entry (gconstpointer service)
 
 	g_assert_cmpstr (gdata_entry_get_title (photo_entry), ==, "100_0269.jpg");
 	g_assert_cmpstr (gdata_picasaweb_file_get_id (GDATA_PICASAWEB_FILE (photo_entry)), ==, "5328890138794566386");
-	g_assert_cmpstr (gdata_entry_get_id (photo_entry), ==, "http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";);
+	g_assert_cmpstr (gdata_entry_get_id (photo_entry), ==,
+	                 "https://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";);
 	g_assert_cmpstr (gdata_entry_get_etag (photo_entry), !=, NULL);
 	g_assert_cmpint (gdata_entry_get_updated (photo_entry), ==, 1273783513);
 	g_assert_cmpint (gdata_entry_get_published (photo_entry), ==, 1240728920);
 	g_assert (gdata_entry_get_content (photo_entry) == NULL);
 	g_assert_cmpstr (gdata_entry_get_content_uri (photo_entry), ==,
-			 "http://lh3.ggpht.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/100_0269.jpg";);
+	                 "https://lh3.googleusercontent.com/_1kdcGyvOb8c/SfQFWPnuovI/AAAAAAAAAB0/MI0L4Sd11Eg/100_0269.jpg";);
 
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (photo_entry));
 	g_assert_cmpstr (xml, !=, NULL);
@@ -493,7 +494,7 @@ test_photo_feed (gconstpointer service)
 
 	g_assert_cmpstr (gdata_feed_get_title (photo_feed), ==, "Test Album 1 - Venice - Public");
 	g_assert_cmpstr (gdata_feed_get_id (photo_feed), ==,
-			 "http://picasaweb.google.com/data/feed/user/libgdata.picasaweb/albumid/5328889949261497249";);
+			 "https://picasaweb.google.com/data/feed/user/libgdata.picasaweb/albumid/5328889949261497249";);
 	g_assert_cmpstr (gdata_feed_get_etag (photo_feed), !=, NULL);
 	g_assert_cmpuint (gdata_feed_get_items_per_page (photo_feed), ==, 1000);
 	g_assert_cmpuint (gdata_feed_get_start_index (photo_feed), ==, 1);
@@ -509,16 +510,16 @@ test_photo_single (gconstpointer service)
 	GDataEntry *photo;
 	GError *error = NULL;
 
-	photo = gdata_service_query_single_entry (GDATA_SERVICE (service),
-	                                          "http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";,
-	                                          NULL, GDATA_TYPE_PICASAWEB_FILE, NULL, &error);
+	const gchar *entry_id =
+		"https://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";;
+	photo = gdata_service_query_single_entry (GDATA_SERVICE (service), entry_id, NULL, GDATA_TYPE_PICASAWEB_FILE, NULL, &error);
 
 	g_assert_no_error (error);
 	g_assert (photo != NULL);
 	g_assert (GDATA_IS_PICASAWEB_FILE (photo));
 	g_assert_cmpstr (gdata_picasaweb_file_get_id (GDATA_PICASAWEB_FILE (photo)), ==, "5328890138794566386");
 	g_assert_cmpstr (gdata_entry_get_id (photo), ==,
-	                 "http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";);
+	                 "https://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249/photoid/5328890138794566386";);
 	g_clear_error (&error);
 
 	g_object_unref (photo);
@@ -537,7 +538,7 @@ test_photo_async_cb (GDataService *service, GAsyncResult *async_result, GMainLoo
 
 	/* Tests */
 	g_assert_cmpstr (gdata_feed_get_title (feed), ==, "Test Album 1 - Venice - Public");
-	g_assert_cmpstr (gdata_feed_get_id (feed), ==, "http://picasaweb.google.com/data/feed/user/libgdata.picasaweb/albumid/5328889949261497249";);
+	g_assert_cmpstr (gdata_feed_get_id (feed), ==, "https://picasaweb.google.com/data/feed/user/libgdata.picasaweb/albumid/5328889949261497249";);
 	g_assert_cmpstr (gdata_feed_get_etag (feed), !=, NULL);
 	g_assert_cmpuint (gdata_feed_get_items_per_page (feed), ==, 1000);
 	g_assert_cmpuint (gdata_feed_get_start_index (feed), ==, 1);
@@ -667,7 +668,7 @@ test_album (gconstpointer service)
 	content = GDATA_MEDIA_CONTENT (contents->data);
 
 	g_assert_cmpstr (gdata_media_content_get_uri (content), ==,
-			 "http://lh5.ggpht.com/_1kdcGyvOb8c/SfQFLNjhg6E/AAAAAAAAAB8/2WtMjZCa71k/TestAlbum1VenicePublic.jpg";);
+	                 "https://lh5.googleusercontent.com/_1kdcGyvOb8c/SfQFLNjhg6E/AAAAAAAAAB8/2WtMjZCa71k/TestAlbum1VenicePublic.jpg";);
 	g_assert_cmpstr (gdata_media_content_get_content_type (content), ==, "image/jpeg");
 	g_assert_cmpuint (gdata_media_content_get_medium (content), ==, GDATA_MEDIA_IMAGE);
 
@@ -683,7 +684,7 @@ test_album (gconstpointer service)
 	thumbnail = GDATA_MEDIA_THUMBNAIL (thumbnails->data);
 
 	g_assert_cmpstr (gdata_media_thumbnail_get_uri (thumbnail), ==,
-			 "http://lh5.ggpht.com/_1kdcGyvOb8c/SfQFLNjhg6E/AAAAAAAAAB8/2WtMjZCa71k/s160-c/TestAlbum1VenicePublic.jpg";);
+	                 "https://lh5.googleusercontent.com/_1kdcGyvOb8c/SfQFLNjhg6E/AAAAAAAAAB8/2WtMjZCa71k/s160-c/TestAlbum1VenicePublic.jpg";);
 	g_assert_cmpint (gdata_media_thumbnail_get_time (thumbnail), ==, -1); /* PicasaWeb doesn't set anything better */
 	g_assert_cmpint (gdata_media_thumbnail_get_width (thumbnail), ==, 160);
 	g_assert_cmpint (gdata_media_thumbnail_get_height (thumbnail), ==, 160);
@@ -717,7 +718,8 @@ test_album_feed_entry (gconstpointer service)
 	/* Tests */
 	g_assert_cmpstr (gdata_entry_get_title (entry), ==, "Test Album 1 - Venice - Public");
 	g_assert_cmpstr (gdata_picasaweb_album_get_id (GDATA_PICASAWEB_ALBUM (entry)), ==, "5328889949261497249");
-	g_assert_cmpstr (gdata_entry_get_id (entry), ==, "http://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249";);
+	g_assert_cmpstr (gdata_entry_get_id (entry), ==,
+	                 "https://picasaweb.google.com/data/entry/user/libgdata.picasaweb/albumid/5328889949261497249";);
 	g_assert_cmpstr (gdata_entry_get_etag (entry), !=, NULL);
 	g_assert_cmpstr (gdata_entry_get_rights (entry), ==, "public");
 	g_assert_cmpint (gdata_entry_get_updated (entry), ==, 1240729023);
@@ -746,9 +748,10 @@ test_album_feed (gconstpointer service)
 
 	g_assert_cmpstr (gdata_feed_get_title (album_feed), ==, "libgdata.picasaweb");
 	/* TODO find out why subtitle == null when returned: no subtitle for feed? printf("feed subtitle: %s\n", gdata_feed_get_subtitle(feed)); */
-	g_assert_cmpstr (gdata_feed_get_id (album_feed), ==, "http://picasaweb.google.com/data/feed/user/libgdata.picasaweb";);
+	g_assert_cmpstr (gdata_feed_get_id (album_feed), ==, "https://picasaweb.google.com/data/feed/user/libgdata.picasaweb";);
 	g_assert_cmpstr (gdata_feed_get_etag (album_feed), !=, NULL); /* this varies as albums change, like when a new image is uploaded in our test! */
-	g_assert_cmpstr (gdata_feed_get_icon (album_feed), ==, "http://lh3.ggpht.com/_1kdcGyvOb8c/AAAAAAAAAAA/AAAAAAAAAAA/jNhBfdaNdD4/s64-c/libgdata.picasaweb.jpg";);
+	g_assert_cmpstr (gdata_feed_get_icon (album_feed), ==,
+	                 "https://lh3.googleusercontent.com/_1kdcGyvOb8c/AAAAAAAAAAA/AAAAAAAADJo/DBiSoq_oSTo/s64-c/libgdata.picasaweb.jpg";);
 	g_assert_cmpuint (gdata_feed_get_items_per_page (album_feed), ==, 1000);
 	g_assert_cmpuint (gdata_feed_get_start_index (album_feed), ==, 1);
 	g_assert_cmpuint (gdata_feed_get_total_results (album_feed), ==, NUM_ALBUMS);
@@ -912,7 +915,8 @@ test_query_user (gconstpointer service)
 	g_assert_cmpint (gdata_picasaweb_user_get_quota_limit (user), ==, 1073741824); /* 1GiB: it'll be a beautiful day when this assert gets tripped */
 	g_assert_cmpint (gdata_picasaweb_user_get_quota_current (user), >, 0);
 	g_assert_cmpint (gdata_picasaweb_user_get_max_photos_per_album (user), >, 0); /* now it's 1000, testing this weakly to avoid having to regularly update it */
-	g_assert_cmpstr (gdata_picasaweb_user_get_thumbnail_uri (user), ==, "http://lh3.ggpht.com/_1kdcGyvOb8c/AAAAAAAAAAA/AAAAAAAAAAA/jNhBfdaNdD4/s64-c/libgdata.picasaweb.jpg";);
+	g_assert_cmpstr (gdata_picasaweb_user_get_thumbnail_uri (user), ==,
+	                 "https://lh3.googleusercontent.com/_1kdcGyvOb8c/AAAAAAAAAAA/AAAAAAAADJo/DBiSoq_oSTo/s64-c/libgdata.picasaweb.jpg";);
 
 	g_object_unref (user);
 }