Improved error handling.

This commit is contained in:
Martin Edenhofer 2015-05-25 10:42:58 +02:00
parent 7f7312129c
commit d2b1e69326
4 changed files with 15 additions and 16 deletions

View file

@ -1,16 +1,14 @@
# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/
module Auth::Developer module Auth::Developer
def self.check( _username, password, _config, user ) def self.check(username, password, _config, user)
# development systems # development systems
if Setting.get('developer_mode') == true return false if !username
if password == 'test' return false if !user
return false if Setting.get('developer_mode') != true
return false if password != 'test'
Rails.logger.info "System in developer mode, authentication for user #{user.login} ok." Rails.logger.info "System in developer mode, authentication for user #{user.login} ok."
return user user
end
end
false
end end
end end

View file

@ -1,10 +1,11 @@
# Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/
module Auth::Internal module Auth::Internal
def self.check( _username, password, _config, user ) def self.check(username, password, _config, user)
# return if no user exists # return if no user exists
return nil if !user return false if !username
return false if !user
# sha auth check # sha auth check
if user.password =~ /^\{sha2\}/ if user.password =~ /^\{sha2\}/