Merge pull request #123 from iresty/feature-remote-ip

feature: supported to match remote ip address.

include/r3.h

@@ -84,6 +84,10 @@ struct _R3Route {
     void * data;
 
     r3_iovec_t remote_addr_pattern;
+
+    unsigned int remote_addr_v4;
+    int          remote_addr_v4_bits;
+
 } __attribute__((aligned(64)));
 
 typedef struct _R3Entry match_entry;

src/node.c

@@ -4,6 +4,8 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 // PCRE
 #include <pcre.h>
@@ -902,16 +904,23 @@ inline int r3_route_cmp(const R3Route *r1, const match_entry *r2) {
     }
 
     if (r1->remote_addr_pattern.len && r2->remote_addr.len) {
-        /*
-         * XXX: consider "netinet/in.h"
-        if (r2->remote_addr) {
-            inet_addr(r2->remote_addr);
-        }
-        */
         if ( strncmp(r1->remote_addr_pattern.base, r2->remote_addr.base, r2->remote_addr.len) ) {
             return -1;
         }
     }
+
+    if (r1->remote_addr_v4 > 0 && r1->remote_addr_v4_bits > 0) {
+        if (!r2->remote_addr.base) {
+            return -1;
+        }
+
+        unsigned int r2_addr2 = inet_network(r2->remote_addr.base);
+        int bits = 32 - r1->remote_addr_v4_bits;
+        if (r1->remote_addr_v4 >> bits != r2_addr2 >> bits) {
+            return -1;
+        }
+    }
+
     return 0;
 }
 

tests/Makefile.am

@@ -30,6 +30,9 @@ check_str_array_SOURCES = check_str_array.c
 TESTS += check_host
 check_host_SOURCES = check_host.c
 
+TESTS += check_remote_addr
+check_remote_addr_SOURCES = check_remote_addr.c
+
 
 if ENABLE_JSON
 TESTS += check_json

tests/check_remote_addr.c

@@ -0,0 +1,102 @@
+#include "config.h"
+#include <stdio.h>
+#include <check.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "r3.h"
+#include "r3_slug.h"
+
+START_TEST (test_remote_addrs)
+{
+    R3Node * n      = r3_tree_create(10);
+    R3Route * route  = NULL;
+    match_entry * entry;
+    R3Route *matched_route;
+
+    char * uri0 = "/foo";
+    route = r3_tree_insert_routel(n, 0, uri0, strlen(uri0), &uri0);
+    route->remote_addr_v4 = 0;
+    route->remote_addr_v4_bits = 0;
+
+    char * uri1 = "/bar";
+    route = r3_tree_insert_routel(n, 0, uri1, strlen(uri1), &uri1);
+    route->remote_addr_v4 = inet_network("127.0.0.1");
+    route->remote_addr_v4_bits = 32;
+
+    char * uri2 = "/boo";
+    route = r3_tree_insert_routel(n, 0, uri2, strlen(uri2), &uri2);
+    route->remote_addr_v4 = inet_network("127.0.0.1");
+    route->remote_addr_v4_bits = 24;
+
+    char * err = NULL;
+    r3_tree_compile(n, &err);
+    ck_assert(err == NULL);
+
+
+    entry = match_entry_create("/foo");
+    entry->remote_addr.base = "127.0.0.1";
+    entry->remote_addr.len = sizeof("127.0.0.1") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route != NULL);
+    ck_assert(matched_route->data == &uri0);
+
+    entry = match_entry_create("/bar");
+    entry->remote_addr.base = "127.0.0.1";
+    entry->remote_addr.len = sizeof("127.0.0.1") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route != NULL);
+    ck_assert(matched_route->data == &uri1);
+
+    entry = match_entry_create("/bar");
+    entry->remote_addr.base = "127.0.0.2";
+    entry->remote_addr.len = sizeof("127.0.0.2") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route == NULL);
+
+
+    entry = match_entry_create("/boo");
+    entry->remote_addr.base = "127.0.0.1";
+    entry->remote_addr.len = sizeof("127.0.0.1") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route != NULL);
+    ck_assert(matched_route->data == &uri2);
+
+    entry = match_entry_create("/boo");
+    entry->remote_addr.base = "127.0.0.2";
+    entry->remote_addr.len = sizeof("127.0.0.2") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route != NULL);
+    ck_assert(matched_route->data == &uri2);
+
+    entry = match_entry_create("/boo");
+    entry->remote_addr.base = "127.0.1.2";
+    entry->remote_addr.len = sizeof("127.0.1.2") - 1;
+    matched_route = r3_tree_match_route(n, entry);
+    ck_assert(matched_route == NULL);
+
+    r3_tree_free(n);
+}
+END_TEST
+
+
+
+Suite* r3_suite (void) {
+    Suite *suite = suite_create("r3 remote_addr tests");
+    TCase *tcase = tcase_create("testcase");
+    tcase_add_test(tcase, test_remote_addrs);
+    suite_add_tcase(suite, tcase);
+    return suite;
+}
+
+int main (int argc, char *argv[]) {
+    int number_failed;
+    Suite *suite = r3_suite();
+    SRunner *runner = srunner_create(suite);
+    srunner_run_all(runner, CK_NORMAL);
+    number_failed = srunner_ntests_failed(runner);
+    srunner_free(runner);
+    return number_failed;
+}