diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-05-22 15:04:16 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-22 21:07:38 +0200 |
| commit | af1014a23969ba130b874dca376a6b3a2a24d0da (patch) | |
| tree | 2e56e254c22d46e9ee0efea460f0a2598cbfdc8c /src/agent.c | |
| parent | d41b654bd7cf0723c26f38db7aaee34dbe88bc54 (diff) | |
| download | connman-af1014a23969ba130b874dca376a6b3a2a24d0da.tar.gz connman-af1014a23969ba130b874dca376a6b3a2a24d0da.tar.bz2 connman-af1014a23969ba130b874dca376a6b3a2a24d0da.zip | |
agent: Verify that the reply contains a dictionary
Diffstat (limited to 'src/agent.c')
| -rw-r--r-- | src/agent.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/agent.c b/src/agent.c index feeb48e9..ebee19c9 100644 --- a/src/agent.c +++ b/src/agent.c @@ -85,6 +85,26 @@ int __connman_agent_unregister(const char *sender, const char *path) return 0; } +static connman_bool_t check_reply_has_dict(DBusMessage *reply) +{ + const char *signature = DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING; + + if (dbus_message_has_signature(reply, signature) == TRUE) + return TRUE; + + connman_warn("Reply %s to %s from %s has wrong signature %s", + signature, + dbus_message_get_interface(reply), + dbus_message_get_sender(reply), + dbus_message_get_signature(reply)); + + return FALSE; +} + struct request_input_reply { struct connman_service *service; authentication_cb_t callback; @@ -111,6 +131,9 @@ static void request_input_passphrase_reply(DBusPendingCall *call, void *user_dat goto done; } + if (check_reply_has_dict(reply) == FALSE) + goto done; + values_received = TRUE; dbus_message_iter_init(reply, &iter); @@ -315,6 +338,7 @@ static void request_input_login_reply(DBusPendingCall *call, void *user_data) { struct request_input_reply *username_password_reply = user_data; const char *error = NULL; + connman_bool_t values_received = FALSE; char *username = NULL; char *password = NULL; char *key; @@ -326,6 +350,11 @@ static void request_input_login_reply(DBusPendingCall *call, void *user_data) goto done; } + if (check_reply_has_dict(reply) == FALSE) + goto done; + + values_received = TRUE; + dbus_message_iter_init(reply, &iter); dbus_message_iter_recurse(&iter, &dict); while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { @@ -359,7 +388,7 @@ static void request_input_login_reply(DBusPendingCall *call, void *user_data) done: username_password_reply->callback(username_password_reply->service, - TRUE, NULL, 0, + values_received, NULL, 0, username, password, FALSE, NULL, error, username_password_reply->user_data); |