X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fagent-connman.c;h=e4850a8f7f0a3c39ab7af3b984bf07aa121e422a;hb=refs%2Fheads%2Faccepted%2Ftizen_5.5_unified_wearable_hotfix;hp=b2049a3d361416a143b21260dc2854ec01348f12;hpb=bcae74da8fa2958b3fec9153fc33e41f0e0317bf;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/agent-connman.c b/src/agent-connman.c
old mode 100644
new mode 100755
index b2049a3..e4850a8
--- a/src/agent-connman.c
+++ b/src/agent-connman.c
@@ -79,8 +79,10 @@ static void request_input_passphrase_reply(DBusMessage *reply, void *user_data)
 	int name_len = 0;
 	DBusMessageIter iter, dict;
 
-	if (!reply)
-		goto out;
+	if (!reply) {
+		error = CONNMAN_ERROR_INTERFACE ".OperationAborted";
+		goto done;
+	}
 
 	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
 		error = dbus_message_get_error_name(reply);
@@ -98,58 +100,101 @@ static void request_input_passphrase_reply(DBusMessage *reply, void *user_data)
 		DBusMessageIter entry, value;
 
 		dbus_message_iter_recurse(&dict, &entry);
-		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) {
+			error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 			break;
+		}
 
 		dbus_message_iter_get_basic(&entry, &key);
 
 		if (g_str_equal(key, "Identity")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &identity);
 
 		} else if (g_str_equal(key, "Passphrase")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &passphrase);
 
 		} else if (g_str_equal(key, "WPS")) {
-			wps = true;
 
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
+			wps = true;
 			dbus_message_iter_get_basic(&value, &wpspin);
 			break;
 		} else if (g_str_equal(key, "Name")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &name);
 			name_len = strlen(name);
 		} else if (g_str_equal(key, "SSID")) {
+			DBusMessageIter array_iter;
+
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
 			dbus_message_iter_recurse(&entry, &value);
 			if (dbus_message_iter_get_arg_type(&value)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_ARRAY) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
-			if (dbus_message_iter_get_element_type(&value)
-							!= DBUS_TYPE_VARIANT)
+			}
+			dbus_message_iter_recurse(&value, &array_iter);
+			if (dbus_message_iter_get_arg_type(&array_iter)
+							!= DBUS_TYPE_BYTE) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
-			dbus_message_iter_get_fixed_array(&value, &name,
+			}
+			dbus_message_iter_get_fixed_array(&array_iter, &name,
 							&name_len);
 		}
 		dbus_message_iter_next(&dict);
@@ -160,7 +205,7 @@ done:
 					values_received, name, name_len,
 					identity, passphrase, wps, wpspin,
 					error, passphrase_reply->user_data);
-out:
+
 	g_free(passphrase_reply);
 }
 
@@ -208,6 +253,9 @@ static void request_input_append_passphrase(DBusMessageIter *iter,
 		value = "wep";
 		break;
 	case CONNMAN_SERVICE_SECURITY_PSK:
+#if defined TIZEN_EXT
+	case CONNMAN_SERVICE_SECURITY_RSN:
+#endif
 		value = "psk";
 		break;
 	case CONNMAN_SERVICE_SECURITY_8021X:
@@ -341,6 +389,9 @@ static void previous_passphrase_handler(DBusMessageIter *iter,
 			data.type = "wep";
 			break;
 		case CONNMAN_SERVICE_SECURITY_PSK:
+#if defined TIZEN_EXT
+		case CONNMAN_SERVICE_SECURITY_RSN:
+#endif
 			data.type  = "psk";
 			break;
 		/*
@@ -365,8 +416,10 @@ static void request_input_login_reply(DBusMessage *reply, void *user_data)
 	char *key;
 	DBusMessageIter iter, dict;
 
-	if (!reply)
-		goto out;
+	if (!reply) {
+		error = CONNMAN_ERROR_INTERFACE ".OperationAborted";
+		goto done;
+	}
 
 	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
 		error = dbus_message_get_error_name(reply);
@@ -392,17 +445,33 @@ static void request_input_login_reply(DBusMessage *reply, void *user_data)
 		if (g_str_equal(key, "Username")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &username);
 
 		} else if (g_str_equal(key, "Password")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry) !=
-							DBUS_TYPE_VARIANT)
+							DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &password);
 		}
 
@@ -414,7 +483,7 @@ done:
 			username_password_reply->service, values_received,
 			NULL, 0, username, password, FALSE, NULL, error,
 			username_password_reply->user_data);
-out:
+
 	g_free(username_password_reply);
 }
 
@@ -582,6 +651,11 @@ static void request_browser_reply(DBusMessage *reply, void *user_data)
 	bool result = false;
 	const char *error = NULL;
 
+	if (!reply) {
+		error = CONNMAN_ERROR_INTERFACE ".OperationAborted";
+		goto done;
+	}
+
 	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
 		error = dbus_message_get_error_name(reply);
 		goto done;
@@ -674,8 +748,10 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 	char *wpspin = NULL;
 	char *key;
 
-	if (!reply)
-		goto out;
+	if (!reply) {
+		error = CONNMAN_ERROR_INTERFACE ".OperationAborted";
+		goto done;
+	}
 
 	if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
 		error = dbus_message_get_error_name(reply);
@@ -691,8 +767,10 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 		DBusMessageIter entry, value;
 
 		dbus_message_iter_recurse(&dict, &entry);
-		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) {
+			error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 			break;
+		}
 
 		dbus_message_iter_get_basic(&entry, &key);
 
@@ -701,9 +779,17 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &wpspin);
 			break;
 		}
@@ -716,7 +802,7 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 done:
 	auth_reply->peer_callback(auth_reply->peer, choice_done, wpspin,
 						error, auth_reply->user_data);
-out:
+
 	g_free(auth_reply);
 }