Merge pull request #36 from prokopowicz/master

abedra · abedra · commit ab6c6f62aff2 · 2015-10-02T10:10:47.000-05:00
exposed mark methods - made cache expiry configurable
diff --git a/src/blacklist.c b/src/blacklist.c
@@ -3,7 +3,6 @@
 #include "common.h"
 #include "cidr.h"
 
-#include "blacklist.h"
 #include "check_cidr.h"
 
 /**
@@ -14,12 +13,16 @@
 
 int initial_blacklist_size = 100;
 
+/**
+ * externally settable parameter
+ *
+ * @param new_size initial size of expandable blacklist cache
+ */
+
 void set_initial_blacklist_size(int new_size) 
 {
   initial_blacklist_size = new_size;
 }
-
-
 /**
  * Adds the actor to the Repsheet blacklist
  *
diff --git a/src/blacklist.h b/src/blacklist.h
diff --git a/src/check_cidr.c b/src/check_cidr.c
@@ -7,13 +7,23 @@
 #include "vector.h"
 
 
-int CACHED_FOR_SECONDS = 60;
+unsigned int cache_expiry = 60;
+
+/**
+ * externally settable parameter
+ *
+ * @param new_expiry number of seconds for caching CIDR blocks before hitting redis again
+ */
+void set_cache_expiry(unsigned int new_expiry) 
+{
+  cache_expiry = new_expiry;
+}
 
 int check_and_update_cache(redisContext *context, const char *actor, char *reason, char *list, expanding_vector *ev, time_t *last_update_time)
 {
   long current_seconds = time(NULL);
 
-  if (*last_update_time + CACHED_FOR_SECONDS < current_seconds) {
+  if (*last_update_time + cache_expiry < current_seconds) {
     clear_expanding_vector(ev);
     redisReply *listed = redisCommand(context, "SMEMBERS repsheet:cidr:%s", list);
     if (listed) {
diff --git a/src/check_cidr.h b/src/check_cidr.h
@@ -1,9 +1,6 @@
 #ifndef CHECK_CIDR
 #define CHECK_CIDR
 
-extern int CACHED_FOR_SECONDS;
-
 #include "vector.h"
 int checkCIDR(redisContext *context, const char *actor, char *reason, char *list, expanding_vector *ev, long *cache_update_time);
-
 #endif
diff --git a/src/librepsheet.c b/src/librepsheet.c
@@ -5,9 +5,6 @@
 
 #include "config.h"
 #include "repsheet.h"
-#include "whitelist.h"
-#include "blacklist.h"
-#include "marked.h"
 
 /**
  * @file librepsheet.c
diff --git a/src/marked.c b/src/marked.c
@@ -1,6 +1,5 @@
 #include "repsheet.h"
 #include "common.h"
-#include "marked.h"
 
 /**
  * @file marked.c
diff --git a/src/marked.h b/src/marked.h
diff --git a/src/repsheet.h b/src/repsheet.h
@@ -31,10 +31,20 @@ int actor_status(redisContext *context, const char *actor, int type, char *reaso
 int remote_address(char *connected_address, char *xff_header, char *address);
 
 int blacklist(redisContext *context, const char *actor, int type, const char *reason);
+int is_ip_blacklisted(redisContext *context, const char *actor, char *reason);
+int is_user_blacklisted(redisContext *context, const char *actor, char *reason);
+
 int whitelist(redisContext *context, const char *actor, int type, const char *reason);
+int is_ip_whitelisted(redisContext *context, const char *actor, char *reason);
+int is_user_whitelisted(redisContext *context, const char *actor, char *reason);
+int is_country_whitelisted(redisContext *context, const char *country_code);
+
 int mark(redisContext *context, const char *actor, int type, const char *reason);
+int is_ip_marked(redisContext *context, const char *actor, char *reason);
+int is_user_marked(redisContext *context, const char *actor, char *reason);
 
 void set_initial_whitelist_size(int new_size);
 void set_initial_blacklist_size(int new_size);
+void set_cache_expiry(unsigned int new_expiry);
 
 #endif
diff --git a/src/whitelist.c b/src/whitelist.c
@@ -3,7 +3,6 @@
 #include "common.h"
 #include "cidr.h"
 #include "check_cidr.h"
-#include "whitelist.h"
 
 
 /**
diff --git a/src/whitelist.h b/src/whitelist.h
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -16,11 +16,8 @@ test_runner_SOURCES = librepsheet_test.c   \
                       ../src/check_cidr.h  \
                       ../src/check_cidr.c  \
                       ../src/blacklist.c   \
-                      ../src/blacklist.h   \
                       ../src/whitelist.c   \
-                      ../src/whitelist.h   \
                       ../src/marked.c      \
-                      ../src/marked.h      \
                       ../src/xff.c         \
                       ../src/xff.h         \
                       ../src/vector.h      \
diff --git a/test/blacklist_test.c b/test/blacklist_test.c
@@ -1,6 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/blacklist.h"
 #include "check.h"
 
 redisContext *context;
diff --git a/test/cidr_test.c b/test/cidr_test.c
@@ -5,10 +5,12 @@ START_TEST(class_c)
 {
   char *block = "10.0.0.0/24";
   int in = ip_address_to_integer("10.0.0.50");
+  int out = ip_address_to_integer("10.0.1.50");
   int lower = ip_address_to_integer("10.0.0.0");
   int upper = ip_address_to_integer("10.0.0.255");
 
   ck_assert_int_eq(1, cidr_contains(block, in));
+  ck_assert_int_eq(0, cidr_contains(block, out));
   ck_assert_int_eq(1, cidr_contains(block, lower));
   ck_assert_int_eq(1, cidr_contains(block, upper));
 }
diff --git a/test/librepsheet_test.c b/test/librepsheet_test.c
@@ -1,8 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/whitelist.h"
-#include "../src/blacklist.h"
-#include "../src/marked.h"
 #include "check.h"
 #include <unistd.h>
 
diff --git a/test/marked_test.c b/test/marked_test.c
@@ -1,6 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/marked.h"
 #include "check.h"
 
 redisContext *context;
diff --git a/test/whitelist_test.c b/test/whitelist_test.c
@@ -1,6 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/whitelist.h"
 #include "check.h"
 
 redisContext *context;
