From db3c80c7d3bba4f4132f380ecfc105a313723d39 Mon Sep 17 00:00:00 2001
From: fall-leaf <iceknight48@gmail.com>
Date: Fri, 4 Aug 2023 11:09:15 +0300
Subject: [PATCH] Added admin list to credentials
---
include/parse.h | 2 +-
src/parse.c | 50 +++++++++++++++++++++++---------------------------
2 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/include/parse.h b/include/parse.h
index 68dd8ff..4b8b5ed 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -16,7 +16,7 @@ DECL char * raw(char const * const sql);
DECL char * remind(char * who);
DECL char * slurp(char const * fn);
DECL int is_admin(char const * user);
-DECL int parse_admin_list(char const * admin_list_file);
+DECL void parse_admins(char * admin_string);
DECL int parse_pair(char const * buf, size_t const len);
DECL void clean_admin_list();
DECL void creds_free_password(void);
diff --git a/src/parse.c b/src/parse.c
index 7374fde..58feed4 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -26,7 +26,7 @@
#include "help.h"
#include "parse.h"
-#define PARAMS_COUNT 5
+#define PARAMS_COUNT 6
enum cred_param_ids_e
{
@@ -34,7 +34,8 @@ enum cred_param_ids_e
PASSWORD,
CHANNEL,
SERVER,
- PORT
+ PORT,
+ ADMINS
};
char const * cred_names[] =
@@ -43,7 +44,8 @@ char const * cred_names[] =
"password",
"channel",
"server",
- "port"
+ "port",
+ "admins"
};
size_t const cred_names_len[] =
@@ -52,7 +54,8 @@ size_t const cred_names_len[] =
8,
7,
6,
- 4
+ 4,
+ 6
};
creds_t creds = {0};
@@ -189,6 +192,10 @@ parse_pair(char const * buf, size_t len)
case CHANNEL: creds.channel = strndup(buf,x); break;
case SERVER: creds.server = strndup(buf,x); break;
case PORT: creds.port = atoi(buf); break;
+
+ case ADMINS:
+ parse_admins(strndup(buf,x));
+ break;
}
if (x + 2 < len)
{ buf += x + 1; }
@@ -203,48 +210,37 @@ parse_pair(char const * buf, size_t len)
return 0;
}
-DECL int
-parse_admin_list(char const * admin_list_path)
+/* WARNING: admin_string WILL be changed */
+DECL void
+parse_admins(char * admin_string)
{
#define ADMIN_LIST_INIT_SIZE 8
/* prealloc with 8 */
size_t current_array_size = ADMIN_LIST_INIT_SIZE;
- FILE * stream;
- size_t lines_read = 0;
- char * line = NULL;
- size_t nread = 0;
-
- stream = fopen(admin_list_path, "r");
- if (stream == NULL)
- {
- /* Pretty valid case I guess? No admin file = no admins,
- maybe all configuration is performed locally */
- return 0;
- }
+ size_t i = 0;
+ char * token = NULL;
admins = calloc(ADMIN_LIST_INIT_SIZE, sizeof(char *));
- while (getline(&line, &nread, stream) > 0)
+ while ((token = strtok(admin_string, " ")))
{
- if (++lines_read > current_array_size)
+ if (++i > current_array_size)
{
/* double the space */
current_array_size *= 2;
- realloc(admins, current_array_size);
+ admins = realloc(admins, current_array_size);
}
- admins[lines_read - 1] = line;
+ admins[i - 1] = strdup(token);
}
/* set up array end marker for proper clean-up later */
- if (lines_read + 1 > current_array_size)
+ if (i + 1 > current_array_size)
{
- realloc(admins, current_array_size + 1);
+ admins = realloc(admins, current_array_size + 1);
}
- admins[lines_read] = NULL;
-
- return 0;
+ admins[i] = NULL;
}
DECL int