Replace CIDR list with java cdr-ip-trie for faster lookups

Rakefile

@@ -5,3 +5,26 @@ task :default do
 end
 
 require "logstash/devutils/rake"
+
+task :vendor => :gradle
+
+task :gradle => "gradle.properties" do
+  system("./gradlew vendor")
+end
+
+task "gradle.properties" do
+  delete_create_gradle_properties
+end
+
+def delete_create_gradle_properties
+  root_dir = File.dirname(__FILE__)
+  gradle_properties_file = "#{root_dir}/gradle.properties"
+  lsc_path = `bundle show logstash-core`
+  FileUtils.rm_f(gradle_properties_file)
+  File.open(gradle_properties_file, "w") do |f|
+    f.puts "logstashCoreGemPath=#{lsc_path}"
+  end
+  puts "-------------------> Wrote #{gradle_properties_file}"
+  puts `cat #{gradle_properties_file}`
+end
+

build.gradle

@@ -0,0 +1,125 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+apply plugin: "java"
+apply plugin: "distribution"
+apply plugin: "idea"
+
+// TODO(sissel): Move this to a file shared by the gemspec.
+group "org.logstash.filters"
+version "3.1.6"
+
+import java.nio.file.Files
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
+
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath group: 'org.jruby', name: 'jruby-complete', version: "1.7.25"
+  }
+}
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compileOnly group: "org.apache.logging.log4j", name: "log4j-api", version: "2.6.2"
+  compileOnly group: "org.apache.logging.log4j", name: "log4j-core", version: "2.6.2"
+  compileOnly group: "com.github.veqryn", name: "cidr-ip-trie", version: "1.0.1"
+
+  compileOnly 'com.fasterxml.jackson.core:jackson-core:2.7.4'
+  compileOnly 'com.fasterxml.jackson.core:jackson-databind:2.7.4'
+  compileOnly 'com.fasterxml.jackson.module:jackson-module-afterburner:2.7.4'
+
+  runtime group: "com.github.veqryn", name: "cidr-ip-trie", version: "1.0.1"
+
+  testCompile group: 'junit', name: 'junit', version: '4.12'
+  testCompile group: "org.apache.logging.log4j", name: "log4j-api", version: "2.6.2"
+  testCompile group: "org.apache.logging.log4j", name: "log4j-core", version: "2.6.2"
+  testCompile group: "com.github.veqryn", name: "cidr-ip-trie", version: "1.0.1"
+  testCompile 'com.fasterxml.jackson.core:jackson-core:2.7.4'
+  testCompile 'com.fasterxml.jackson.core:jackson-databind:2.7.4'
+  testCompile 'com.fasterxml.jackson.module:jackson-module-afterburner:2.7.4'
+  testCompile group: 'org.jruby', name: 'jruby-complete', version: "1.7.25"
+  testCompile fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
+
+  compileOnly group: 'org.jruby', name: 'jruby-complete', version: "1.7.25"
+  compileOnly fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
+}
+
+task rubyBootstrap << {
+  description "Try bundler"
+  def jruby = new org.jruby.embed.ScriptingContainer()
+  def paths = jruby.getLoadPaths()
+  paths.add("${projectDir}/lib".getStrings()[0])
+  jruby.setLoadPaths(paths)
+  jruby.getEnvironment().put("GEM_HOME", "${buildDir}/ruby".toString())
+  jruby.getEnvironment().put("GEM_SPEC_CACHE", "${buildDir}/cache".toString())
+  jruby.getEnvironment().put("GEM_PATH", "${buildDir}/ruby".toString())
+  jruby.runScriptlet(org.jruby.embed.PathType.ABSOLUTE, "${projectDir}/buildSrc/src/main/ruby/bootstrap.rb")
+  jruby.runScriptlet("bundler()")
+}
+
+task rubyTest(dependsOn: [rubyBootstrap, build]) << {
+  def jruby = new org.jruby.embed.ScriptingContainer()
+  def paths = jruby.getLoadPaths()
+  paths.add("${projectDir}/lib".getStrings()[0])
+  jruby.setLoadPaths(paths)
+  jruby.getEnvironment().put("GEM_HOME", "${buildDir}/ruby".toString())
+  jruby.getEnvironment().put("GEM_SPEC_CACHE", "${buildDir}/cache".toString())
+  jruby.getEnvironment().put("GEM_PATH", "${buildDir}/ruby".toString())
+  jruby.runScriptlet('require "jars"');
+  jruby.runScriptlet('require "./build/libs/logstash-filter-cidr.jar"');
+  jruby.runScriptlet("require 'rspec/core/runner'");
+  jruby.runScriptlet("require 'rspec'");
+  jruby.runScriptlet("RSpec::Core::Runner.run(['spec', '--fail-fast', '--order=rand:1'])");
+}
+
+task generateGemJarRequiresFile << {
+  File jars_file = file("lib/${project.name}_jars.rb")
+  jars_file.newWriter().withWriter { w ->
+    w << "# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.\n\n"
+    w << "require \'jar_dependencies\'\n"
+    configurations.runtime.allDependencies.each {
+      w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n"
+    }
+    w << "require_jar(\'${project.group}\', \'${project.name}\', \'${project.version}\')\n"
+  }
+}
+
+task vendor << {
+  String vendorPathPrefix = "vendor/jar-dependencies"
+  configurations.runtime.allDependencies.each { dep ->
+    File f = configurations.runtime.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile
+    String groupPath = dep.group.replaceAll('\\.', '/')
+    File newJarFile = file("${vendorPathPrefix}/${groupPath}/${dep.name}/${dep.version}/${dep.name}-${dep.version}.jar")
+    newJarFile.mkdirs()
+    Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING)
+  }
+  String projectGroupPath = project.group.replaceAll('\\.', '/')
+  File projectJarFile = file("${vendorPathPrefix}/${projectGroupPath}/${project.name}/${project.version}/${project.name}-${project.version}.jar")
+  projectJarFile.mkdirs()
+  Files.copy(file("$buildDir/libs/${project.name}-${project.version}.jar").toPath(), projectJarFile.toPath(), REPLACE_EXISTING)
+}
+
+vendor.dependsOn(jar, generateGemJarRequiresFile)

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed May 17 15:46:08 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

gradlew

@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"