Added support to set private-key password.

[platform/core/connectivity/net-config.git] / src / wifi-config.c

diff --git a/src/wifi-config.c b/src/wifi-config.c
index 72914a6..2d9f5f8 100755 (executable)
--- a/src/wifi-config.c
+++ b/src/wifi-config.c
@@ -33,6 +33,7 @@
 #include "neterror.h"
 #include "wifi-config.h"
 #include "netsupplicant.h"
+#include "wifi-key-encryption.h"
 
 #define CONNMAN_STORAGE         "/var/lib/connman"
 
@@ -54,6 +55,7 @@ struct wifi_eap_config {
        gchar *ca_cert;
        gchar *client_cert;
        gchar *private_key;
+       gchar *private_key_password;
        gchar *identity;
        gchar *eap_type;
        gchar *eap_auth_type;
@@ -90,6 +92,7 @@ static void __free_wifi_configuration(struct wifi_config *conf)
                g_free(conf->eap_config->ca_cert);
                g_free(conf->eap_config->client_cert);
                g_free(conf->eap_config->private_key);
+               g_free(conf->eap_config->private_key_password);
                g_free(conf->eap_config->identity);
                g_free(conf->eap_config->eap_type);
                g_free(conf->eap_config->eap_auth_type);
@@ -164,6 +167,7 @@ static gboolean __get_group_name(const gchar *prefix, const gchar *config_id, gc
        ret = __get_mac_address(&mac_address);
        if ((ret != TRUE) || (strlen(mac_address) == 0)) {
                ERR("Cannot get WIFI MAC address");
+               g_free(mac_address);
                return FALSE;
        }
 
@@ -314,6 +318,7 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
                config->eap_config->ca_cert = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_CACERT, NULL);
                config->eap_config->client_cert = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_CLIENTCERT, NULL);
                config->eap_config->private_key = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_PRIVATEKEY, NULL);
+               config->eap_config->private_key_password = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_PRIVATEKEY_PASSWORD, NULL);
                config->eap_config->identity = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_IDENTITY, NULL);
                config->eap_config->eap_type = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_TYPE, NULL);
                config->eap_config->eap_auth_type = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_AUTH_TYPE, NULL);
@@ -327,6 +332,8 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
                        DBG("client_cert [%s]", config->eap_config->client_cert);
                if (config->eap_config->private_key)
                        DBG("private_key [%s]", config->eap_config->private_key);
+               if (config->eap_config->private_key_password)
+                       DBG("private_key_password [%s]", config->eap_config->private_key_password);
                if (config->eap_config->identity)
                        DBG("identity [%s]", config->eap_config->identity);
                if (config->eap_config->eap_type)
@@ -594,7 +601,7 @@ gboolean wifi_config_remove_configuration(const gchar *config_id)
        return ret;
 }
 
-static int __netconfig_hex_char_to_num(char c)
+int __netconfig_hex_char_to_num(char c)
 {
        if (c >= '0' && c <= '9')
                return c - '0';
@@ -608,7 +615,7 @@ static int __netconfig_hex_char_to_num(char c)
        return -1;
 }
 
-static int __netconfig_hex_to_byte(const char *hex)
+int __netconfig_hex_to_byte(const char *hex)
 {
        int a, b;
 
@@ -623,7 +630,7 @@ static int __netconfig_hex_to_byte(const char *hex)
        return (a << 4) | b;
 }
 
-static int __netconfig_hex_str_to_bin(const char *hex, unsigned char *buf, size_t len)
+int __netconfig_hex_str_to_bin(const char *hex, unsigned char *buf, size_t len)
 {
        size_t i;
        int a;
@@ -691,6 +698,7 @@ static int __netconfig_unpack_ay_malloc(unsigned char **dst, GVariantIter *iter)
        tmp_dst = (unsigned char *)g_try_malloc0(length + 1);
        if (!tmp_dst) {
                ERR("failed to allocate memory");
+               g_variant_iter_free(iter_copy);
                return 0;
        }
 
@@ -914,13 +922,13 @@ gboolean handle_get_config_ids(Wifi *wifi, GDBusMethodInvocation *context)
        guint length;
        gchar **result = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        config_ids = _get_list();
        if (config_ids == NULL) {
                ERR("Fail to get config list");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        length = g_slist_length(config_ids);
@@ -952,7 +960,7 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        GVariantBuilder *b = NULL;
        struct wifi_config *conf = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        conf = g_new0(struct wifi_config, 1);
 
@@ -961,7 +969,7 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                g_free(conf);
                ERR("Fail to _load_configuration");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        b = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
@@ -1005,7 +1013,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        conf = g_new0(struct wifi_config, 1);
@@ -1061,15 +1069,27 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                g_free(conf->proxy_address);
                g_free(conf);
                ERR("Fail to get_wifi_config_group_name");
-               return FALSE;
+               netconfig_error_fail_save_congifuration(context);
+               return TRUE;
        }
 
        keyfile = g_key_file_new();
        g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_NAME, conf->name);
        g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_SSID, conf->ssid);
 
-       if (conf->passphrase != NULL)
+       if (conf->passphrase != NULL) {
+               gchar *enc_data = NULL;
+               enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+
+               if (!enc_data) {
+                       ERR("Failed to encrypt the passphrase");
+               } else {
+                       g_free(conf->passphrase);
+                       conf->passphrase = enc_data;
+               }
+
                g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_PASSPHRASE, conf->passphrase);
+       }
 
        g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_FAVORITE, conf->favorite);
        g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_AUTOCONNECT, conf->autoconnect);
@@ -1107,7 +1127,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
 
        g_variant_iter_free(iter);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1117,7 +1137,7 @@ gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        GVariantBuilder *b = NULL;
        struct wifi_config *conf = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        conf = g_new0(struct wifi_config, 1);
        conf->eap_config = g_new0(struct wifi_eap_config, 1);
@@ -1128,7 +1148,7 @@ gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                g_free(conf);
                ERR("Fail to _load_configuration");
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        b = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
@@ -1166,6 +1186,11 @@ gboolean handle_load_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                else
                        g_variant_builder_add(b, "{sv}", WIFI_CONFIG_EAP_PRIVATEKEY, g_variant_new_string("NONE"));
 
+               if (conf->eap_config->private_key_password != NULL)
+                       g_variant_builder_add(b, "{sv}", WIFI_CONFIG_EAP_PRIVATEKEY_PASSWORD, g_variant_new_string(conf->eap_config->private_key_password));
+               else
+                       g_variant_builder_add(b, "{sv}", WIFI_CONFIG_EAP_PRIVATEKEY_PASSWORD, g_variant_new_string("NONE"));
+
                if (conf->eap_config->identity != NULL)
                        g_variant_builder_add(b, "{sv}", WIFI_CONFIG_EAP_IDENTITY, g_variant_new_string(conf->eap_config->identity));
                else
@@ -1208,7 +1233,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        conf = g_new0(struct wifi_config, 1);
@@ -1279,6 +1304,13 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                        } else {
                                conf->eap_config->private_key = NULL;
                        }
+               } else if (g_strcmp0(field, WIFI_CONFIG_EAP_PRIVATEKEY_PASSWORD) == 0) {
+                       if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
+                               conf->eap_config->private_key_password = g_strdup(g_variant_get_string(value, NULL));
+                               DBG("private_key_password[%s]", conf->eap_config->private_key_password);
+                       } else {
+                               conf->eap_config->private_key_password = NULL;
+                       }
                } else if (g_strcmp0(field, WIFI_CONFIG_EAP_IDENTITY) == 0) {
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                conf->eap_config->identity = g_strdup(g_variant_get_string(value, NULL));
@@ -1316,15 +1348,25 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        if (ret != TRUE) {
                __free_wifi_configuration(conf);
                ERR("Fail to get_wifi_config_group_name");
-               return FALSE;
+               return TRUE;
        }
 
        keyfile = g_key_file_new();
        g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_NAME, conf->name);
        g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_SSID, conf->ssid);
 
-       if (conf->passphrase != NULL)
+       if (conf->passphrase != NULL) {
+               gchar *enc_data = NULL;
+               enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+
+               if (!enc_data) {
+                       ERR("Failed to encrypt the passphrase");
+               } else {
+                       g_free(conf->passphrase);
+                       conf->passphrase = enc_data;
+               }
                g_key_file_set_string(keyfile, group_name, WIFI_CONFIG_PASSPHRASE, conf->passphrase);
+       }
 
        g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_FAVORITE, conf->favorite);
        g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_AUTOCONNECT, conf->autoconnect);
@@ -1358,6 +1400,10 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                g_key_file_set_string(keyfile, group_name,
                        WIFI_CONFIG_EAP_PRIVATEKEY, conf->eap_config->private_key);
 
+       if (conf->eap_config->private_key_password != NULL)
+               g_key_file_set_string(keyfile, group_name,
+                       WIFI_CONFIG_EAP_PRIVATEKEY_PASSWORD, conf->eap_config->private_key_password);
+
        if (conf->eap_config->identity != NULL)
                g_key_file_set_string(keyfile, group_name,
                        WIFI_CONFIG_EAP_IDENTITY, conf->eap_config->identity);
@@ -1389,7 +1435,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
 
        g_variant_iter_free(iter);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context, const gchar *config_id)
@@ -1399,7 +1445,7 @@ gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if ((wifi == NULL) || (config_id == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _remove_configuration(config_id);
@@ -1407,11 +1453,11 @@ gboolean handle_remove_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                /* no configuration or error */
                ERR("No [%s] configuration", config_id);
                netconfig_error_no_profile(context);
-               return FALSE;
+               return TRUE;
        }
 
        wifi_complete_remove_configuration(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 /* config field key / value */
@@ -1440,9 +1486,9 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        gboolean ret = FALSE;
        gchar *keyfile_key = NULL;
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(config_id != NULL, FALSE);
-       g_return_val_if_fail(key != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(config_id != NULL, TRUE);
+       g_return_val_if_fail(key != NULL, TRUE);
 
        DBG("Key[%s] Value[%d]", key, value);
 
@@ -1451,7 +1497,7 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
                if (!ret) {
                        ERR("Fail to [%s]set_wifi_config_field(%s/manual)", config_id, WIFI_CONFIG_PROXY_METHOD);
                        netconfig_error_invalid_parameter(context);
-                       return FALSE;
+                       return TRUE;
                }
                keyfile_key = g_strdup_printf("%s", WIFI_CONFIG_PROXY_SERVER);
        } else if (g_strcmp0(key, WIFI_CONFIG_HIDDEN) == 0) {
@@ -1475,20 +1521,19 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        } else {
                ERR("Not supported key[%s]", key);
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _set_field(config_id, keyfile_key, (const gchar *)value);
        if (!ret) {
                ERR("Fail to [%s]set_wifi_config_field(%s/%s)", config_id, key, value);
-               ret = FALSE;
        }
 
        if (keyfile_key != NULL)
                g_free(keyfile_key);
 
        wifi_complete_set_config_field(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_get_config_passphrase(Wifi *wifi, GDBusMethodInvocation *context, const gchar *config_id)
@@ -1499,20 +1544,20 @@ gboolean handle_get_config_passphrase(Wifi *wifi, GDBusMethodInvocation *context
        if ((wifi == NULL) || (config_id == NULL)) {
                ERR("Invalid parameter");
                netconfig_error_invalid_parameter(context);
-               return FALSE;
+               return TRUE;
        }
 
        ret = _get_field(config_id, WIFI_CONFIG_PASSPHRASE, &passphrase);
        if (!ret) {
                ERR("Fail to [%s] _get_field(%s)", config_id, WIFI_CONFIG_PASSPHRASE);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return FALSE;
+               return TRUE;
        }
 
        wifi_complete_get_config_passphrase(wifi, context, passphrase);
        g_free(passphrase);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1520,8 +1565,8 @@ gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d] VSIE: [%s]", frame_id, vsie);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(vsie != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(vsie != NULL, TRUE);
 
        gboolean ret = FALSE;
 
@@ -1529,11 +1574,11 @@ gboolean handle_add_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to add vsie: %s", vsie);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        wifi_complete_add_vsie(wifi, context);
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1541,7 +1586,7 @@ gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d]", frame_id);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
        gboolean ret = FALSE;
        gchar *vsie = NULL;
@@ -1550,13 +1595,13 @@ gboolean handle_get_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to get vsie for frame:[%d]", frame_id);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        DBG("Received vsie: %s", vsie);
        wifi_complete_get_vsie(wifi, context, vsie);
 
-       return ret;
+       return TRUE;
 }
 
 gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
@@ -1564,8 +1609,8 @@ gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
 {
        DBG("Frame ID: [%d] VSIE: [%s]", frame_id, vsie);
 
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(vsie != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       g_return_val_if_fail(vsie != NULL, TRUE);
 
        gboolean ret = FALSE;
 
@@ -1573,9 +1618,9 @@ gboolean handle_remove_vsie(Wifi *wifi, GDBusMethodInvocation *context,
        if (!ret) {
                DBG("Failed to remove vsie: %s", vsie);
                netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "OperationFailed");
-               return ret;
+               return TRUE;
        }
 
        wifi_complete_remove_vsie(wifi, context);
-       return ret;
+       return TRUE;
 }