Changeset 1497

Timestamp:

06/05/08 18:30:56 (7 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/TODO (modified) (2 diffs)
• cherokee/trunk/cherokee/Makefile.am (modified) (4 diffs)
• cherokee/trunk/cherokee/rule_geoip.c (added)
• cherokee/trunk/cherokee/rule_geoip.h (added)
• cherokee/trunk/configure.in (modified) (5 diffs)
• cherokee/trunk/qa/167-RuleGeoIP.py (added)
• cherokee/trunk/qa/Makefile.am (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-05  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/rule_geoip.h, cherokee/rule_geoip.c,
+        cherokee/Makefile.am, configure.in: Added a new GeoIP rule module.
+        It checks the origin IP with the GeoIP library.
+
+        * qa/167-RuleGeoIP.py, qa/Makefile.am: Added a new QA test to
+        ensure that rule_geoip actually works.
-
-        * qa/061-PAM1.py, qa/062-PAM2.py (Test.Precondition): Updated to

cherokee/trunk/TODO

@@ -5 +5 @@
------
-[ ] Mime encodings separated from mime types
-
+
+
-
-0.9.0
@@ -16 +17 @@
-Later
------
- 
+x
-[ ] WSGI handler
-[ ] Upload progress module

cherokee/trunk/cherokee/Makefile.am

@@ -157 +157 @@
-
-#
+# Rule geoip
+#
+rule_geoip = \
+rule_geoip.c \
+rule_geoip.h
+
+libplugin_geoip_la_LDFLAGS = $(module_ldflags)  
+libplugin_geoip_la_SOURCES = $(rule_geoip)
+libplugin_geoip_la_LIBADD  = -lGeoIP
+
+if STATIC_RULE_HEADER
+static_rule_geoip_src = $(rule_geoip)
+static_rule_geoip_lib = -lGeoIP
+else
+dynamic_rule_geoip_lib = libplugin_geoip.la
+endif
+
+
+#
-# Rule not
-#
@@ -770 +789 @@
-$(static_validator_pam_lib) \
-$(static_validator_ldap_lib)  \
+$(static_rule_geoip_lib)  \
-$(static_validator_htpasswd_lib) \
-$(static_validator_mysql_lib) \
@@ -933 +953 @@
-$(static_rule_request_src) \
-$(static_rule_header_src) \
+$(static_rule_geoip_src) \
-$(static_rule_not_src) \
-$(static_rule_and_src) \
@@ -1082 +1103 @@
-$(dynamic_rule_request_lib) \
-$(dynamic_rule_header_lib) \
+$(dynamic_rule_geoip_lib) \
-$(dynamic_rule_not_lib) \
-$(dynamic_rule_and_lib) \

cherokee/trunk/configure.in

@@ -1083 +1083 @@
-
-dnl
+dnl GeoIP library
+dnl
+AC_ARG_WITH([geoip],
+        AC_HELP_STRING([--with-geoip=@<:@ARG@:>@],
+            [use the GeoIP library @<:@default=yes@:>@, optionally specify path to dev libs]
+        ),
+        [
+        if test "$withval" = "no"; then
+            want_geoip="no"
+        elif test "$withval" = "yes"; then
+            want_geoip="yes"
+        else
+            want_geoip="yes"
+            GEOIP_CONFIG="$withval"
+        fi
+        ],
+        [want_geoip="yes"]
+)
+
+if test "$want_geoip" = "yes"; then
+   AC_CHECK_LIB(GeoIP, GeoIP_new, have_geoip_lib=yes, have_geoip_lib=no) 
+   AC_CHECK_HEADERS(GeoIP.h, have_geoip_include=yes, have_geoip_include=no) 
+fi
+
+have_geoip="no"
+if test "$have_geoip_lib $have_geoip_include" = "yes yes"; then
+   have_geoip="yes"
+fi
+
+AM_CONDITIONAL(HAVE_GEOIP, test $have_geoip = "yes")
+
+
+dnl
-dnl Python's docutils
-dnl 
@@ -1168 +1201 @@
-           [use_static_module="$use_static_module $enableval "],[])
-
-
+geoip 
-
-# Remove modules that will not be compiles
@@ -1180 +1213 @@
-if test "x$have_mysql" != "xyes"; then
-        modules=`echo $modules | sed s/mysql//`
+fi
+if test "x$have_geoip" != "xyes"; then
+        modules=`echo $modules | sed s/geoip//`
-fi
-if test "$use_crypt" != "yes"; then
@@ -1245 +1281 @@
-AM_CONDITIONAL(STATIC_RULE_REQUEST,           grep request        $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_RULE_HEADER,            grep header         $conf_h >/dev/null)
+AM_CONDITIONAL(STATIC_RULE_GEOIP,             grep geoip          $conf_h >/dev/null)
-# These must be at the end
-AM_CONDITIONAL(STATIC_RULE_NOT,               grep _not_          $conf_h >/dev/null)
@@ -1311 +1348 @@
-echo "LDAP                  $have_ldap"
-echo "MySQL                 $have_mysql"
+echo "GeoIP                 $have_geoip"
-echo "crypt support         $crypt_type"
-if test "x$is_beta" = "xyes"; then

cherokee/trunk/qa/Makefile.am

@@ -171 +171 @@
-164-RuleOr1.py \
-165-RuleOr2.py \
-
+
+
-
-test: