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 "memory.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);
ban_t *ban;
char hexhash[41];
- ban = malloc(sizeof(ban_t));
- if (ban == NULL)
- Log_fatal("Out of memory");
- memset(ban, 0, sizeof(ban_t));
+ ban = Memory_safeCalloc(1, 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);
ban->duration = ban_duration;
- Timer_init(&ban->startTime);
list_add_tail(&ban->node, &banlist);
bancount++;
banlist_changed = true;
Ban_saveBanFile();
SSLi_hash2hex(ban->hash, hexhash);
+
+ char *clientAddressString = Util_clientAddressToString(client);
+
Log_info_client(client, "User kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds",
- ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)), ban->duration);
+ ban->reason, hexhash, clientAddressString, ban->duration);
+
+ free(clientAddressString);
}
{
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
+ char hexhash[41];
SSLi_hash2hex(ban->hash, hexhash);
+ char *addressString = Util_addressToString(&ban->address);
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, addressString,
+ ban->time + ban->duration - time(NULL));
+ free(addressString);
#endif
/* Duration of 0 = forever */
- if (ban->duration != 0 && Timer_isElapsed(&ban->startTime, bantime_long)) {
+ if (ban->duration != 0 && ban->time + ban->duration - time(NULL) <= 0) {
free(ban->name);
free(ban->reason);
list_del(&ban->node);
}
-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;
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 (ban->address.ss_family == address->ss_family) {
+ if (address->ss_family == AF_INET) {
+ uint32_t a1, a2, mask;
+ mask = (ban->mask == 32) ? UINT32_MAX : (1u << ban->mask) - 1;
+ a1 = (uint32_t)((struct sockaddr_in *)&ban->address)->sin_addr.s_addr & mask;
+ a2 = (uint32_t)((struct sockaddr_in *)address)->sin_addr.s_addr & mask;
+ if (a1 == a2)
+ return true;
+ } else {
+ uint64_t mask[2];
+ uint64_t *a1 = (uint64_t *) &((struct sockaddr_in6 *)&ban->address)->sin6_addr.s6_addr;
+ uint64_t *a2 = (uint64_t *) &((struct sockaddr_in6 *)address)->sin6_addr.s6_addr;
+
+ if (ban->mask == 128)
+ mask[0] = mask[1] = 0xffffffffffffffffULL;
+ else if (ban->mask > 64) {
+ mask[0] = 0xffffffffffffffffULL;
+ mask[1] = SWAPPED(~((1ULL << (128 - ban->mask)) - 1));
+ } else {
+ mask[0] = SWAPPED(~((1ULL << (64 - ban->mask)) - 1));
+ mask[1] = 0ULL;
+ }
+ if ((a1[0] & mask[0]) == (a2[0] & mask[0]) &&
+ (a1[1] & mask[1]) == (a2[1] & mask[1]))
+ return true;
+ }
}
- if (memcmp(&tempaddr1, &tempaddr2, sizeof(in_addr_t)) == 0)
- return true;
}
+
return false;
}
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);
+ strftime(timestr, 32, "%Y-%m-%dT%H:%M:%SZ", ×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;
}
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};
+ char *tz;
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));
+ ban = Memory_safeMalloc(1, 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);
+
+ /*
+ * Parse the timestring. We need to set TZ to UTC so that mktime() knows that the info in
+ * struct tm indeed is given in UTC. Otherwise it will use the current locale. There's
+ * apparently no other way to do this...
+ */
+ memset(×pec, 0, sizeof(struct tm));
strptime(start, "%Y-%m-%dT%H:%M:%S", ×pec);
+ tz = getenv("TZ");
+ setenv("TZ", "UTC", 1);
+ tzset();
ban->time = mktime(×pec);
- ban->startTime = ban->time * 1000000LL;
+ if (tz)
+ setenv("TZ", tz, 1);
+ else
+ unsetenv("TZ");
+ tzset();
+
ban->duration = duration;
list_add_tail(&ban->node, &banlist);
bancount++;
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, inet_ntoa(*((struct in_addr *)&ban->address)),
- ban->mask, (long int)ban->time, ban->duration, ban->name, ban->reason);
+
+ char *addressString = Util_addressToString(&ban->address);
+ fprintf(file, "%s,%s,%d,%ld,%d,%s,%s\n", hexhash, addressString,ban->mask, (long int)ban->time, ban->duration, ban->name, ban->reason);
+ free(addressString);
}
fclose(file);
banlist_changed = false;
static void Ban_readBanFile(void)
{
- struct dlist *itr;
ban_t *ban;
char line[1024], *hexhash, *address, *name, *reason;
uint32_t mask, duration;
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));
+ ban = Memory_safeCalloc(1, sizeof(ban_t));
SSLi_hex2hash(hexhash, ban->hash);
- inet_aton(address, (struct in_addr *)&ban->address);
+ 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)
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);
projects / umurmur.git / blobdiff