logstash-input-LDAPSearch 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3a194fc8eb70cfc593b9e0886ae8974dbd4754
-  data.tar.gz: cb02f1997099adbb1e9f436b2314b9a0386c5601
+  metadata.gz: 8806c50a22c8f50e4be0b397f3e4fb3d3c4414fb
+  data.tar.gz: 30b3b06e3af70d110f5f47d580fa0ee60d88248e
 SHA512:
-  metadata.gz: bdcfb01dc37200f235569b984ab68ec4ce2f2e16ee3995597cbed9cb59c339f5510aab2bf19a39b0c5752ce7ca9fd645ed1ddcbc635cfd9debfdaca682d43b96
-  data.tar.gz: 7baebc7edf3b43f5c5ca895f9ff90acbe387a049e9650a1a8b88e57b4de7659cbe438b3967d7f0150f918e28314e103d48c9578cf05ea550273fffd7421acbe2
+  metadata.gz: 117ea66842f3633c61235d6a0f996a0a3381d692908bcf12a6237bb41108f59148f2db31dbca0052d421f974d8698b8995d4c04b8b8f676c90758dcb65bf32bf
+  data.tar.gz: ff130a2ec97704dac70aba418c38a8da71b0a45c12d370f2ea37ba26bb43ae4f59fb89faeefcdb8e85a6ad51dfab3a6b8a25943708815f07b6d2526ec5276ab0

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 gemspec
 gem 'jruby-ldap'
+#gem 'logstash-devutils', '~> 0.0.10'

data/lib/logstash/inputs/LDAPSearch.rb

@@ -32,6 +32,7 @@ class LogStash::Inputs::LDAPSearch < LogStash::Inputs::Base
   config :filter, :validate => :string, :required => true
   config :base, :validate => :string, :required => true
   config :port, :validate => :number, :default => 389
+	config :usessl, :validate => :boolean, :default => false
   config :attrs, :validate => :array, :default => ['uid']
 
   public
@@ -47,9 +48,9 @@ class LogStash::Inputs::LDAPSearch < LogStash::Inputs::Base
     @host = Socket.gethostbyname(@host).first
     #attrs = ['uid', 'sn', 'cn', 'eduPersonPrimaryAffiliation']
     scope = LDAP::LDAP_SCOPE_SUBTREE #LDAP::LDAP_SCOPE_ONELEVEL
-    conn = LDAP::Conn.new(@host, @port)
-    conn.bind(@dn, @password.value)
     begin
+			conn = ( @usessl == true ) ? LDAP::SSLConn.new(@host,@port) : LDAP::Conn.new(@host, @port)
+			conn.bind(@dn, @password.value)
       @logger.debug("Executing LDAP search base='#{@base}' filter='#{@filter}'")
       conn.search(base, scope, filter, attrs) { |entry|
         # print distinguished name
@@ -58,22 +59,25 @@ class LogStash::Inputs::LDAPSearch < LogStash::Inputs::Base
         decorate(event)
         event["host"] = @host
         entry.get_attributes.each do |attr|
-        #values = entry.get_values(attr).first
-        values = entry.get_values(attr)
-        values = values.map { |value|
+					#values = entry.get_values(attr).first
+					values = entry.get_values(attr)
+					values = values.map { |value|
             (/[^[:print:]]/ =~ value).nil? ? value : Base64.strict_encode64(value)
-        }
-        event[attr] = values
-        end
-        #event["attr"] = entry.attrs
-        queue << event
-          
-      }
-    rescue LDAP::ResultError => ex
-      @logger.error("LDAP search error: #{ex}\n#{ex.backtrace}")
-      exit
+					}
+					event[attr] = values
+				end
+				#event["attr"] = entry.attrs
+				queue << event
+			}
+		rescue LDAP::Error => ex
+			@logger.error("Ldap connect failed: #{ex}\n#{ex.backtrace}")
+			exit
+		rescue LDAP::ResultError => ex
+			@logger.error("LDAP search error: #{ex}\n#{ex.backtrace}")
+			exit
     end
-    finished
+		# no finished in 2.1, instead stop method is called
+    # finished
   end # def run
 
 end # class LogStash::Inputs::LDAPSearch

data/logstash-input-LDAPSearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-LDAPSearch'
-  s.version         = '0.1.0'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "logstash input plugin to perform search into ldap."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", '>= 2.0.0', '< 3.0.0'
 
   s.add_runtime_dependency 'jruby-ldap'
   #s.add_runtime_dependency 'ruby_base64'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-LDAPSearch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Nicolas CAN
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -16,18 +16,18 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -64,12 +64,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - DEVELOPER.md
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/logstash/inputs/LDAPSearch.rb
 - logstash-input-LDAPSearch.gemspec
 - spec/inputs/LDAPSearch_spec.rb

data/.gitignore

@@ -1,35 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"