gergely/matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refuse sending anything without a valid base-URL

Browse Source 
This also allows us to remove the construct-only flag from :base-url.
This commit is contained in:
Gergely Polonkai 2016-01-13 08:17:41 +01:00
parent 28b1662ad4
commit 6736322562
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/matrix-http-api.c
View File

@ -127,6 +127,7 @@ matrix_http_api_set_property(GObject *gobject,
const gchar *base_url; const gchar *base_url;
gchar *last_occurence; gchar *last_occurence;
gchar *url; gchar *url;
SoupURI *new_uri;
base_url = g_value_get_string(value); base_url = g_value_get_string(value);
@ -136,10 +137,6 @@ matrix_http_api_set_property(GObject *gobject,
return; return;
} }
if (priv->uri) {
soup_uri_free(priv->uri);
}
last_occurence = g_strrstr(base_url, API_ENDPOINT); last_occurence = g_strrstr(base_url, API_ENDPOINT);
/* Check if the provided URL already ends with the API endpoint */ /* Check if the provided URL already ends with the API endpoint */
@ -171,7 +168,31 @@ matrix_http_api_set_property(GObject *gobject,
g_debug("Set base URL to %s", url); g_debug("Set base URL to %s", url);
} }
priv->uri = soup_uri_new(url); new_uri = soup_uri_new(url);
if (new_uri && SOUP_URI_VALID_FOR_HTTP(new_uri)) {
g_printf("setting\n");
if (priv->uri) {
soup_uri_free(priv->uri);
}
priv->uri = new_uri;
g_free(priv->token);
priv->token = NULL;
g_free(priv->refresh_token);
priv->refresh_token = NULL;
g_free(priv->homeserver);
priv->homeserver = NULL;
g_free(priv->user_id);
priv->user_id = NULL;
} else {
if (new_uri) {
soup_uri_free(new_uri);
}
g_warning("Invalid URL: %s", url);
}
g_free(url); g_free(url);
break; break;
@ -623,6 +644,14 @@ _send(MatrixHTTPAPI *api,
gsize datalen; gsize datalen;
MatrixHTTPAPIRequest *request; MatrixHTTPAPIRequest *request;
if (!priv->uri) {
g_set_error(error,
MATRIX_API_ERROR, MATRIX_API_ERROR_COMMUNICATION_ERROR,
"No valid base URL");
return;
}
if (!g_str_is_ascii(method)) { if (!g_str_is_ascii(method)) {
g_warning("Method must be ASCII encoded!"); g_warning("Method must be ASCII encoded!");