Download as
Browse Code »

Commit 727e0bb294dd3cc21d87132ea76eed704956d9f4

Authored by Leandro Nunes dos Santos
1 parent 12f1c20e
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

should not return an user if it does not exist

Showing 2 changed files with 9 additions and 0 deletions   Show diff stats
plugins/ldap/lib/ldap_plugin.rb
  Diff comments   View file @727e0bb
... ... @@ -51,7 +51,10 @@ class LdapPlugin < Noosfero::Plugin
51 51 rescue
52 52 #User not saved
53 53 end
  54 + else
  55 + user = nil
54 56 end
  57 +
55 58 else
56 59  
57 60 return nil if !user.activated?
... ... @@ -60,6 +63,7 @@ class LdapPlugin < Noosfero::Plugin
60 63 # user si defined as nil if ldap authentication failed
61 64 user = nil if ldap.authenticate(login, password).nil?
62 65 rescue Net::LDAP::LdapError => e
  66 + user = nil
63 67 puts "LDAP is not configured correctly"
64 68 end
65 69 end
... ...
plugins/ldap/test/functional/account_controller_plugin_test.rb
  Diff comments   View file @727e0bb
... ... @@ -22,6 +22,11 @@ class AccountControllerPluginTest < ActionController::TestCase
22 22 assert_nil session[:user]
23 23 end
24 24  
  25 + should 'diplay not logged message if the user is not a local user or a ldap user' do
  26 + post :login, :user => {:login => 'someuser', :password => 'somepass'}
  27 + assert_equal 'Incorrect username or password', session[:notice]
  28 + end
  29 +
25 30 should 'authenticate user if its a local user but is not a ldap user' do
26 31 user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
27 32 user.activate
... ...