-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
are met:
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
#include <stdlib.h>
#include <time.h>
+#include <string.h>
#include "log.h"
#include "list.h"
#include "ban.h"
#include "conf.h"
#include "ssl.h"
+#include "util.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 */
+ if (getStrConf(BANFILE) != NULL)
+ Ban_saveBanFile();
+
+ Ban_clearBanList();
}
+
void Ban_UserBan(client_t *client, char *reason)
{
ban_t *ban;
char hexhash[41];
- ban = malloc(sizeof(ban_t));
+ ban = calloc(1, sizeof(ban_t));
if (ban == NULL)
Log_fatal("Out of memory");
- memset(ban, 0, sizeof(ban_t));
-
+
memcpy(ban->hash, client->hash, 20);
- memcpy(&ban->address, &client->remote_tcp.sin_addr, sizeof(in_addr_t));
- ban->mask = 128;
+
+ ban->address = client->remote_tcp;
+ ban->mask = (ban->address.ss_family == AF_INET) ? 32 : 128;
ban->reason = strdup(reason);
ban->name = strdup(client->username);
ban->time = time(NULL);
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",
- ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)),
- ban->duration);
+ ban->reason, hexhash, Util_clientAddressToString(client), ban->duration);
}
{
struct dlist *itr;
ban_t *ban;
- char hexhash[41];
uint64_t bantime_long;
-
+
list_iterate(itr, &banlist) {
ban = list_get_entry(itr, ban_t, node);
bantime_long = ban->duration * 1000000LL;
#ifdef DEBUG
SSLi_hash2hex(ban->hash, hexhash);
Log_debug("BL: User %s Reason: '%s' Hash: %s IP: %s Time left: %d",
- ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)),
- bantime_long / 1000000LL - Timer_elapsed(&ban->startTime) / 1000000LL);
+ ban->name, ban->reason, hexhash, Util_addressToString(&ban->address)),
+ bantime_long / 1000000LL - Timer_elapsed(&ban->startTime) / 1000000LL);
#endif
/* Duration of 0 = forever */
if (ban->duration != 0 && Timer_isElapsed(&ban->startTime, bantime_long)) {
list_del(&ban->node);
free(ban);
bancount--;
+ banlist_changed = true;
+ if(getBoolConf(SYNC_BANFILE))
+ Ban_saveBanFile();
}
}
}
ban_t *ban;
list_iterate(itr, &banlist) {
ban = list_get_entry(itr, ban_t, node);
- if (memcmp(ban->hash, client->hash, 20) == 0)
+ if (memcmp(ban->hash, client->hash, 20) == 0)
return true;
}
return false;
-
+
}
-bool_t Ban_isBannedAddr(in_addr_t *addr)
+bool_t Ban_isBannedAddr(struct sockaddr_storage *address)
{
struct dlist *itr;
ban_t *ban;
- int mask;
- in_addr_t tempaddr1, tempaddr2;
-
+ uint64_t clientAddressBytes[2] = {0};
+ uint64_t banAddressBytes[2] = {0};
+ uint64_t banMaskBits[2] = {UINT64_MAX};
+
+ if (address->ss_family == AF_INET) {
+ memcpy(clientAddressBytes, &((struct sockaddr_in *)address)->sin_addr, 4);
+ } else {
+ memcpy(clientAddressBytes, &((struct sockaddr_in6 *)address)->sin6_addr, 16);
+ }
+
list_iterate(itr, &banlist) {
ban = list_get_entry(itr, ban_t, node);
- mask = ban->mask - 96;
- if (mask < 32) { /* XXX - only ipv4 support */
- memcpy(&tempaddr1, addr, sizeof(in_addr_t));
- memcpy(&tempaddr2, &ban->address, sizeof(in_addr_t));
- tempaddr1 &= (2 ^ mask) - 1;
- tempaddr2 &= (2 ^ mask) - 1;
+
+ if(address->ss_family == ban->address.ss_family) {
+ if (ban->address.ss_family == AF_INET) {
+ memcpy(banAddressBytes, &((struct sockaddr_in *)&ban->address)->sin_addr, 4);
+ } else {
+ memcpy(banAddressBytes, &((struct sockaddr_in6 *)&ban->address)->sin6_addr, 16);
+ }
+
+ banMaskBits[0] <<= (ban->mask >= 64) ? 0 : 64 - ban->mask;
+ banMaskBits[1] <<= (ban->mask > 64) ? 128 - ban->mask : 64;
+
+ clientAddressBytes[0] &= banMaskBits[0];
+ clientAddressBytes[1] &= banMaskBits[1];
+
+ banAddressBytes[0] &= banMaskBits[0];
+ banAddressBytes[1] &= banMaskBits[1];
+
+ if (memcmp(clientAddressBytes, banAddressBytes, 16) == 0) {
+ return true;
+ }
+
}
- if (memcmp(&tempaddr1, &tempaddr2, sizeof(in_addr_t)) == 0)
- return true;
+
}
+
return false;
}
char timestr[32];
char hexhash[41];
uint8_t address[16];
-
+
msg = Msg_banList_create(bancount);
list_iterate(itr, &banlist) {
ban = list_get_entry(itr, ban_t, node);
gmtime_r(&ban->time, ×pec);
strftime(timestr, 32, "%Y-%m-%dT%H:%M:%S", ×pec);
SSLi_hash2hex(ban->hash, hexhash);
- /* ipv4 representation as ipv6 address. */
memset(address, 0, 16);
- memcpy(&address[12], &ban->address, 4);
- memset(&address[10], 0xff, 2); /* IPv4 */
- Msg_banList_addEntry(msg, i++, address, ban->mask, ban->name,
- hexhash, ban->reason, timestr, ban->duration);
+
+ if(ban->address.ss_family == AF_INET) {
+ memcpy(&address[12], &((struct sockaddr_in *)&ban->address)->sin_addr, 4);
+ memset(&address[10], 0xff, 2);
+ Msg_banList_addEntry(msg, i++, address, ban->mask + 96, ban->name, hexhash, ban->reason, timestr, ban->duration);
+ } else {
+ memcpy(&address, &((struct sockaddr_in6 *)&ban->address)->sin6_addr, 16);
+ Msg_banList_addEntry(msg, i++, address, ban->mask, ban->name, hexhash, ban->reason, timestr, ban->duration);
+ }
+
}
return msg;
}
-void Ban_clearBanList()
+void Ban_clearBanList(void)
{
ban_t *ban;
struct dlist *itr, *save;
char *hexhash, *name, *reason, *start;
uint32_t duration, mask;
uint8_t *address;
-
+ char mappedBytes[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff};
+
for (i = 0; i < n_bans; i++) {
Msg_banList_getEntry(msg, i, &address, &mask, &name, &hexhash, &reason, &start, &duration);
ban = malloc(sizeof(ban_t));
if (ban == NULL)
Log_fatal("Out of memory");
- memset(ban, 0, sizeof(ban_t));
SSLi_hex2hash(hexhash, ban->hash);
- memcpy(&ban->address, &address[12], 4);
+
+ if(memcmp(address, mappedBytes, 12) == 0) {
+ memcpy(&((struct sockaddr_in *)&ban->address)->sin_addr, &address[12], 4);
+ ban->address.ss_family = AF_INET;
+ if (mask > 32) {
+ mask = 32;
+ }
+ } else {
+ memcpy(&((struct sockaddr_in6 *)&ban->address)->sin6_addr, address, 16);
+ ban->address.ss_family = AF_INET6;
+ }
+
ban->mask = mask;
ban->reason = strdup(reason);
ban->name = strdup(name);
strptime(start, "%Y-%m-%dT%H:%M:%S", ×pec);
ban->time = mktime(×pec);
- Timer_init(&ban->startTime);
+ ban->startTime = ban->time * 1000000LL;
+ ban->duration = duration;
+ 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,%ld,%d,%s,%s\n", hexhash, Util_addressToString(&ban->address),ban->mask, (long int)ban->time, ban->duration, ban->name, ban->reason);
+ }
+ fclose(file);
+ banlist_changed = false;
+ Log_info("Banlist file '%s': %d entries written", getStrConf(BANFILE), bancount);
+}
+
+static void Ban_readBanFile(void)
+{
+ ban_t *ban;
+ char line[1024], *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, 1024, 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);
+ if (inet_pton(AF_INET, address, &ban->address) == 0) {
+ if (inet_pton(AF_INET6, address, &ban->address) == 0) {
+ Log_warn("Address \"%s\" is illegal!", address);
+ } else {
+ ban->address.ss_family = AF_INET6;
+ }
+ } else {
+ ban->address.ss_family = AF_INET;
+ }
+ ban->name = strdup(name);
+ ban->reason = strdup(reason);
+ if (ban->name == NULL || ban->reason == NULL)
+ Log_fatal("Out of memory");
+ ban->time = time;
ban->duration = duration;
+ ban->mask = mask;
+ ban->startTime = ban->time * 1000000LL;
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);
+ Log_info("Banlist file '%s': %d entries read", getStrConf(BANFILE), bancount);
}
projects / umurmur.git / blobdiff