Ticket #1546: lighttpd-1.4.13-mod_geoip_lowercase.patch

src/mod_geoip.c

@@ -64 +64 @@
         unsigned short mem_cache;
         buffer  *db_name;
         buffer *default_country_code;
+        unsigned short force_lowercase;
         GeoIP   *gi;
 } plugin_config;
 
@@ -126 +127 @@
                 { "geoip.db-filename",  NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },     /* 0 */
                 { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },    /* 1 */
                 { "geoip.default_country_code", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },    /* 2 */
+                { "geoip.force_lowercase", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 3 */
                 { NULL,                 NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
         
@@ -142 +144 @@
                 s->db_name = buffer_init();
                 s->mem_cache = 0; /* default: do not load db to cache */
                 s->default_country_code = buffer_init();
+                s->force_lowercase = 0;
                 s->gi = NULL;
 
                 cv[0].destination = s->db_name;
                 cv[1].destination = &(s->mem_cache);
                 cv[2].destination = s->default_country_code;
+                cv[3].destination = &(s->force_lowercase);
 
                 p->config_storage[i] = s;
         
@@ -191 +195 @@
         
         PATCH(db_name);
         PATCH(mem_cache);
-        PATCH(gi);
+        PATCH(gi);
+        PATCH(default_country_code);
+        PATCH(force_lowercase);
 
         /* skip the first, the global context */
         for (i = 1; i < srv->config_context->used; i++) {
@@ -210 +216 @@
                         }
 
                         if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) {
-                                PATCH(mem_cache);
-                        }
+                                PATCH(mem_cache);
+                        }
+
+                        if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.default_country_code"))) {
+                                PATCH(default_country_code);
+                        }
+                        
+                        if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.force_lowercase"))) {
+                                PATCH(force_lowercase);
+                        }
                 }
         }
         
@@ -219 +233 @@
 }
 #undef PATCH
 
+char* strtolower(const char *tmp) {
+        char *str = strdup(tmp);
+        size_t len, i;
+        
+        len = strlen(str);
+        for(i=0; i<len; i++) {
+                str[i] = tolower(str[i]);
+        }
+        
+        return str;
+}
+
 URIHANDLER_FUNC(mod_geoip_subrequest) {
         plugin_data *p = p_d;
-                plugin_config *s = p->config_storage[0];
 
         mod_geoip_patch_connection(srv, con, p);
 
         if (!buffer_is_empty(p->conf.db_name)) {
                 const char *remote_ip;
-                GeoIP *gi;
                 data_string *ds;
                 const char *returnedCountry;
+                char *tmp;
 
                 remote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr));
 
@@ -237 +262 @@
                         /* get the country code 2 chars */
                         if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) {
                                 if (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) {
-                                        if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) {
-                                                ds = data_string_init();
-                                        }
+                                        if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) {
+                                                        ds = data_string_init();
+                                        }
+                                                        
+                                        if(p->conf.force_lowercase) {
+                                                tmp = strtolower(returnedCountry);
+                                        } else {
+                                                tmp = strdup(returnedCountry);
+                                        }
 
                                         buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE");
-                                        buffer_copy_string(ds->value, returnedCountry);
+                                        buffer_copy_string(ds->value, tmp);
                                         array_insert_unique(con->environment, (data_unset *)ds);
+                                        
+                                        free(tmp);
                                 } else {
-                                        if(s->default_country_code->used > 0) {
+                                        if(p->conf.default_country_code->used > 0) {
                                                 if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) {
                                                         ds = data_string_init();
                                                 }
                                                 
                                                 buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE");
-                                                buffer_copy_string(ds->value, s->default_country_code->ptr);
+                                                buffer_copy_string(ds->value, p->conf.default_country_code->ptr);
                                                 array_insert_unique(con->environment, (data_unset *)ds);        
                                         }
                                 }
@@ -364 +397 @@
                                 }
 
                                 char latitude[32];
-                                sprintf(&latitude, "%f", gir->latitude);
+                                sprintf(latitude, "%f", gir->latitude);
                                 buffer_copy_string(ds->key, "GEOIP_CITY_LATITUDE");
                                 buffer_copy_string(ds->value, latitude);
                                 array_insert_unique(con->environment, (data_unset *)ds);
@@ -377 +410 @@
                                 }
 
                                 char long_latitude[32];
-                                sprintf(&long_latitude, "%f", gir->longitude);
+                                sprintf(long_latitude, "%f", gir->longitude);
                                 buffer_copy_string(ds->key, "GEOIP_CITY_LONG_LATITUDE");
                                 buffer_copy_string(ds->value, long_latitude);
                                 array_insert_unique(con->environment, (data_unset *)ds);
@@ -390 +423 @@
                                 }
 
                                 char dc[5];
-                                sprintf(&dc, "%i", gir->dma_code);
+                                sprintf(dc, "%i", gir->dma_code);
                                 buffer_copy_string(ds->key, "GEOIP_CITY_DMA_CODE");
                                 buffer_copy_string(ds->value, dc);
                                 array_insert_unique(con->environment, (data_unset *)ds);
@@ -403 +436 @@
                                 }
 
                                 char ac[5];
-                                sprintf(&ac, "%i", gir->area_code);
+                                sprintf(ac, "%i", gir->area_code);
                                 buffer_copy_string(ds->key, "GEOIP_CITY_AREA_CODE");
                                 buffer_copy_string(ds->value, ac);
                                 array_insert_unique(con->environment, (data_unset *)ds);