mirror of
https://github.com/discourse/discourse.git
synced 2025-05-24 02:22:40 +08:00
SECURITY: enforce hostname to match discourse hostname
This ensures that the hostname rails uses for various helpers always matches the Discourse hostname
This commit is contained in:
@ -197,6 +197,9 @@ module Discourse
|
|||||||
# supports etags (post 1.7)
|
# supports etags (post 1.7)
|
||||||
config.middleware.delete Rack::ETag
|
config.middleware.delete Rack::ETag
|
||||||
|
|
||||||
|
require 'middleware/enforce_hostname'
|
||||||
|
config.middleware.insert_after Rack::MethodOverride, Middleware::EnforceHostname
|
||||||
|
|
||||||
require 'content_security_policy'
|
require 'content_security_policy'
|
||||||
config.middleware.swap ActionDispatch::ContentSecurityPolicy::Middleware, ContentSecurityPolicy::Middleware
|
config.middleware.swap ActionDispatch::ContentSecurityPolicy::Middleware, ContentSecurityPolicy::Middleware
|
||||||
|
|
||||||
|
20
lib/middleware/enforce_hostname.rb
Normal file
20
lib/middleware/enforce_hostname.rb
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Middleware
|
||||||
|
class EnforceHostname
|
||||||
|
def initialize(app, settings = nil)
|
||||||
|
@app = app
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(env)
|
||||||
|
# enforces hostname to match the hostname of our connection
|
||||||
|
# this middleware lives after rails multisite so at this point
|
||||||
|
# Discourse.current_hostname MUST be canonical, enforce it so
|
||||||
|
# all Rails helpers are guarenteed to use it unconditionally and
|
||||||
|
# never generate incorrect links
|
||||||
|
env[Rack::Request::HTTP_X_FORWARDED_HOST] = nil
|
||||||
|
env[Rack::HTTP_HOST] = Discourse.current_hostname
|
||||||
|
@app.call(env)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -213,6 +213,19 @@ RSpec.describe ApplicationController do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'Custom hostname' do
|
||||||
|
|
||||||
|
it 'does not allow arbitrary host injection' do
|
||||||
|
get("/latest",
|
||||||
|
headers: {
|
||||||
|
"X-Forwarded-Host" => "test123.com"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response.body).not_to include("test123")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'Content Security Policy' do
|
describe 'Content Security Policy' do
|
||||||
it 'is enabled by SiteSettings' do
|
it 'is enabled by SiteSettings' do
|
||||||
SiteSetting.content_security_policy = false
|
SiteSetting.content_security_policy = false
|
||||||
|
Reference in New Issue
Block a user