notifier: Limit Counter Underflow

[framework/connectivity/connman.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 5303d64..b2b7904 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -47,7 +47,6 @@ struct connman_config_service {
        char *private_key_passphrase_type;
        char *phase2;
        char *passphrase;
-       connman_bool_t from_fs;
 };
 
 struct connman_config {
@@ -66,7 +65,6 @@ static int inotify_wd = -1;
 static GIOChannel *inotify_channel = NULL;
 static uint inotify_watch = 0;
 
-#define NONFS_CONFIG_NAME                "internal"
 #define INTERNAL_CONFIG_PREFIX           "__internal"
 
 /* Definition of possible strings in the .config files */
@@ -348,11 +346,6 @@ static int load_service(GKeyFile *keyfile, const char *group,
                service->passphrase = str;
        }
 
-       if (g_strcmp0(config->ident, NONFS_CONFIG_NAME) != 0)
-               service->from_fs = TRUE;
-       else
-               service->from_fs = FALSE;
-
        if (service_created)
                g_hash_table_insert(config->service_table, service->ident,
                                        service);
@@ -380,6 +373,7 @@ err:
 static int load_config(struct connman_config *config)
 {
        GKeyFile *keyfile;
+       GError *error = NULL;
        gsize length;
        char **groups;
        char *str;
@@ -408,8 +402,11 @@ static int load_config(struct connman_config *config)
        }
 
        protected = g_key_file_get_boolean(keyfile, "global",
-                                       CONFIG_KEY_PROT, NULL);
-       config->protected = protected;
+                                       CONFIG_KEY_PROT, &error);
+       if (error == NULL)
+               config->protected = protected;
+       else
+               config->protected = TRUE;
 
        groups = g_key_file_get_groups(keyfile, &length);
 
@@ -485,6 +482,7 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group,
                                                        service_name);
        g_key_file_set_string(keyfile, "global", CONFIG_KEY_DESC,
                                                "Internal Config File");
+       g_key_file_set_boolean(keyfile, "global", CONFIG_KEY_PROT, FALSE);
 
        content = g_key_file_to_data(keyfile, &content_length, NULL);
        if (content == NULL) {
@@ -498,7 +496,7 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group,
                goto out;
        }
 
-       DBG("Saving %d bytes to %s", content_length, filename);
+       DBG("Saving %zu bytes to %s", content_length, service_name);
 
        if (g_file_set_contents(filename, content,
                                content_length, NULL) == FALSE) {
@@ -516,6 +514,20 @@ out:
        return err;
 }
 
+static connman_bool_t validate_ident(const char *ident)
+{
+       unsigned int i;
+
+       if (ident == NULL)
+               return FALSE;
+
+       for (i = 0; i < strlen(ident); i++)
+               if (g_ascii_isprint(ident[i]) == FALSE)
+                       return FALSE;
+
+       return TRUE;
+}
+
 static int read_configs(void)
 {
        GDir *dir;
@@ -537,21 +549,20 @@ static int read_configs(void)
                        if (ident == NULL)
                                continue;
 
-                       if (g_str_equal(ident, NONFS_CONFIG_NAME) == TRUE)
-                               continue;
-
                        str = g_string_new_len(file, ident - file);
                        if (str == NULL)
                                continue;
 
                        ident = g_string_free(str, FALSE);
 
-                       if (connman_dbus_validate_ident(ident) == TRUE) {
+                       if (validate_ident(ident) == TRUE) {
                                struct connman_config *config;
 
                                config = create_config(ident);
                                if (config != NULL)
                                        load_config(config);
+                       } else {
+                               connman_error("Invalid config ident %s", ident);
                        }
                        g_free(ident);
                }
@@ -624,11 +635,10 @@ static gboolean inotify_data(GIOChannel *channel, GIOCondition cond,
 
                *ext = '\0';
 
-               if (g_str_equal(ident, NONFS_CONFIG_NAME) == TRUE)
-                       continue;
-
-               if (connman_dbus_validate_ident(ident) == FALSE)
+               if (validate_ident(ident) == FALSE) {
+                       connman_error("Invalid config ident %s", ident);
                        continue;
+               }
 
                if (event->mask & IN_CREATE)
                        create_config(ident);
@@ -781,14 +791,7 @@ static void provision_service(gpointer key, gpointer value, gpointer user_data)
        if (memcmp(config->ssid, ssid, ssid_len) != 0)
                return;
 
-       /* do not provision immutable services with non-fs originated configs */
-       if (config->from_fs == FALSE &&
-                       __connman_service_get_immutable(service) == TRUE)
-               return;
-
-       /* only lock services with a config originated from the filesystem */
-       if (config->from_fs == TRUE)
-               __connman_service_set_immutable(service, TRUE);
+       __connman_service_set_immutable(service, TRUE);
 
        __connman_service_set_favorite(service, TRUE);