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:
parent
6fde58ff90
commit
e7001f879a
|
@ -197,6 +197,9 @@ module Discourse
|
|||
# supports etags (post 1.7)
|
||||
config.middleware.delete Rack::ETag
|
||||
|
||||
require 'middleware/enforce_hostname'
|
||||
config.middleware.insert_after Rack::MethodOverride, Middleware::EnforceHostname
|
||||
|
||||
require 'content_security_policy'
|
||||
config.middleware.swap ActionDispatch::ContentSecurityPolicy::Middleware, ContentSecurityPolicy::Middleware
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
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
|
||||
it 'is enabled by SiteSettings' do
|
||||
SiteSetting.content_security_policy = false
|
||||
|
|
Loading…
Reference in New Issue