Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
9 changes: 8 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,14 @@ class Application < Rails::Application
origins do |source, _env|
next if source == IdentityConfig.store.domain_name

ServiceProvider.pluck(:redirect_uris).flatten.compact.find do |uri|
redirect_uris = Rails.cache.fetch(
'all_service_provider_redirect_uris',
expires_in: IdentityConfig.store.all_redirect_uris_cache_duration_minutes.minutes,
) do
ServiceProvider.pluck(:redirect_uris).flatten.compact
end

redirect_uris.find do |uri|
split_uri = uri.split('//')
protocol = split_uri[0]
domain = split_uri[1].split('/')[0] if split_uri.size > 1
Expand Down
1 change: 1 addition & 0 deletions config/application.yml.default
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ aamva_cert_enabled: 'true'
aamva_sp_banlist_issuers: '[]'
aamva_verification_request_timeout: '5'
aamva_verification_url: https://example.org:12345/verification/url
all_redirect_uris_cache_duration_minutes: '2'
account_reset_token_valid_for_days: '1'
account_reset_wait_period_days: '1'
acuant_maintenance_window_start:
Expand Down
1 change: 1 addition & 0 deletions lib/identity_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def self.build_store(config_map)
config.add(:aamva_sp_banlist_issuers, type: :json)
config.add(:aamva_verification_request_timeout, type: :integer)
config.add(:aamva_verification_url)
config.add(:all_redirect_uris_cache_duration_minutes, type: :integer)
config.add(:account_reset_token_valid_for_days, type: :integer)
config.add(:account_reset_wait_period_days, type: :integer)
config.add(:acuant_maintenance_window_start, type: :timestamp, allow_nil: true)
Expand Down
3 changes: 3 additions & 0 deletions spec/requests/openid_connect_cors_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
require 'rails_helper'

RSpec.describe 'CORS headers for OpenID Connect endpoints' do
before { Rails.cache.clear }
after { Rails.cache.clear }

describe 'configuration endpoint' do
context 'origin is included in ServiceProvider redirect_uris' do
it 'allows origin' do
Expand Down