zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 10:45:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve readability

Browse source
This commit is contained in:
Artur Beljajev 2019-09-17 18:03:49 +03:00 • committed by Alex Sherman
parent 9eb7d3527b
commit cbb3c0d5ef
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/epp_session.rb
View file

@ -6,14 +6,14 @@ class EppSession < ApplicationRecord
class_attribute :timeout
self.timeout = (ENV['epp_session_timeout_seconds'] || 300).to_i.seconds
class_attribute :limit_per_registrar
self.limit_per_registrar = (ENV['epp_session_limit_per_registrar'] || 4).to_i
class_attribute :sessions_per_registrar
self.sessions_per_registrar = (ENV['epp_session_limit_per_registrar'] || 4).to_i
alias_attribute :last_access, :updated_at
def self.limit_reached?(registrar)
count = where(user_id: registrar.api_users.ids).count
count >= limit_per_registrar
count >= sessions_per_registrar
end
def self.expired

2
config/application.yml.sample
View file

@ -170,7 +170,7 @@ tara_rant_redirect_uri: 'redirect_uri'
default_email_validation_type: 'regex'
epp_session_limit_per_registrar: '4'
epp_sessions_per_registrar: '4'
# Since the keys for staging are absent from the repo, we need to supply them separate for testing.
test:

8
test/integration/epp/login_test.rb
View file

@ -2,11 +2,11 @@ require 'test_helper'
class EppLoginTest < EppTestCase
setup do
@original_session_limit_per_registrar = EppSession.limit_per_registrar
@original_sessions_per_registrar_setting = EppSession.sessions_per_registrar
end
teardown do
EppSession.limit_per_registrar = @original_session_limit_per_registrar
EppSession.sessions_per_registrar = @original_sessions_per_registrar_setting
end
def test_logging_in_with_correct_credentials_creates_new_session
@ -142,10 +142,10 @@ class EppLoginTest < EppTestCase
assert_equal new_password, user.plain_text_password
end
def test_user_cannot_login_when_session_limit_is_exceeded
def test_user_cannot_login_when_max_allowed_sessions_per_registrar_is_exceeded
user = users(:api_bestnames)
eliminate_effect_of_existing_epp_sessions
EppSession.limit_per_registrar = 1
EppSession.sessions_per_registrar = 1
EppSession.create!(session_id: 'any', user: user)
request_xml = <<-XML