A platform for community discussion. Free, open, simple.
SECURITY: Validate sso_destination_url cookie to prevent open redirect
Juan David Martinez080408b93d00
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rbindex 12b779a264a..2e959d0e678 100644--- a/app/controllers/static_controller.rb+++ b/app/controllers/static_controller.rb@@ -152,12 +152,21 @@ class StaticController < ApplicationControllerparams.delete(:password)destination = extract_redirect_param-allow_other_host = false+ # We need this to redirect the user back when Discourse Connect Provider is used.if cookies[:sso_destination_url]- destination = cookies.delete(:sso_destination_url)- allow_other_host = true+ sso_url = cookies.delete(:sso_destination_url)++ begin+ uri = URI(sso_url)+ if valid_sso_redirect_uri?(uri)+ destination = sso_url+ allow_other_host = true+ end+ rescue URI::Error, ArgumentError+ # Invalid URI, ignore and use default destination+ endenddestination = path(destination) if destination == "/"@@ -269,6 +278,20 @@ class StaticController < ApplicationControllerprotected+ def valid_sso_redirect_uri?(uri)+ return false unless SiteSetting.enable_discourse_connect_provider+ return false if uri.host.blank?++ provider_domains =+ SiteSetting+ .discourse_connect_provider_secrets+ .split("\n")+ .map { |row| row.split("|", 2).first }+ .compact++ provider_domains.any? { |domain| WildcardDomainChecker.check_domain(domain, uri.host) }+ end+def serve_asset(suffix = nil)path = File.expand_path(Rails.root + "public/assets/#{params[:path]}#{suffix}")diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rbindex f138049e779..473b8559124 100644--- a/spec/requests/static_controller_spec.rb+++ b/spec/requests/static_controller_spec.rb@@ -484,6 +484,76 @@ RSpec.describe StaticController doendendend++ context "with sso_destination_url cookie" do+ before { SiteSetting.enable_discourse_connect_provider = true }++ it "redirects to valid SSO destination URL when provider is configured" do+ SiteSetting.discourse_connect_provider_secrets = "allowed-site.com|secret123"+ cookies[:sso_destination_url] = "https://allowed-site.com/sso?token=abc"++ post "/login.json"++ expect(response).to redirect_to("https://allowed-site.com/sso?token=abc")+ expect(response.cookies["sso_destination_url"]).to be_nil+ end++ it "redirects to valid SSO destination URL with wildcard domain" do+ SiteSetting.discourse_connect_provider_secrets = "*.allowed-domain.com|secret123"+ cookies[:sso_destination_url] = "https://sub.allowed-domain.com/sso?token=abc"++ post "/login.json"++ expect(response).to redirect_to("https://sub.allowed-domain.com/sso?token=abc")+ end++ it "ignores SSO destination URL when domain is not in provider secrets" do+ SiteSetting.discourse_connect_provider_secrets = "allowed-site.com|secret123"+ cookies[:sso_destination_url] = "https://evil-site.com/phishing"++ post "/login.json"++ expect(response).to redirect_to("/")+ expect(response.cookies["sso_destination_url"]).to be_nil+ end++ it "ignores SSO destination URL when provider secrets is empty" do+ SiteSetting.discourse_connect_provider_secrets = ""+ cookies[:sso_destination_url] = "https://some-site.com/sso"++ post "/login.json"++ expect(response).to redirect_to("/")+ end++ it "ignores malformed SSO destination URL" do+ SiteSetting.discourse_connect_provider_secrets = "allowed-site.com|secret123"+ cookies[:sso_destination_url] = "not a valid url"++ post "/login.json"++ expect(response).to redirect_to("/")+ end++ it "ignores SSO destination URL when discourse_connect_provider is disabled" do+ SiteSetting.enable_discourse_connect_provider = false+ SiteSetting.discourse_connect_provider_secrets = "allowed-site.com|secret123"+ cookies[:sso_destination_url] = "https://allowed-site.com/sso"++ post "/login.json"++ expect(response).to redirect_to("/")+ end++ it "deletes sso_destination_url cookie regardless of validity" do+ SiteSetting.discourse_connect_provider_secrets = "allowed-site.com|secret123"+ cookies[:sso_destination_url] = "https://evil-site.com/phishing"++ post "/login.json"++ expect(response.cookies["sso_destination_url"]).to be_nil+ end+ endenddescribe "#service_worker_asset" do