zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 12:08:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

prefer each over for

Browse source
This commit is contained in:
Georg Kahest 2017-11-14 12:51:44 +02:00
parent e62bb19a7e
commit abeeec3baf
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/registrar/sessions_controller.rb
View file

@ -156,15 +156,15 @@ class Registrar
def find_user_by_idc_and_allowed(idc) def find_user_by_idc_and_allowed(idc)
return User.new unless idc return User.new unless idc
possible_users = ApiUser.where(identity_code: idc) || User.new possible_users = ApiUser.where(identity_code: idc) || User.new
for selected_user in 0..possible_users.count possible_users eacho do |selected_user|
if possible_users[selected_user].registrar.white_ips.registrar_area.include_ip?(request.ip) if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
break return selected_user
end end
end end
possible_users[selected_user]
end end
def check_ip_restriction def check_ip_restriction
ip_restriction = Authorization::RestrictedIP.new(request.ip) ip_restriction = Authorization::RestrictedIP.new(request.ip)
allowed = ip_restriction.can_access_registrar_area_sign_in_page? allowed = ip_restriction.can_access_registrar_area_sign_in_page?

7
app/models/api_user.rb
View file

@ -58,12 +58,11 @@ class ApiUser < User
return false if ip.blank? return false if ip.blank?
possible_users = where(identity_code: identity_code) possible_users = where(identity_code: identity_code)
for selected_user in 0..possible_users.count possible_users eacho do |selected_user|
if possible_users[selected_user].registrar.white_ips.registrar_area.include_ip?(ip) if selected_user.registrar.white_ips.registrar_area.include_ip?(ip)
break return selected_user
end end
end end
possible_users[selected_user]
end end
end end