dm-ldap-adapter 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,13 @@
+version 0.4.2
+=============
+
+* Serial fieldnames are case insensitive now, i.e. allow capital as well 
+
+version 0.4.1
+=============
+
+* mutliline values inside Ldap::Array
+
 version 0.3.5
 =============
 

data/Manifest.txt

@@ -6,7 +6,6 @@ Manifest.txt
 README-example.markdown
 README.txt
 Rakefile
-example/identity_map.rb
 example/posix.rb
 ldap-commands.txt
 lib/adapters/ldap_adapter.rb

data/README.txt

@@ -46,8 +46,6 @@ or
 
 see 'example/posix.rb' for user/group setup works with default installation of openldap on ubuntu (just change your password as needed in the code)
 
-the 'example/identity_map.rb' shows the usage of identity maps, see also below.
-
 == FEATURES/PROBLEMS:
 
 * the net-ldap has some issues with not closing the connections when an exception/error got raised, with limit the search result to 126 entries which gets fixed by making consecutives searches and collect the result.
@@ -62,7 +60,7 @@ there are three parts which makes the DN of a model, the base from the ldap conn
 
     class User
       include DataMapper::Resource
-      property :id, Serial, :field => "uidnumber"
+      property :id, Serial, :field => "uidNumber"
       dn_prefix { |user| "uid=#{user.login}"}
       treebase "ou=people"
     end
@@ -77,7 +75,7 @@ for example the ldap posixGroup has more attributes than the model class, it nee
 
     class Group
       include DataMapper::Resource
-      property :id, Serial, :field => "gidnumber"
+      property :id, Serial, :field => "gidNumber"
       property :name,     String, :field => "cn"
       dn_prefix { |group| "cn=#{group.name}" }
       treebase "ou=groups"
@@ -169,8 +167,8 @@ staying with posix example there the groups has a memberuid attribute BUT unlike
 
     class GroupUser
       include DataMapper::Resource
-      property :memberuid, String, :key => true
-      property :gidnumber, Integer, :key => true
+      property :memberUid, String, :key => true
+      property :gidNumber, Integer, :key => true
       dn_prefix { |group_user| "cn=#{group_user.group.name}" }
       treebase "ou=groups"
       ldap_properties do |group_user|
@@ -187,14 +185,14 @@ let's say your LDAP has multiple email values for a users then you can define yo
 
     class User
       include DataMapper::Resource
-      property :id,        Serial, :field => "uidnumber"
+      property :id,        Serial, :field => "uidNumber"
       property :login,     String, :field => "uid", :unique_index => true
       property :mail,      LdapArray
 
       dn_prefix { |user| "uid=#{user.login}"}
       treebase "ou=people"
       ldap_properties do |user|
-        properties = { :objectclass => ["inetOrgPerson", "posixAccount", "shadowAccount"], :loginshell => "/bin/bash", :gidnumber => "10000" }
+        properties = { :objectclass => ["inetOrgPerson", "posixAccount", "shadowAccount"], :loginshell => "/bin/bash", :gidNumber => "10000" }
        properties
       end
     end

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 require 'pathname'
 
 Hoe.spec('dm-ldap-adapter') do |p|
-  p.version = "0.4.1"
+  p.version = "0.4.2"
   p.description = "ldap adapter for datamapper which uses either net-ldap or ruby-ldap"
   p.developer('mkristian', 'm.kristian@web.de')
   p.url = "http://dm-ldap-adapter.rubyforge.org"

data/example/posix.rb

@@ -1,19 +1,19 @@
 require 'pathname'
 require 'rubygems'
-require 'slf4r/logging_logger'
-gem 'data_objects' , "0.9.11"
+require 'slf4r/logger'
+require 'slf4r/ruby_logger'
 require 'dm-core'
 
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
-Logging.init :debug, :info, :warn, :error
+# Logging.init :debug, :info, :warn, :error
 
-appender = Logging::Appender.stdout
-appender.layout = Logging::Layouts::Pattern.new(:pattern => "%d [%-l] (%c) %m\n")
-logger = Logging::Logger.new(:root)
-logger.add_appenders(appender)
-logger.level = :debug
-logger.info "initialized logger . . ."
+# appender = Logging::Appender.stdout
+# appender.layout = Logging::Layouts::Pattern.new(:pattern => "%d [%-l] (%c) %m\n")
+# logger = Logging::Logger.new(:root)
+# logger.add_appenders(appender)
+# logger.level = :debug
+# logger.info "initialized logger . . ."
 
 dummy = true  #uncomment this to use dummy, i.e. a database instead of ldap
 dummy = false # uncomment this to use ldap
@@ -49,9 +49,9 @@ end
 class User
   include DataMapper::Resource
 
-  property :id,        Serial, :field => "uidnumber"
+  property :id,        Serial, :field => "uidNumber"
   property :login,     String, :field => "uid"
-  property :hashed_password,  String, :field => "userpassword", :access => :private
+  property :hashed_password,  String, :field => "userPassword"
   property :name,      String, :field => "cn"
 
   has n, :group_users, :child_key => [:memberuid]
@@ -99,7 +99,7 @@ end
 class Group
   include DataMapper::Resource
   include Slf4r::Logger
-  property :id,       Serial, :field => "gidnumber"
+  property :id,       Serial, :field => "gidNumber"
   property :name,     String, :field => "cn"
 
   dn_prefix { |group| "cn=#{group.name}" }
@@ -145,8 +145,8 @@ class GroupUser
   ldap_properties do |group_user|
     {:cn=>"#{group_user.group.name}",  :objectclass => "posixGroup"}
   end
-  property :memberuid, String, :key => true#, :field => "memberuid"
-  property :gidnumber, Integer, :key => true#, :field => "gidnumber"
+  property :memberuid, String, :key => true#, :field => "memberUid"
+  property :gidnumber, Integer, :key => true#, :field => "gidNumber"
 
   def group
     Group.get!(gidnumber)

data/lib/adapters/ldap_adapter.rb

@@ -316,7 +316,7 @@ module DataMapper
         end
 
 #puts "read_many"
-#p result.size
+#p result
         result = result.uniq if query.unique?
         result = query.match_records(result) if query.model.multivalue_field
         result = query.sort_records_case_insensitive(result)
@@ -332,11 +332,6 @@ module DataMapper
                                    query.model.key.collect { |k| k.field },
                                    to_ldap_conditions(query),
                                    field_names, order_by)
-#.sort! do |u1, u2|
-#          value1 = u1[order_by_sym].first.upcase rescue ""
-#          value2 = u2[order_by_sym].first.upcase rescue ""
-#          value1 <=> value2
-#        end
         if query.model.multivalue_field
           props_result = []
           result.each do |props|
@@ -367,8 +362,6 @@ module DataMapper
           end
         end
       end
-
-#      include ::DataMapper::Transaction::Adapter
     end
   end
 end

data/lib/ldap/digest.rb

@@ -1,3 +1,5 @@
+require 'sha1'
+require 'base64'
 module Ldap
   class Digest
     # method from openldap faq which produces the userPassword attribute
@@ -6,8 +8,6 @@ module Ldap
     # @param salt String the salt for the password digester
     # @return the encoded password/salt
     def self.ssha(secret, salt)
-      require 'sha1'
-      require 'base64'
       (salt.empty? ? "{SHA}": "{SSHA}") +
         Base64.encode64(::Digest::SHA1.digest(secret + salt) + salt).gsub(/\n/, '')
     end

data/lib/ldap/net_ldap_facade.rb

@@ -44,7 +44,7 @@ module Ldap
       base = "#{treebase},#{@ldap.base}"
       if @ldap.add( :dn => dn(dn_prefix, treebase),
                     :attributes => props) || @ldap.get_operation_result.code.to_s == "0"
-        props[key_field.downcase.to_sym]
+        props[key_field.to_sym]
       else
         unless silence
           msg = ldap_error("create",
@@ -70,13 +70,14 @@ module Ldap
       @ldap.search( :base => "#{treebase},#{@ldap.base}",
                     :attributes => field_names,
                     :filter => filter ) do |res|
-        map = to_map(res)
+        mapp = to_map(field_names, res)
+
         #puts map[key_field.to_sym]
         # TODO maybe make filter which removes this unless
         # TODO move this into the ldap_Adapter to make it more general, so that
         # all field with Integer gets converted, etc
-        result << map if key_fields.detect do |key_field|
-          map.member? key_field.to_sym
+        result << mapp if key_fields.detect do |key_field|
+          mapp.keys.detect {|k| k.to_s.downcase == key_field.downcase }
         end
       end
       result
@@ -140,13 +141,19 @@ module Ldap
     # helper to extract the Hash from the ldap search result
     # @param Entry from the ldap_search
     # @return Hash with name/value pairs of the entry
-    def to_map(entry)
+    def to_map(field_names, entry)
+      fields = {:dn => :dn}
+      field_names.each { |f| fields[f.downcase.to_sym] = f.to_sym }
       def entry.map
         @myhash
       end
-      entry.map
+      result = {}
+      entry.map.each do |k,v|
+        result[fields[k]] = v
+      end
+      result
     end
-
+    
     def ldap_error(method, dn)
       "#{method} error: (#{@ldap.get_operation_result.code}) #{@ldap.get_operation_result.message}\n\tDN: #{dn}"
     end

data/lib/ldap/ruby_ldap_facade.rb

@@ -62,8 +62,7 @@ module Ldap
         LDAP.mod(LDAP::LDAP_MOD_ADD, k.to_s, v.is_a?(::Array) ? v : [v.to_s] )
       end
       if @ldap2.add( dn(dn_prefix, treebase), mods)
-#                    :attributes => props) and @ldap.get_operation_result.code.to_s == "0"
-        props[key_field.downcase.to_sym]
+        props[key_field.to_sym]
       else
         unless silence
           msg = ldap_error("create",
@@ -91,14 +90,13 @@ module Ldap
                     LDAP::LDAP_SCOPE_SUBTREE,
                     filter.to_s == "" ? "(objectclass=*)" : filter.to_s.gsub(/\(\(/, "(").gsub(/\)\)/, ")"),
                     field_names, false, 0, 0, order_field) do |res|
-
-        map = to_map(res)
-        #puts map[key_field.to_sym]
+        mapp = to_map(field_names, res)
         # TODO maybe make filter which removes this unless
         # TODO move this into the ldap_Adapter to make it more general, so that
         # all field with Integer gets converted, etc
-        result << map if key_fields.detect do |key_field|
-            map.member? key_field.to_sym
+        # NOTE: somehow the fields are downcase coming from query.model
+        result << mapp if key_fields.detect do |key_field|
+            mapp.keys.detect {|k| k.to_s.downcase == key_field.downcase }
           end
         end
       end
@@ -174,10 +172,12 @@ module Ldap
     # helper to extract the Hash from the ldap search result
     # @param Entry from the ldap_search
     # @return Hash with name/value pairs of the entry
-    def to_map(entry)
+    def to_map(field_names, entry)
+      fields = {:dn => :dn}
+      field_names.each { |f| fields[f.downcase.to_sym] = f.to_sym }
       map = {}
       LDAP::entry2hash(entry).each do |k,v|
-        map[k.downcase.to_sym] = v
+        map[fields[k.downcase.to_sym]] = v
       end
       map
     end

data/spec/multi_value_attributes_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 class TestContact
   include DataMapper::Resource
 
-  property :id,        Serial, :field => "uidnumber"
+  property :id,        Serial, :field => "uidNumber"
   property :login,     String, :field => "uid", :unique_index => true
-  property :hashed_password,  String, :field => "userpassword", :lazy => true
+  property :hashed_password,  String, :field => "userPassword", :lazy => true
   property :name,      String, :field => "cn"
   property :mail,      ::Ldap::LdapArray
 

data/spec/spec_helper.rb

@@ -44,10 +44,10 @@ class User
   include DataMapper::Resource
   property :id,        Serial, :field => "uidnumber"
   property :login,     String, :field => "uid", :unique_index => true
-  property :hashed_password,  String, :field => "userpassword", :writer => :private
+  property :hashed_password,  String, :field => "userPassword", :writer => :private
   property :name,      String, :field => "cn"
   property :mail,      String
-  property :age,       Integer, :field => "postalcode"
+  property :age,       Integer, :field => "postalCode"
   property :alive,     Boolean, :field => "gecos"
 
   has n, :roles
@@ -96,7 +96,7 @@ end
 
 class Role
   include DataMapper::Resource
-  property :id,       Serial, :field => "gidnumber"
+  property :id,       Serial, :field => "gidNumber"
   property :name,     String, :field => "cn"
 
   dn_prefix { |role| "cn=#{role.name}" }
@@ -110,7 +110,7 @@ end
 
 class Group
   include DataMapper::Resource
-  property :id,       Serial, :field => "gidnumber"
+  property :id,       Serial, :field => "gidNumber"
   property :name,     String, :field => "cn"
 
   dn_prefix { |group| "cn=#{group.name}" }
@@ -127,14 +127,14 @@ class GroupUser
 
   treebase "ou=groups"
 
-  multivalue_field :memberuid
+  multivalue_field :memberUid
 
   ldap_properties do |group_user|
     {:cn=>"#{group_user.group.name}",  :objectclass => "posixGroup"}
   end
 
-  property :user_id, Integer, :key => true, :field => "memberuid"
-  property :group_id, Integer, :key => true, :field => "gidnumber"
+  property :user_id, Integer, :key => true, :field => "memberUid"
+  property :group_id, Integer, :key => true, :field => "gidNumber"
 
   def group
     Group.get!(group_id)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - mkristian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +05:30
+date: 2011-02-08 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,6 @@ files:
 - README-example.markdown
 - README.txt
 - Rakefile
-- example/identity_map.rb
 - example/posix.rb
 - ldap-commands.txt
 - lib/adapters/ldap_adapter.rb

data/example/identity_map.rb

@@ -1,75 +0,0 @@
-require 'example/posix.rb'
-
-USER_REPO = :default
-
-class User
-
-  def self.ddefault_repository_name
-    USER_REPO
-  end
-
-  def self.repository_name
-    USER_REPO
-  end
-
-  def authenticate(pwd)
-    require 'base64'
-    Base64.encode64(Digest::SHA1.digest(pwd)).gsub(/\n/, '') == attribute_get(:hashed_password)[5,1000]
-  end
-end
-
-class GroupUser
-
-  def self.ddefault_repository_name
-    USER_REPO
-  end
-
-  def self.repository_name
-    USER_REPO
-  end
-
-end
-
-class Group
-
-  def self.ddefault_repository_name
-    USER_REPO
-  end
-
-  def self.repository_name
-    USER_REPO
-  end
-
-end
-
-require 'adapters/memory_adapter'
-DATA_REPO=:store
-DataMapper.setup(DATA_REPO, {:adapter  => 'memory'})
-
-class Item
-  include DataMapper::Resource
-  property :id, Serial
-end
-
-
-DataMapper.repository(USER_REPO) do |repository|
-  repository.adapter.open_ldap_connection do
-    DataMapper.repository(DATA_REPO) do
-      root = User.first(:login => 'root') || User.create(:id => 0, :login => :root, :name => 'root', :password => 'none') if root.nil?
-      admin = Group.first(:name => 'admin') || Group.create(:name => 'admin')
-      root.groups << admin
-
-      p DataMapper.repository(USER_REPO).identity_map(User)
-
-      p DataMapper.repository(USER_REPO).identity_map(Group)
-
-      p root.authenticate('none')
-
-      p root.groups
-
-      (1..10).each {Item.create}
-
-      p DataMapper.repository(DATA_REPO).identity_map(Item)
-    end
-  end
-end