Merge pull request #31 from Thaodan/thaodan/http_connection_erros_purple2.x

Handle http connection errors when building against Purple 2.x

Author: EionRobb

librocketchat.c

@@ -718,10 +718,37 @@ gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message
 		gchar *error_msg_formatted = g_strdup_printf(_("Connection error: %s."), error_message);
 		purple_connection_error(conn->ya->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg_formatted);
 		g_free(error_msg_formatted);
-		g_object_unref(parser);
-		g_free(conn);
-		return;
+		goto out;
 	}
+#if !PURPLE_VERSION_CHECK(3, 0, 0)
+    else {
+        /* Purple 2.x doesn't check for the http status to be successful so let's
+         * do that here quick.
+         * Borrowed and then adapted from purple2compat http.c
+         */
+        if (!error_message) {
+            gsize header_len = (body + 4 - url_text);
+            gchar header[header_len];
+            g_strlcpy(header, url_text, header_len);
+            gchar** header_by_word = g_strsplit_set(header, " ", 2);
+            gint code = -1;
+
+            sscanf(header_by_word[1], "%d", &code);
+            g_strfreev(header_by_word);
+
+            if (!(code <= 0 || code / 100 == 2)) {
+                gchar *error_msg_formatted = g_strdup_printf(
+                    _("Connection error: Invalid HTTP response code (%d)."),
+                                                             code);
+                purple_connection_error(conn->ya->pc,
+                                        PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+                                        error_msg_formatted);
+                g_free(error_msg_formatted);
+                goto out;
+            }
+        }
+    }
+#endif
 	if (body != NULL && !json_parser_load_from_data(parser, body, body_len, NULL)) {
 		//purple_debug_error("rocketchat", "Error parsing response: %s\n", body);
 		if (conn->callback) {
@@ -747,9 +774,12 @@ gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message
 			conn->callback(conn->ya, root, conn->user_data, NULL);
 		}
 	}
-	
+
+out:
 	g_object_unref(parser);
 	g_free(conn);
+
+    return;
 }
 
 static void
@@ -2041,6 +2071,8 @@ static guint rc_conv_send_typing(PurpleConversation *conv, PurpleIMTypingState s
 static gulong chat_conversation_typing_signal = 0;
 static void rc_mark_conv_seen(PurpleConversation *conv, PurpleConversationUpdateType type);
 static gulong conversation_updated_signal = 0;
+static void rc_login_me_cb(RocketChatAccount *ya, JsonNode *node, gpointer user_data,
+               JsonObject *error);
 
 static void
 rc_free_proxy(gpointer data)
@@ -2131,20 +2163,33 @@ rc_login(PurpleAccount *account)
 
 	//Build the initial hash tables from the current buddy list
 	rc_build_groups_from_blist(ya);
-	
-	//TODO do something with this callback to make sure it's actually a rocket.chat server
+
 	url = g_strconcat("https://", ya->server, ya->path, "/api/me", NULL);
-	rc_fetch_url(ya, url, NULL, NULL, NULL);
+	rc_fetch_url(ya, url, NULL, rc_login_me_cb, NULL);
 	g_free(url);
-	
+}
+
+
+static void
+rc_login_me_cb(RocketChatAccount *ya, JsonNode *node, gpointer user_data,
+               JsonObject *error)
+{
+    if(!ya) return;
+    // TODO: Add else that parses the error status
+
 	rc_start_socket(ya);
-	
-	
+
 	if (!chat_conversation_typing_signal) {
-		chat_conversation_typing_signal = purple_signal_connect(purple_conversations_get_handle(), "chat-conversation-typing", purple_connection_get_protocol(pc), PURPLE_CALLBACK(rc_conv_send_typing), NULL);
+		chat_conversation_typing_signal = purple_signal_connect(
+            purple_conversations_get_handle(), "chat-conversation-typing",
+            purple_connection_get_protocol(ya->pc), PURPLE_CALLBACK(rc_conv_send_typing),
+            NULL);
 	}
 	if (!conversation_updated_signal) {
-		conversation_updated_signal = purple_signal_connect(purple_conversations_get_handle(), "conversation-updated", purple_connection_get_protocol(pc), PURPLE_CALLBACK(rc_mark_conv_seen), NULL);
+		conversation_updated_signal = purple_signal_connect(
+            purple_conversations_get_handle(), "conversation-updated",
+            purple_connection_get_protocol(ya->pc), PURPLE_CALLBACK(rc_mark_conv_seen),
+            NULL);
 	}
 }