hiera-ldapprovider 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d271b46f30bae9ed197672dbc51020b1a49621
-  data.tar.gz: ad294bda6f73cd555202dd5197e461353aa354a4
+  metadata.gz: f9dcce63a21cecc44d7d78fccb8e63834fe6228e
+  data.tar.gz: 7ca58c58013a8f9bd01465460a74fd5cbfcee36d
 SHA512:
-  metadata.gz: 0925bfc814d814b0d565c52e42838d5f92adbf5674bf4932b5cbf87bb9b3159467e050cf7b71e6e4d76b3b20c56f19620b89d67e0fc1f2ef7e6c19222c0fbd50
-  data.tar.gz: b923cfa345c33756b4e72f8d89784cb0c555e9fce767ba7d4af34421f3c4a2bd470b5b82a4dcd07eefeee80541ad25392e1c72008b05cf3b7f8570653e3c6dce
+  metadata.gz: c667b30b72e476d9f47c97fc77660ad0c81fa1aa06114205c420ed1dbddcddf649377aa77a32b7f8b86e26d6ba377fe0afad1a2576963463e3b4c5feae2b4434
+  data.tar.gz: b1d945b0817353de2c1e6182a42bfaa96503897a054cbf56dd752d8d2456574854375b9f3e34154cdf06acfae2610f40ed1fa72cf1baf7ccfd3cd62c552f808a

data/lib/core_ext/string/json.rb

@@ -0,0 +1,13 @@
+require 'json'
+
+class String
+
+  # == Validates if valid JSON was found
+  def valid_json?
+    require 'json'
+    JSON.parse(self)
+    true
+  rescue JSON::ParserError
+    false
+  end
+end

data/lib/core_ext/string/yaml.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+
+class String
+
+  # == Public: Validates if valid yaml was found
+  def valid_yaml?
+    YAML.load(self)
+    true
+  rescue Psych::SyntaxError
+    false
+  rescue Exception
+    false
+  end
+end

data/lib/hiera/backend/ldap.rb

@@ -1,7 +1,7 @@
 class Hiera
   module Backend
     module LDAP
-      VERSION="1.0.1"
+      VERSION="1.0.2"
     end
   end
 end

data/lib/hiera/backend/ldap_backend.rb

@@ -1,50 +1,16 @@
 require 'rubygems'
+require 'core_ext/string/json'
+require 'core_ext/string/yaml'
 require 'net/ldap'
+require 'net/ldap/connection'
 require 'hiera/backend/ldap'
 
-# Monkey patch Net::LDAP::Connection to ensure SSL certs aren't verified
-class Net::LDAP::Connection
-  def self.wrap_with_ssl(io)
-    raise Net::LDAP::LdapError, "OpenSSL is unavailable" unless Net::LDAP::HasOpenSSL
-    ctx = OpenSSL::SSL::SSLContext.new
-    ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    conn = OpenSSL::SSL::SSLSocket.new(io, ctx)
-    conn.connect
-    conn.sync_close = true
-
-    conn.extend(GetbyteForSSLSocket) unless conn.respond_to?(:getbyte)
-
-    conn
-  end
-end
-
-class String
-  def valid_json?
-    require 'json'
-    JSON.parse(self)
-    true
-  rescue JSON::ParserError
-    false
-  end
-
-  def valid_yaml?
-    YAML.load(self)
-    true
-  rescue Psych::SyntaxError
-    false
-  rescue Exception
-    false
-  end
-
-end
 class Hiera
   module Backend
     class Ldap_backend
       def initialize
         @attr = get_config_value(:attribute, "cn")
-
         Hiera.debug("Hiera LDAP backend starting")
-
         @connection = Net::LDAP.new(
           :host       => conf[:host],
           :port       => get_config_value(:port, "389"),
@@ -66,22 +32,16 @@ class Hiera
 
       def lookup(key, scope, order_override, resolution_type)
         answer = nil
-
         Hiera.debug("Looking up #{key} in LDAP backend")
-
         Backend.datasources(scope, order_override) do |source|
           Hiera.debug("Looking for data source #{source}")
           base = @conf[:base]
-
           Hiera.debug("Searching on base: #{base}")
-
-
           filter = Net::LDAP::Filter.eq(@attr, source)
           Hiera.debug("Searching with filter: %s" % filter.to_s)
           searchresult = @connection.search(:filter => filter, :return_result => true)
           result = []
           alt_key = key.downcase.to_sym
-
           begin
             searchresult.each do |entry|
               if entry.attribute_names.include?(alt_key)
@@ -109,6 +69,11 @@ class Hiera
               elsif res.valid_yaml?
                 res = YAML.load(res)
               end
+              if !res.kind_of? Hash
+                res_old = res.dup
+                res = {}
+                res[key] = result
+              end
               answer = Backend.merge_answer(res,answer)
             end
           else
@@ -120,7 +85,6 @@ class Hiera
             break
           end
           Hiera.debug("Answer: #{answer}")
-
         end
         return answer
       end

data/lib/net/ldap/connection.rb

@@ -0,0 +1,18 @@
+module Net
+  class LDAP
+    class Connection
+
+      # == Public: Monkey patch to ensure SSL certificates aren't verified
+      def self.wrap_with_ssl(io)
+        raise Net::LDAP::LdapError, "OpenSSL is unavailable" unless Net::LDAP::HasOpenSSL
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        conn = OpenSSL::SSL::SSLSocket.new(io, ctx)
+        conn.connect
+        conn.sync_close = true
+        conn.extend(GetbyteForSSLSocket) unless conn.respond_to?(:getbyte)
+        conn
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-ldapprovider
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Florian Kasper
@@ -49,8 +49,11 @@ files:
 - README.md
 - Rakefile
 - hiera-ldap.gemspec
+- lib/core_ext/string/json.rb
+- lib/core_ext/string/yaml.rb
 - lib/hiera/backend/ldap.rb
 - lib/hiera/backend/ldap_backend.rb
+- lib/net/ldap/connection.rb
 homepage: http://github.com/Corscience/hiera-ldap
 licenses:
 - MIT