diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-11-09 00:23:44 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-11-09 00:23:44 +0000 |
| commit | 5246133a607561abe8096c471de02bddeb6be67c (patch) | |
| tree | 66359f20ff0c00e8a47b76160adf5dd59a0cc1ca | |
| parent | fb351ce6b6cdc714019f49f693182e32055fd78b (diff) | |
Updated error response parsing. Also, use this for 401 responses so for example
the auth errors caused by NTP desync are clearer:
<root> twitter - Login error: Authentication failure (401 Unauthorized
(Timestamp out of bounds))
| -rw-r--r-- | lib/json_util.c | 2 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.c | 25 |
2 files changed, 13 insertions, 14 deletions
diff --git a/lib/json_util.c b/lib/json_util.c index 43e687e3..470a6b02 100644 --- a/lib/json_util.c +++ b/lib/json_util.c @@ -30,7 +30,7 @@ json_value *json_o_get( const json_value *obj, const json_char *name ) { int i; - if( obj->type != json_object ) + if( !obj || obj->type != json_object ) return NULL; for( i = 0; i < obj->u.object.length; ++ i) diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c index 6231cf69..c72c317b 100644 --- a/protocols/twitter/twitter_lib.c +++ b/protocols/twitter/twitter_lib.c @@ -168,23 +168,21 @@ static void twitter_add_buddy(struct im_connection *ic, char *name, const char * char *twitter_parse_error(struct http_request *req) { static char *ret = NULL; - struct xt_node *root, *node, *err; + json_value *root, *err; g_free(ret); ret = NULL; - /* EX: - {"errors":[{"message":"Rate limit exceeded","code":88}]} */ if (req->body_size > 0) { - root = xt_from_string(req->reply_body, req->body_size); - - for (node = root; node; node = node->next) - if ((err = xt_find_node(node->children, "error")) && err->text_len > 0) { - ret = g_strdup_printf("%s (%s)", req->status_string, err->text); - break; - } - - xt_free_node(root); + root = json_parse(req->reply_body); + err = json_o_get(root, "errors"); + if (err->type == json_array && (err = err->u.array.values[0]) && + err->type == json_object) { + const char *msg = json_o_str(err, "message"); + if (msg) + ret = g_strdup_printf("%s (%s)", req->status_string, msg); + } + json_value_free(root); } return ret ? ret : req->status_string; @@ -215,7 +213,8 @@ static json_value *twitter_parse_response(struct im_connection *ic, struct http_ /* IIRC Twitter once had an outage where they were randomly throwing 401s so I'll keep treating this one as fatal only during login. */ - imcb_error(ic, "Authentication failure"); + imcb_error(ic, "Authentication failure (%s)", + twitter_parse_error(req)); imc_logout(ic, FALSE); return NULL; } else if (req->status_code != 200) { |