lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix LDAP password string (#2747) 

* Fix LDAP password string

* Rspec
This commit is contained in:
Ahmad Farhat 2021-06-01 17:42:23 -04:00 committed by GitHub
parent 5872807308
commit f37f4c1ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/sessions_controller.rb
View File

@ -146,12 +146,12 @@ class SessionsController < ApplicationController
ldap_config[:uid] = ENV['LDAP_UID'] ldap_config[:uid] = ENV['LDAP_UID']
if params[:session][:username].blank? || session_params[:password].blank? if params[:session][:username].blank? || session_params[:password].blank?
return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials")) return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials_external"))
end end
result = send_ldap_request(params[:session], ldap_config) result = send_ldap_request(params[:session], ldap_config)
return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials")) unless result return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials_external")) unless result
@auth = parse_auth(result.first, ENV['LDAP_ROLE_FIELD'], ENV['LDAP_ATTRIBUTE_MAPPING']) @auth = parse_auth(result.first, ENV['LDAP_ROLE_FIELD'], ENV['LDAP_ATTRIBUTE_MAPPING'])

1
config/locales/en.yml
View File

@ -314,6 +314,7 @@ en:
home_room: Home Room home_room: Home Room
info_update_success: Information successfully updated. info_update_success: Information successfully updated.
invalid_credentials: The email and password you entered did not match our records. Try again or click Forgot Password to reset your password. invalid_credentials: The email and password you entered did not match our records. Try again or click Forgot Password to reset your password.
invalid_credentials_external: The email and password you entered did not match our records. Please try again.
invalid_login_method: Login failed due to account mismatch. You need to log in with omniauth. invalid_login_method: Login failed due to account mismatch. You need to log in with omniauth.
invite_message: "To invite someone to the meeting, send them this link:" invite_message: "To invite someone to the meeting, send them this link:"
javascript: javascript:

6
spec/controllers/sessions_controller_spec.rb
View File

@ -658,7 +658,7 @@ describe SessionsController, type: :controller do
} }
expect(response).to redirect_to(ldap_signin_path) expect(response).to redirect_to(ldap_signin_path)
expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external"))
end end
it "redirects to signin if no password provided" do it "redirects to signin if no password provided" do
@ -672,7 +672,7 @@ describe SessionsController, type: :controller do
} }
expect(response).to redirect_to(ldap_signin_path) expect(response).to redirect_to(ldap_signin_path)
expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external"))
end end
it "redirects to signin if no username provided" do it "redirects to signin if no username provided" do
@ -686,7 +686,7 @@ describe SessionsController, type: :controller do
} }
expect(response).to redirect_to(ldap_signin_path) expect(response).to redirect_to(ldap_signin_path)
expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external"))
end end
end end
end end