Add banlist to file functions and configuration params.

diff --git a/src/ban.c b/src/ban.c
index 710148508e2be5bb4f49a1bf9799dc53ef50db42..5e2d2654b53f3209c1ada5d1db9211dc216f2448 100644 (file)
--- a/src/ban.c
+++ b/src/ban.c
@@ -37,20 +37,32 @@
 #include "conf.h"
 #include "ssl.h"
 
+static void Ban_saveBanFile(void);
+static void Ban_readBanFile(void);
+
+
 declare_list(banlist);
 static int bancount; /* = 0 */
 static int ban_duration;
+static bool_t banlist_changed;
 
 void Ban_init(void)
 {
        ban_duration = getIntConf(BAN_LENGTH);
        /* Read ban file here */
+       if (getStrConf(BANFILE) != NULL)
+               Ban_readBanFile();
 }
 
 void Ban_deinit(void)
 {
-       /* Save banlist */
+       /* Save banlist */      
+       if (getStrConf(BANFILE) != NULL)
+               Ban_saveBanFile();
+       
+       Ban_clearBanList();
 }
+
 void Ban_UserBan(client_t *client, char *reason)
 {
        ban_t *ban;
@@ -71,6 +83,9 @@ void Ban_UserBan(client_t *client, char *reason)
        Timer_init(&ban->startTime);
        list_add_tail(&ban->node, &banlist);
        bancount++;
+       banlist_changed = true;
+       if(getBoolConf(SYNC_BANFILE))
+               Ban_saveBanFile();
        
        SSLi_hash2hex(ban->hash, hexhash);
        Log_info_client(client, "User kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds",
@@ -102,6 +117,9 @@ void Ban_pruneBanned()
                        list_del(&ban->node);
                        free(ban);
                        bancount--;
+                       banlist_changed = true;
+                       if(getBoolConf(SYNC_BANFILE))
+                               Ban_saveBanFile();
                }
        }
 }
@@ -173,7 +191,7 @@ message_t *Ban_getBanList(void)
        return msg;
 }
 
-void Ban_clearBanList()
+void Ban_clearBanList(void)
 {
        ban_t *ban;
        struct dlist *itr, *save;
@@ -214,4 +232,86 @@ void Ban_putBanList(message_t *msg, int n_bans)
                list_add_tail(&ban->node, &banlist);
                bancount++;
        }
+       banlist_changed = true;
+       if(getBoolConf(SYNC_BANFILE))
+               Ban_saveBanFile();
+}
+
+static void Ban_saveBanFile(void)
+{
+       struct dlist *itr;
+       ban_t *ban;
+       char hexhash[41];
+       FILE *file;
+
+       if (!banlist_changed)
+               return;
+       file = fopen(getStrConf(BANFILE), "w");
+       if (file == NULL) {
+               Log_warn("Could not save banlist to file %s: %s", getStrConf(BANFILE), strerror(errno));
+               return;
+       }
+       list_iterate(itr, &banlist) {
+               ban = list_get_entry(itr, ban_t, node);
+               SSLi_hash2hex(ban->hash, hexhash);
+               fprintf(file, "%s,%s,%d,%d,%d,%s,%s\n", hexhash, inet_ntoa(*((struct in_addr *)&ban->address)),
+                       ban->mask, ban->time, ban->duration, ban->name, ban->reason);
+       }
+       fclose(file);
+}
+
+static void Ban_readBanFile(void)
+{
+       struct dlist *itr;
+       ban_t *ban;
+       char line[512], *hexhash, *address, *name, *reason;
+       uint32_t mask, duration;
+       time_t time;
+       char *p;
+       FILE *file;
+
+       file = fopen(getStrConf(BANFILE), "r");
+       if (file == NULL) {
+               Log_warn("Could not read banlist file %s: %s", getStrConf(BANFILE), strerror(errno));
+               return;
+       }
+       while (fgets(line, 512, file) != NULL) {
+               p = strtok(line, ",");
+               hexhash = p;
+               p = strtok(NULL, ",");
+               if (p == NULL) break;
+               address = p;
+               p = strtok(NULL, ",");
+               if (p == NULL) break;
+               mask = strtoul(p, NULL, 0);
+               p = strtok(NULL, ",");
+               if (p == NULL) break;
+               time = strtoul(p, NULL, 0);
+               p = strtok(NULL, ",");
+               if (p == NULL) break;
+               duration = strtoul(p, NULL, 0);
+               p = strtok(NULL, ",");
+               if (p == NULL) break;
+               name = p;
+               p = strtok(NULL, "\n");
+               if (p == NULL) break;
+               reason = p;
+               
+               ban = malloc(sizeof(ban_t));
+               if (ban == NULL)
+                       Log_fatal("Out of memory");
+               memset(ban, 0, sizeof(ban_t));
+               SSLi_hex2hash(hexhash, ban->hash);
+               inet_aton(address, (struct in_addr *)&ban->address);
+               ban->name = strdup(name);
+               ban->reason = strdup(reason);
+               ban->time = time;
+               ban->duration = duration;
+               ban->mask = mask;
+               Timer_init(&ban->startTime);
+               list_add_tail(&ban->node, &banlist);
+               bancount++;
+               Log_debug("Banfile: H = '%s' A = '%s' M = %d U = '%s' R = '%s'", hexhash, address, ban->mask, ban->name, ban->reason);
+       }
+       fclose(file);
 }

diff --git a/src/ban.h b/src/ban.h
index f74fd7a0176992721f7b257008f77df856c759cb..280b211ab08a30eff9363b87f556cc832224ba13 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -55,6 +55,7 @@ bool_t Ban_isBannedAddr(in_addr_t *addr);
 int Ban_getBanCount(void);
 message_t *Ban_getBanList(void);
 void Ban_putBanList(message_t *msg, int n_bans);
+void Ban_clearBanList(void);
 void Ban_init(void);
 void Ban_deinit(void);
 

diff --git a/src/conf.c b/src/conf.c
index f2baa3106de0d943126bb20fdf5fa1fa8c32b7e3..ccd8e05cde4dfefe3f8d7bd468569de9ddca24ad 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -195,6 +195,17 @@ const char *getStrConf(param_t param)
                        return NULL;
                }
                break;
+       case BANFILE:
+               setting = config_lookup(&configuration, "banfile");
+               if (!setting)
+                       return NULL;
+               else {
+                       if ((strsetting = config_setting_get_string(setting)) != NULL)
+                               return strsetting;
+                       else
+                       return NULL;
+               }
+               break;
        default:
                doAssert(false);
                break;
@@ -263,6 +274,13 @@ bool_t getBoolConf(param_t param)
                else
                        return config_setting_get_bool(setting);
                break;
+       case SYNC_BANFILE:
+               setting = config_lookup(&configuration, "sync_banfile");
+               if (!setting)
+                       return false;
+               else
+                       return config_setting_get_bool(setting);
+               break;
        default:
                doAssert(false);
        }

diff --git a/src/conf.h b/src/conf.h
index 36115b0f108922fbc4ef46153e1dca908cab9950..ea43e38ccc1803858898ac7c4b6496731112cf51 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -52,6 +52,8 @@ typedef enum param {
        BAN_LENGTH,
        ALLOW_TEXTMESSAGE,
        ENABLE_BAN,
+       BANFILE,
+       SYNC_BANFILE,
 } param_t;
 
 typedef struct {