Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app/decorators/service_provider_session_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@ def s3_logo_url(service_provider)

def legacy_logo_url
logo = sp_logo
if RemoteSettingsService.remote?(logo)
logo
else
ActionController::Base.helpers.image_path("sp-logos/#{logo}")
end
ActionController::Base.helpers.image_path("sp-logos/#{logo}")
end

def return_to_service_provider_partial
Expand Down
6 changes: 0 additions & 6 deletions app/models/remote_setting.rb

This file was deleted.

12 changes: 4 additions & 8 deletions app/models/service_provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def encryption_opts
def skip_encryption_allowed
config = AppConfig.env.skip_encryption_allowed_list
return false if config.blank?

@allowed_list ||= JSON.parse(config)
@allowed_list.include? issuer
end
Expand All @@ -62,13 +62,9 @@ def live?
private

def load_cert(cert)
if RemoteSettingsService.remote?(cert)
RemoteSettingsService.load(cert)
else
cert_file = Rails.root.join('certs', 'sp', "#{cert}.crt")
return OpenSSL::X509::Certificate.new(cert) unless File.exist?(cert_file)
File.read(cert_file)
end
cert_file = Rails.root.join('certs', 'sp', "#{cert}.crt")
return OpenSSL::X509::Certificate.new(cert) unless File.exist?(cert_file)
File.read(cert_file)
end

def redirect_uris_are_parsable
Expand Down
6 changes: 1 addition & 5 deletions app/services/agency_seeder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ def run
attr_reader :rails_env, :deploy_env

def agencies
file = remote_setting || Rails.root.join('config', 'agencies.yml').read
file = Rails.root.join('config', 'agencies.yml').read
content = ERB.new(file).result
YAML.safe_load(content).fetch(rails_env, {})
end

def remote_setting
RemoteSetting.find_by(name: 'agencies.yml')&.contents
end
end
36 changes: 0 additions & 36 deletions app/services/remote_settings_service.rb

This file was deleted.

6 changes: 1 addition & 5 deletions app/services/service_provider_seeder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run
attr_reader :rails_env, :deploy_env

def service_providers
file = remote_setting || Rails.root.join('config', 'service_providers.yml').read
file = Rails.root.join('config', 'service_providers.yml').read
content = ERB.new(file).result
YAML.safe_load(content).fetch(rails_env)
rescue Psych::SyntaxError => syntax_error
Expand All @@ -41,10 +41,6 @@ def service_providers
raise key_error
end

def remote_setting
RemoteSetting.find_by(name: 'service_providers.yml')&.contents
end

def write_service_provider?(config)
return true if rails_env != 'production'

Expand Down
12 changes: 0 additions & 12 deletions config/application.yml.default
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ development:
reg_confirmed_email_max_attempts: '20'
reg_unconfirmed_email_max_attempts: '20'
reg_unconfirmed_email_window_in_minutes: '60'
remote_settings_certs_dir: 'http://localhost:8090/certs/'
remote_settings_config_dir: 'http://localhost:8090/config/'
remote_settings_logos_dir: 'http://localhost:8090/assets/images/logos/'
remote_settings_whitelist: 'http://localhost:8090'
requests_per_ip_limit: '300'
requests_per_ip_period: '300'
reset_password_email_max_attempts: '20'
Expand Down Expand Up @@ -333,10 +329,6 @@ production:
reg_confirmed_email_max_attempts: '20'
reg_unconfirmed_email_max_attempts: '20'
reg_unconfirmed_email_window_in_minutes: '60'
remote_settings_certs_dir: 'https://assets.login.gov/certs/'
remote_settings_config_dir: 'https://assets.login.gov/config/'
remote_settings_logos_dir: 'https://assets.login.gov/assets/images/logos/'
remote_settings_whitelist: 'https://login.gov|https://.*\.login.gov|https://raw.githubusercontent.com/18F/identity-idp/'
requests_per_ip_limit: '300'
requests_per_ip_period: '300'
reset_password_email_max_attempts: '20'
Expand Down Expand Up @@ -448,10 +440,6 @@ test:
reg_confirmed_email_max_attempts: '3'
reg_unconfirmed_email_max_attempts: '4'
reg_unconfirmed_email_window_in_minutes: '70'
remote_settings_certs_dir: 'https://assets.login.gov/certs/'
remote_settings_config_dir: 'https://assets.login.gov/config/'
remote_settings_logos_dir: 'https://assets.login.gov/assets/images/logos/'
remote_settings_whitelist: 'https://login.gov|https://.*\.login.gov|https://raw.githubusercontent.com/18F/identity-idp/'
requests_per_ip_limit: '4'
requests_per_ip_period: '60'
reset_password_email_max_attempts: '5'
Expand Down
30 changes: 0 additions & 30 deletions lib/tasks/remote_settings.rake

This file was deleted.

16 changes: 0 additions & 16 deletions spec/decorators/service_provider_session_decorator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,6 @@
end
end

context 'service provider has a remote logo' do
it 'returns the remote logo' do
logo = 'https://raw.githubusercontent.com/18F/identity-idp/master/app/assets/images/sp-logos/generic.svg'
sp = build_stubbed(:service_provider, logo: logo)

subject = ServiceProviderSessionDecorator.new(
sp: sp,
view_context: view_context,
sp_session: {},
service_provider_request: ServiceProviderRequestProxy.new,
)

expect(subject.sp_logo_url).to eq(logo)
end
end

context 'service provider has a poorly configured logo' do
it 'does not raise an exception' do
sp = build_stubbed(:service_provider, logo: 'abc')
Expand Down
29 changes: 0 additions & 29 deletions spec/models/remote_setting_spec.rb

This file was deleted.

36 changes: 5 additions & 31 deletions spec/services/agency_seeder_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,12 @@
expect(Agency.find_by(id: 3).name).to eq('EOP')
end

context 'when an agency already exists in the database' do
before do
Agency.create(id: 1, name: 'FOO')
end
it 'updates existing agencies based on the current value of the yml file' do
Agency.create(id: 1, name: 'FOO')

it 'updates the attributes based on the current value of the yml file' do
expect(Agency.find_by(id: 1).name).to eq('FOO')
run
expect(Agency.find_by(id: 1).name).to eq('DHS')
end
end

context 'when agencies.yml has a remote setting' do
before do
location = 'https://raw.githubusercontent.com/18F/identity-idp/master/config/agencies.yml'
RemoteSetting.create(
name: 'agencies.yml', url: location, contents: "test:\n 1:\n name: 'CBP'",
)
end

it 'updates the attributes based on the current value of the yml file' do
Agency.create(id: 1, name: 'FOO')
expect(Agency.find_by(id: 1).name).to eq('FOO')
run
expect(Agency.find_by(id: 1).name).to eq('CBP')
end

it 'insert the attributes based on the contents of the remote setting' do
run
expect(Agency.find_by(id: 1).name).to eq('CBP')
expect(Agency.count).to eq(1)
end
expect(Agency.find_by(id: 1).name).to eq('FOO')
run
expect(Agency.find_by(id: 1).name).to eq('DHS')
end
end
end
99 changes: 0 additions & 99 deletions spec/services/remote_settings_service_spec.rb

This file was deleted.

Loading