NCCU ldap debug

app/controllers/sessions_controller.rb

@@ -11,28 +11,28 @@ class SessionsController < Devise::SessionsController
     login_uid = params[:user][:nccu_ldap_uid]
     result = false
     ldap = Net::LDAP.new
-    ldap.port = '8001'
-    ldap.host = '127.0.0.1'
-    # ldap.port = '389' 
-    # ldap.host = '140.119.166.23' 
+    #ldap.port = '8001'
+    #ldap.host = '127.0.0.1'
+     ldap.port = '389' 
+     ldap.host = '140.119.166.23' 
     ldap_filter = "(uid=#{login_uid})"
     ldap_base = 'ou=People,dc=nccu,dc=edu,dc=tw'
     ldap.authenticate("cn=uccn,ou=profile,dc=nccu,dc=edu,dc=tw","nccu2ucc") 
-    if ldap.bind
+    if ldap.bind && login_password!='' #need to block password empty
         result = ldap.bind_as(:base => ldap_base,:filter => ldap_filter,:password=> login_password)
         if result 
           nccu_id = get_nccu_id_from_mid_site(login_uid)
-          resource =  User.first(conditions:{ nccu_id: nccu_id })          
+          resource =  nccu_id.nil? ? nil : (User.first(conditions:{ nccu_id: nccu_id }))
            # resource = env['warden'].authenticate!(:check_nccu_ldap)
            # resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
            set_flash_message(:notice, :signed_in) if is_navigational_format?
-           unless resource_name.nil?
+           if (resource.nil? || nccu_id.nil?)
+             flash[:notice] = t('devise.failure.ldap_pass_but_account_not_in_orbit')
+             render :action => "new"
+           else
              resource_name = resource._type.downcase
              sign_in(resource_name, resource)
              respond_with resource, :location => redirect_location(resource_name, resource)
-           else
-             flash[:notice] = t('devise.failure.ldap_pass_but_account_not_in_orbit')
-             render :action => "new"
            end
         else
           flash[:notice] = t('devise.failure.ldap_invalid')