Started using new file reader tokenizer.

src/core/pluginloader.c

@@ -123,40 +123,31 @@ void plugin_unload(struct uhub_plugin_handle* plugin)
 static int plugin_parse_line(char* line, int line_count, void* ptr_data)
 {
 	struct uhub_plugins* handle = (struct uhub_plugins*) ptr_data;
-	char* pos;
+	struct linked_list* tokens = cfg_tokenize(line);
+	char *directive, *soname, *params;
 
-	strip_off_ini_line_comments(line, line_count);
+	if (list_size(tokens) == 0)
-
-	line = strip_white_space(line);
-	if (!*line)
 		return 0;
 
-	LOG_TRACE("plugin: parse line %d: \"%s\"", line_count, line);
+	if (list_size(tokens) < 2)
+		return -1;
 
-	// Set plugin directory.
+	directive = list_get_first(tokens);
-	pos = strstr(line, "plugin_directory");
+	soname    = list_get_next(tokens);
-	if (pos && is_white_space(line[(pos - line) + strlen("plugin_directory")]))
+	params    = list_get_next(tokens);
-	{
-		if (handle->plugin_dir)
-			hub_free(handle->plugin_dir);
-		handle->plugin_dir = strdup(strip_white_space(pos + strlen("plugin_directory") + 1));
-		return 0;
-	}
 
-	// Load plugin
+	if (strcmp(directive, "plugin") == 0 && soname && *soname)
-	pos = strstr(line, "plugin");
-	if (pos && is_white_space(line[(pos - line) + strlen("plugin")]))
 	{
-		char* data = strip_white_space(pos + strlen("plugin") + 1);
+		if (!params)
-		if (*data)
+			params = "";
+
+
+		LOG_TRACE("Load plugin: \"%s\", params=\"%s\"", soname, params);
+		struct uhub_plugin_handle* plugin = plugin_load(soname, params);
+		if (plugin)
 		{
-			LOG_TRACE("Load plugin: \"%s\"", data);
+			list_append(handle->loaded, plugin);
-			struct uhub_plugin_handle* plugin = plugin_load(data, "");
+			return 0;
-			if (plugin)
-			{
-				list_append(handle->loaded, plugin);
-				return 0;
-			}
 		}
 	}
 

src/plugins/mod_auth_simple.c

@@ -7,40 +7,71 @@
 #include "util/memory.h"
 #include "util/list.h"
 #include "util/ipcalc.h"
-
+#include "util/misc.h"
-
+#include "util/log.h"
-struct user_access_info
+#include "util/config_token.h"
-{
-	char* username;
-	char* password;
-	enum auth_credentials credentials;
-};
 
 struct acl_list
 {
-	struct linked_list* users; /* see struct user_access_info */
+	struct linked_list* users;
 };
 
-static void free_user_access_info(void* ptr)
+void insert_user(struct linked_list* users, const char* nick, const char* pass, enum auth_credentials cred)
 {
-	struct user_access_info* info = (struct user_access_info*) ptr;
+	struct auth_info* data = (struct auth_info*) hub_malloc_zero(sizeof(struct auth_info));
-	hub_free(info->username);
+	strncpy(data->nickname, nick, MAX_NICK_LEN);
-	hub_free(info->password);
+	strncpy(data->password, pass, MAX_PASS_LEN);
-	hub_free(info);
+	data->credentials = cred;
+	list_append(users, data);
 }
 
+
+static int parse_line(char* line, int line_count, void* ptr_data)
+{
+	struct linked_list* users = (struct linked_list*) ptr_data;
+	struct linked_list* tokens = cfg_tokenize(line);
+	enum auth_credentials cred;
+
+	if (list_size(tokens) != 3)
+		return 0;
+
+	char* credential = (char*) list_get_first(tokens);
+	char* username   = (char*) list_get_next(tokens);
+	char* password   = (char*) list_get_next(tokens);
+
+	if (strcmp(credential, "user_admin"))           cred = auth_cred_admin;
+	else if (strcmp(credential, "user_super"))      cred = auth_cred_super;
+	else if (strcmp(credential, "user_op"))         cred = auth_cred_operator;
+	else if (strcmp(credential, "user_reg"))        cred = auth_cred_user;
+	else
+		return -1;
+
+	insert_user(users, username, password, cred);
+	cfg_tokens_free(tokens);
+	return 0;
+}
+
+
 static struct acl_list* load_acl(const char* filename)
 {
 	struct acl_list* list = (struct acl_list*) hub_malloc(sizeof(struct acl_list));
 	struct linked_list* users = list_create();
 
-	if (!list || !users)
+	if (!list || !users || !filename || !*filename)
 	{
 		list_destroy(users);
 		hub_free(list);
 		return 0;
 	}
 
+	if (users)
+	{
+		if (file_read_lines(filename, users, &parse_line) == -1)
+		{
+			fprintf(stderr, "Unable to load %s\n", filename);
+		}
+	}
+
 	list->users = users;
 	return list;
 }
@@ -50,11 +81,31 @@ static void unload_acl(struct acl_list* list)
 	if (!list)
 		return;
 
-	list_clear(list->users, free_user_access_info);
+	list_clear(list->users, hub_free);
 	list_destroy(list->users);
 	hub_free(list);
 }
 
+static int get_user(const char* nickname, struct auth_info* info)
+{
+	return 0;
+}
+
+static plugin_st register_user(struct auth_info* user)
+{
+	return st_deny;
+}
+
+static plugin_st update_user(struct auth_info* user)
+{
+	return st_deny;
+}
+
+static plugin_st delete_user(struct auth_info* user)
+{
+	return st_deny;
+}
+
 
 int plugin_register(struct uhub_plugin_handle* plugin, const char* config)
 {
@@ -65,14 +116,14 @@ int plugin_register(struct uhub_plugin_handle* plugin, const char* config)
 	plugin->plugin_funcs_size = sizeof(struct plugin_funcs);
 	memset(&plugin->funcs, 0, sizeof(struct plugin_funcs));
 
+	// Authentication actions.
+	plugin->funcs.auth_get_user = get_user;
+	plugin->funcs.auth_register_user = register_user;
+	plugin->funcs.auth_update_user = update_user;
+	plugin->funcs.auth_delete_user = delete_user;
+
 	plugin->ptr = load_acl(config);	
 
-/*
-	plugin->funcs.on_connect = log_connect;
-	plugin->funcs.on_user_login = log_user_login;
-	plugin->funcs.on_user_logout = log_user_logout;
-	plugin->funcs.on_user_change_nick = log_change_nick;
-*/
 	return 0;
 }
 

src/uhub.h

@@ -58,6 +58,7 @@ extern "C" {
 
 #include "adc/adcconst.h"
 
+#include "util/config_token.h"
 #include "util/ipcalc.h"
 #include "util/list.h"
 #include "util/log.h"