Adds support to GeoIP operator and variables.

src/operators/geo_lookup.cc

@@ -0,0 +1,95 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include "operators/geo_lookup.h"
+
+#include <GeoIPCity.h>
+
+#include <string>
+#include <functional>
+
+#include "operators/operator.h"
+#include "utils/geo_lookup.h"
+
+
+namespace ModSecurity {
+namespace operators {
+
+
+bool GeoLookup::evaluate(Assay *assay, const std::string &exp) {
+    using std::placeholders::_1;
+    using std::placeholders::_2;
+
+    GeoIPRecord *gir;
+
+    bool ret = Utils::GeoLookup::getInstance().lookup(exp, &gir,
+        std::bind(&GeoLookup::debug, this, assay, _1, _2));
+
+    if (ret && gir) {
+        if (gir->country_code) {
+            assay->store_variable("GEO:COUNTRY_CODE", gir->country_code);
+        }
+        if (gir->country_code3) {
+            assay->store_variable("GEO:COUNTRY_CODE3", gir->country_code3);
+        }
+        if (gir->country_name) {
+            assay->store_variable("GEO:COUNTRY_NAME", gir->country_name);
+        }
+        if (gir->continent_code) {
+            assay->store_variable("GEO:COUNTRY_CONTINENT",
+                gir->continent_code);
+        }
+        if (gir->country_code && gir->region) {
+            assay->store_variable("GEO:REGION",
+                GeoIP_region_name_by_code(gir->country_code, gir->region));
+        }
+        if (gir->city) {
+            assay->store_variable("GEO:CITY", gir->city);
+        }
+        if (gir->postal_code) {
+            assay->store_variable("GEO:POSTAL_CODE", gir->postal_code);
+        }
+        if (gir->latitude) {
+            assay->store_variable("GEO:LATITUDE",
+                std::to_string(gir->latitude));
+        }
+        if (gir->longitude) {
+            assay->store_variable("GEO:LONGITUDE",
+                std::to_string(gir->longitude));
+        }
+        if (gir->metro_code) {
+            assay->store_variable("GEO:DMA_CODE",
+                std::to_string(gir->metro_code));
+        }
+        if (gir->area_code) {
+            assay->store_variable("GEO:AREA_CODE",
+                std::to_string(gir->area_code));
+        }
+
+        GeoIPRecord_delete(gir);
+    }
+
+    return ret;
+}
+
+GeoLookup::GeoLookup(std::string op, std::string param,
+bool negation)
+    : Operator() {
+    this->op = op;
+    this->param = param;
+}
+
+}  // namespace operators
+}  // namespace ModSecurity

src/operators/geo_lookup.h

@@ -1,4 +1,4 @@
-/**
+/*
  * ModSecurity, http://www.modsecurity.org/
  * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
  *
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef SRC_OPERATORS_GEOLOOKUP_H_
-#define SRC_OPERATORS_GEOLOOKUP_H_
+#ifndef SRC_OPERATORS_GEO_LOOKUP_H_
+#define SRC_OPERATORS_GEO_LOOKUP_H_
 
 #include <string>
 
@@ -28,7 +28,7 @@ class GeoLookup : public Operator {
  public:
     /** @ingroup ModSecurity_Operator */
     GeoLookup(std::string o, std::string p, bool i);
-    bool evaluate(Assay *assay);
+    bool evaluate(Assay *assay, const std::string &exp) override;
 };
 
 }  // namespace operators
@@ -36,4 +36,4 @@ class GeoLookup : public Operator {
 #endif
 
 
-#endif  // SRC_OPERATORS_GEOLOOKUP_H_
+#endif  // SRC_OPERATORS_GEO_LOOKUP_H_

src/operators/geolookup.cc

@@ -1,41 +0,0 @@
-/**
- * ModSecurity, http://www.modsecurity.org/
- * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
- *
- * You may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * If any of the files related to licensing are missing or if you have any
- * other questions related to licensing please contact Trustwave Holdings, Inc.
- * directly using the email address security@modsecurity.org.
- *
- */
-
-#include "operators/geolookup.h"
-
-#include <string>
-
-#include "operators/operator.h"
-
-namespace ModSecurity {
-namespace operators {
-
-bool GeoLookup::evaluate(Assay *assay) {
-    /**
-     * @todo Implement the operator GeoLookup.
-     *       Reference: https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#geolookup
-     */
-    return true;
-}
-
-GeoLookup::GeoLookup(std::string op, std::string param,
-bool negation)
-    : Operator() {
-    this->op = op;
-    this->param = param;
-}
-
-}  // namespace operators
-}  // namespace ModSecurity

src/operators/operator.cc

@@ -34,7 +34,7 @@
 #include "operators/verify_cc.h"
 #include "operators/verify_cpf.h"
 #include "operators/verify_ssn.h"
-#include "operators/geolookup.h"
+#include "operators/geo_lookup.h"
 #include "operators/gsblookup.h"
 #include "operators/rsub.h"
 #include "operators/within.h"
@@ -68,6 +68,12 @@ Operator::Operator() {
 }
 
 
+bool Operator::debug(Assay *assay, int x, std::string a) {
+    assay->debug(x, a);
+    return true;
+}
+
+
 Operator::Operator(std::string op, std::string param, bool negation) {
     this->op = op;
     this->param = param;

src/operators/operator.h

@@ -39,6 +39,7 @@ class Operator {
     virtual bool evaluate(Assay *assay, const std::string &str);
     static Operator *instantiate(std::string op);
  protected:
+    bool debug(Assay *assay, int x, std::string a);
 };
 
 }  // namespace operators