activeldap 0.9.0 → 0.10.0

data/CHANGES

@@ -1,3 +1,64 @@
+0.10.0:
+  * Implemented LDIF parser.
+  * Improved validation:
+    * Added some validations.
+    * Fixed SINGLE-VALUE validation. [#17763]
+      (Reported by Naoto Morishima)
+  * Supported JNDI as backend.
+  * Improved auto reconnection.
+  * Supported Rails 2.0.2.
+  * Improved performance. (4x)
+  * [API CHANGE]: removed "'binary' =>" from getter result.
+    e.g., before:
+            user.user_certificate # => {"binary" => "..."}
+           now:
+            user.user_certificate # => "..."
+  * Added :excluded_classed ldap_mapping option.
+  * Logged operation time used for LDAP operation.
+  * Improved API:
+    * Accepted non String value for find(:value => XXX).
+      (Suggested by Marc Dequèn)
+    * Accepted DN as ActiveLdap::Base.new(XXX).
+      (Reported by Jeremy Pruitt)
+    * Treated empty password for smiple bind as anonymous bind.
+      (Suggested by Bodaniel Jeans)
+    * Ensured adding "objectClass" for find's :attribute value. [#16946]
+      (Suggested by Nobody)
+    * Fixed a GeneralizedTime type casting bug.
+      (Reported by Bodaniel Jeanes)
+
+0.9.1:
+  * Implemented LDIF parser.
+  * Improved validation:
+    * Added some validations.
+    * Fixed SINGLE-VALUE validation. [#17763]
+      (Reported by Naoto Morishima)
+  * Supported JNDI as backend.
+  * Improved auto reconnection.
+  * Supported Rails 2.0.2.
+  * Improved performance. (4x)
+  * [API CHANGE]: removed "'binary' =>" from getter result.
+      e.g.
+	before:
+	  user.user_certificate # => {"binary" => "..."}
+	now:
+	  user.user_certificate # => "..."
+  * Added :excluded_classed ldap_mapping option.
+  * Logged operation time used for LDAP operation.
+  * Improved API:
+    * Accepted non String value for find(:value => XXX).
+      (Suggested by Marc Dequèn)
+    * Accepted DN as ActiveLdap::Base.new(XXX).
+      (Reported by Jeremy Pruitt)
+    * Treated empty password for smiple bind as anonymous bind.
+      (Suggested by Bodaniel Jeans)
+    * Ensured adding "objectClass" for find's :attribute value. [#16946]
+      (Suggested by Nobody)
+    * Fixed a GeneralizedTime type casting bug.
+      (Reported by Bodaniel Jeanes)
+    * Supported :base and :prefix search/find option value escaping.
+      (Suggested by David Morton)
+
 0.9.0:
   * Improved DN handling.
   * Supported attribute value validation by LDAP schema.

data/README

@@ -84,7 +84,7 @@ THANKS
 This list may not be correct. If you notice mistakes of this
 list, please point out.
 
-* Nobody: Bug reports.
+* Nobody: Bug reports and API improveent ideas.
 * James Hughes: Bug reports and advices and documentations.
 * Buzz Chopra: Documentations.
 * Christoph Lipp: Bug reports.
@@ -99,3 +99,10 @@ list, please point out.
 * Christoph Lipp: Tell us character escape syntax.
 * Kevin McCarthy: Patches.
 * Perry Smith: Patches, bug reports and indications.
+* Marc Dequènes: API suggestions.
+* Jeremy Pruitt: A bug report.
+* Bodaniel Jeanes:
+  * A suggestion for behavior on simple bind with empty password.
+  * Bug reports.
+* Naoto Morishima:
+  * Bug reports.

data/Rakefile

@@ -23,9 +23,10 @@ white_list_paths =
   [
    "rails/plugin/active_ldap/generators/scaffold_al/templates/ldap.yml"
   ]
-Find.find(base_dir) do |target|
+Find.find(base_dir + File::SEPARATOR) do |target|
   target = truncate_base_dir[target]
   components = target.split(File::SEPARATOR)
+  next if components.empty?
   if components.size == 1 and !File.directory?(target)
     next unless base_dir_included_components.include?(components[0])
   end
@@ -54,6 +55,8 @@ project = Hoe.new('activeldap', ActiveLdap::VERSION) do |project|
   project.changes = project.paragraphs_of('CHANGES', 0..1).join("\n\n")
   project.extra_deps = ['activerecord']
   project.rdoc_pattern = /(?:^(?:lib|bin)|\AREADME\z)/
+  project.remote_rdoc_dir = "doc"
+  project.rsync_args += " --chmod=Dg+ws,Fg+w"
   project.spec_extras = {
     :requirements => ['ruby-ldap >= 0.8.2', '(Open)LDAP server'],
     :autorequire => 'active_ldap',

data/benchmark/bench-al.rb

@@ -26,6 +26,7 @@ LDAP_BASE = config[:base]
 LDAP_PREFIX = options.prefix
 LDAP_USER = config[:bind_dn]
 LDAP_PASSWORD = config[:password]
+LDAP_METHOD = config[:method]
 
 class ALUser < ActiveLdap::Base
   ldap_mapping :dn_attribute => 'uid', :prefix => LDAP_PREFIX,
@@ -74,7 +75,11 @@ end
 
 def ldap_connection
   require 'ldap'
-  conn = LDAP::Conn.new(LDAP_HOST, LDAP_PORT)
+  if LDAP_METHOD == :tls
+    conn = LDAP::SSLConn.new(LDAP_HOST, LDAP_PORT, true)
+  else
+    conn = LDAP::Conn.new(LDAP_HOST, LDAP_PORT)
+  end
   conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
   conn.bind(LDAP_USER, LDAP_PASSWORD) if LDAP_USER and LDAP_PASSWORD
   conn
@@ -87,6 +92,7 @@ def net_ldap_connection
   net_ldap_conn = Net::LDAP::Connection.new(:host => LDAP_HOST,
                                             :port => LDAP_PORT)
   if LDAP_USER and LDAP_PASSWORD
+    net_ldap_conn.setup_encryption(:method => :start_tls) if LDAP_METHOD == :tls
     net_ldap_conn.bind(:method => :simple,
                        :username => LDAP_USER,
                        :password => LDAP_PASSWORD)
@@ -166,19 +172,23 @@ def main(do_populate)
   al_count_without_object_creation = 0
   ldap_count = 0
   net_ldap_count = 0
-  Benchmark.bm(20) do |x|
+  Benchmark.bmbm(20) do |x|
     [1].each do |n|
+      GC.start
       x.report("%3dx: AL" % n) {n.times {al_count = search_al}}
+      GC.start
       x.report("%3dx: AL(No Obj)" % n) do
         n.times do
           al_count_without_object_creation = search_al_without_object_creation
         end
       end
+      GC.start
       if ldap_conn
         x.report("%3dx: LDAP" % n) do
           n.times {ldap_count = search_ldap(ldap_conn)}
         end
       end
+      GC.start
       if net_ldap_conn
         x.report("%3dx: Net::LDAP" % n) do
           n.times {net_ldap_count = search_net_ldap(net_ldap_conn)}

data/examples/al-admin/app/controllers/account_controller.rb

@@ -21,9 +21,9 @@ class AccountController < ApplicationController
         }
       end
       redirect_back_or_default(top_url)
-      flash[:notice] = _("Logged in successfully")
+      flash.now[:notice] = _("Logged in successfully")
     else
-      flash[:notice] = _("Login or Password is incorrect")
+      flash.now[:notice] = _("Login or Password is incorrect")
     end
   end
 
@@ -50,7 +50,8 @@ class AccountController < ApplicationController
 
   private
   def force_logout
-    current_user.forget_me if logged_in?
+    return true unless logged_in?
+    current_user.forget_me
     self.current_user = nil
     cookies.delete :auth_token
     reset_session

data/examples/al-admin/app/controllers/application.rb

@@ -2,8 +2,11 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  # Pick a unique cookie name to distinguish our session data from others'
-  session :session_key => '_al-admin_session_id'
+  helper :all # include all helpers, all the time
+
+  # See ActionController::RequestForgeryProtection for details
+  # Uncomment the :secret if you're not using the cookie session store
+  protect_from_forgery # :secret => '5965eefc93d824a9c145fe8edb6d1a36'
 
   init_gettext "al-admin"
 

data/examples/al-admin/app/controllers/directory_controller.rb

@@ -16,7 +16,9 @@ class DirectoryController < ApplicationController
     else
       @entry = Entry.find(dn, find_options)
     end
-    render(:partial => "_entry/entry", :object => @entry)
+    erb = "<%= render(:partial => '_entry/entry', :object => @entry) %>"
+    erb = "<div>\n#{erb}\n</div>"
+    render(:inline => erb)
   end
 
   def populate

data/examples/al-admin/app/controllers/users_controller.rb

@@ -19,8 +19,14 @@ class UsersController < ApplicationController
   def update
     @user = find(params[:id])
     previous_user_password = @user.user_password
-    @user.replace_class(params["object-classes"])
-    if @user.update_attributes(params[:user])
+    object_class_error_message = nil
+    begin
+      @user.replace_class(params["object-classes"])
+    rescue ActiveLdap::RequiredObjectClassMissed
+      object_class_error_message = $!.message
+    end
+    if @user.update_attributes(params[:user]) and
+        object_class_error_message.nil?
       if previous_user_password != @user.user_password and @user.connected?
         @user.bind(@user.password)
       end
@@ -28,20 +34,29 @@ class UsersController < ApplicationController
       redirect_to :action => 'show', :id => @user
     else
       @user.password = @user.password_confirmation = nil
+      @user.errors.add("objectClass", object_class_error_message)
       render :action => 'edit'
     end
   end
 
   def update_object_classes
     @user = find(params[:id])
-    @user.replace_class(params["object-classes"])
+    begin
+      @user.replace_class(params["object-classes"])
+    rescue ActiveLdap::RequiredObjectClassMissed
+      flash.now[:inline_notice] = $!.message
+      erb = "<%= flash_box(flash[:inline_notice], :need_container => true) %>"
+      render(:inline => erb, :status => 400)
+      return
+    end
     available_attributes = @user.attribute_names(true)
     attributes = {}
     (params[:user] || {}).each do |key, value|
       attributes[key] = value if available_attributes.include?(key)
     end
     @user.attributes = attributes
-    render(:partial => "attributes_update_form")
+    erb = "<div>\n<%= render(:partial => 'attributes_update_form') %>\n</div>"
+    render(:inline => erb)
   end
 
   private

data/examples/al-admin/app/controllers/welcome_controller.rb

@@ -2,9 +2,11 @@ class WelcomeController < ApplicationController
   include UrlHelper
 
   def index
-    unless logged_in?
+    if Entry.empty?
+      redirect_to(populate_path)
+    elsif !logged_in?
       flash.keep(:notice)
-      redirect_to(:login_path)
+      redirect_to(login_path)
     end
   end
 end

data/examples/al-admin/app/helpers/application_helper.rb

@@ -2,12 +2,18 @@
 module ApplicationHelper
   include UrlHelper
 
-  def flash_box(message)
+  def flash_box(message, options={})
+    return '' if message.nil?
     id = "flash-box"
     fade_out = Proc.new {|page| page.visual_effect(:fade, id)}
+    message = content_tag(:p, h(message), :class => "notice")
     flash_box_div = content_tag("div", "\n#{message}\n",
                                 :id => id,
                                 :onclick => update_page(&fade_out))
+    if options[:need_container]
+      flash_box_div = content_tag("div", "\n  #{flash_box_div}\n",
+                                  :class => "flash-box-container")
+    end
     set_opacity = update_page {|page| page[id].setOpacity("0.8")}
     effect = update_page do |page|
       page.delay(5) do

data/examples/al-admin/app/helpers/url_helper.rb

@@ -10,4 +10,8 @@ module UrlHelper
   def sign_up_path
     url_for(:controller => "/account", :action => "sign_up")
   end
+
+  def populate_path
+    url_for(:controller => "/directory", :action => "populate")
+  end
 end

data/examples/al-admin/app/models/ldap_user.rb

@@ -38,6 +38,10 @@ class LdapUser < ActiveLdap::Base
       (ActiveLdap::DN.parse(dn) - ActiveLdap::DN.parse(self.class.base)).to_s
   end
 
+  def system_user
+    @system_user ||= User.find_by_dn(dn)
+  end
+
   private
   def encrypt_password
     return if password.blank?

data/examples/al-admin/app/views/directory/{_tree_view_js.rhtml → _tree_view_js.html.erb}

@@ -18,9 +18,8 @@ treeView.addSelectItemCallback(function (element)
     $(<%= entry_id.to_json %>).update(message);
   }
 
-  new Ajax.Updater({success: <%= entry_id.to_json %>},
-                   <%= url_for(:action => "entry").to_json %>,
-                   {parameters: {dn: selectedDN},
-                    evalScripts: true,
-                    onFailure: failureHandler});
+  <%= remote_function(:update => {:success => entry_id},
+                      :url => url_for(:action => "entry"),
+                      :with => "'dn=' + selectedDN",
+                      :failure => "failureHandler") %>;
 });

data/examples/al-admin/app/views/layouts/{application.rhtml → application.html.erb}

@@ -13,7 +13,8 @@
     <%= stylesheet_link_tag('rails') %>
     <%= stylesheet_link_tag('spinelz/treeview.css') %>
     <%= stylesheet_link_tag('spinelz/switcher.css') %>
-    <%= stylesheet_link_tag('common') %>
+    <%= stylesheet_link_tag('base') %>
+    <%= stylesheet_link_tag('structure') %>
     <%= stylesheet_link_tag(@controller.controller_name.gsub(/_/, "-")) %>
     <%= javascript_include_tag(:defaults) %>
     <%= javascript_include_tag("spinelz_lib/spinelz_util.js") %>
@@ -34,7 +35,7 @@
       <hr class="clear" />
     </div>
 
-    <%= render(:partial => "layouts/flash_box") %>
+    <%= flash_box(flash[:notice]) %>
 
     <div class="body">
       <div class="content">

data/examples/al-admin/app/views/users/{_object_classes_update_form.rhtml → _object_classes_update_form.html.erb}

@@ -1,6 +1,7 @@
 <%
   using_object_classes = @user.classes
   available_object_classes = @user.schema.object_classes.collect(&:name)
+  update_failure_id = 'object-classes-obdate-failure'
 %>
 
 <% switcher("object-classes", _("Update objectClasses")) do %>
@@ -33,8 +34,13 @@
 <% end %>
 
 <%= javascript_tag("function updateAttributesForm(form) {" +
-                      remote_function(:update => attributes_form_id,
+                      remote_function(:update => {
+                                        :success => attributes_form_id,
+		      			:failure => update_failure_id,
+                                      },
                                       :url => {:action => :update_object_classes,
                                                :id => @user},
                                       :with => 'Form.serialize(form)') +
                    "}") %>
+
+<div id="<%= h(update_failure_id) %>"></div>

data/examples/al-admin/config/boot.rb

@@ -1,45 +1,109 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
 
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
-  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
 
-  RAILS_ROOT = root_path
-end
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
 
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
+    # FIXME : Ruby 1.9
+    def preinitialize
+      load(preinitializer_path) if File.exists?(preinitializer_path)
+    end
 
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
 
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
 
-      if rails_gem
-        gem "rails", "=#{rails_gem.version.version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
       else
-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+
+        unless rubygems_version >= '0.9.4'
+          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
-    else
-      gem "rails"
-      require 'initializer'
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
     end
   end
-
-  Rails::Initializer.run(:set_load_path)
 end
+
+# All that for this:
+Rails.boot!