Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Restrict group SMTP test to admins and block internal hosts

Sérgio Saquetime75cf456e8e3
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index d231bea5706..e9f51870828 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -729,13 +729,21 @@ class GroupsController < ApplicationController
params.require(:password)
group = Group.find(params[:group_id])
- guardian.ensure_can_edit!(group)
+ guardian.ensure_can_admin_group!(group)
RateLimiter.new(current_user, "group_test_email_settings", 5, 1.minute).performed!
settings = params.except(:name, :protocol)
email_host = params[:host]
+ begin
+ FinalDestination::SSRFDetector.lookup_and_filter_ips(email_host)
+ rescue FinalDestination::SSRFDetector::DisallowedIpError
+ raise Discourse::InvalidParameters.new(I18n.t("email_settings.invalid_host"))
+ rescue FinalDestination::SSRFDetector::LookupFailedError
+ raise Discourse::InvalidParameters.new(I18n.t("email_settings.host_resolve_failed"))
+ end
+
if params[:protocol] != "smtp"
raise Discourse::InvalidParameters.new("Valid protocol to test is smtp")
end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9047643596b..9e8ea778f17 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1155,6 +1155,8 @@ en:
connection_error: "There was an issue connecting with the server, check the server name and port and try again."
timeout_error: "Connection to the server timed out, check the server name and port and try again."
unhandled_error: "Unhandled error when testing email settings. %{message}"
+ invalid_host: "The provided host resolves to a disallowed IP address."
+ host_resolve_failed: "The provided host could not be resolved."
webauthn:
validation:
invalid_type_error: "The webauthn type provided was invalid. Valid types are webauthn.get and webauthn.create."
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 9d296d1fddf..6bbd380e2b2 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -2863,10 +2863,7 @@ RSpec.describe GroupsController do
}
end
- before do
- sign_in(user)
- group.group_users.where(user: user).last.update(owner: user)
- end
+ before { sign_in(admin) }
context "when validating smtp" do
let(:protocol) { "smtp" }
@@ -2895,6 +2892,74 @@ RSpec.describe GroupsController do
end
end
+ context "when user is a non-staff group owner" do
+ let(:protocol) { "smtp" }
+ let(:username) { "[email protected]" }
+ let(:password) { "password" }
+ let(:ssl_mode) { Group.smtp_ssl_modes[:starttls] }
+ let(:ssl) { nil }
+ let(:host) { "smtp.somemailsite.com" }
+ let(:port) { 587 }
+
+ before do
+ sign_in(user)
+ group.group_users.where(user: user).last.update(owner: true)
+ end
+
+ it "does not allow testing email settings" do
+ post "/groups/#{group.id}/test_email_settings.json", params: params
+ expect(response.status).to eq(403)
+ end
+ end
+
+ context "when the host resolves to a private IP address" do
+ let(:protocol) { "smtp" }
+ let(:username) { "[email protected]" }
+ let(:password) { "password" }
+ let(:ssl_mode) { Group.smtp_ssl_modes[:starttls] }
+ let(:ssl) { nil }
+ let(:host) { "127.0.0.1" }
+ let(:port) { 587 }
+
+ before do
+ FinalDestination::SSRFDetector.stubs(:lookup_and_filter_ips).raises(
+ FinalDestination::SSRFDetector::DisallowedIpError,
+ )
+ end
+
+ it "rejects the request" do
+ post "/groups/#{group.id}/test_email_settings.json", params: params
+ expect(response.status).to eq(400)
+ expect(response.parsed_body["errors"].first).to include(
+ I18n.t("email_settings.invalid_host"),
+ )
+ end
+ end
+
+ context "when the host cannot be resolved" do
+ let(:protocol) { "smtp" }
+ let(:username) { "[email protected]" }
+ let(:password) { "password" }
+ let(:ssl_mode) { Group.smtp_ssl_modes[:starttls] }
+ let(:ssl) { nil }
+ let(:host) { "nonexistent.internal.host" }
+ let(:port) { 587 }
+
+ before do
+ FinalDestination::SSRFDetector.stubs(:lookup_and_filter_ips).raises(
+ FinalDestination::SSRFDetector::LookupFailedError,
+ )
+ end
+
+ it "rejects the request" do
+ post "/groups/#{group.id}/test_email_settings.json", params: params
+ expect(response.status).to eq(400)
+ expect(response.parsed_body["errors"].first).to include(
+ I18n.t("email_settings.host_resolve_failed"),
+ )
+ end
+ end
+
describe "global param validation and rate limit" do
let(:protocol) { "smtp" }
let(:host) { "smtp.gmail.com" }
@@ -2913,8 +2978,8 @@ RSpec.describe GroupsController do
end
end
- context "when user does not have access to the group" do
- before { group.group_users.destroy_all }
+ context "when user is a regular user without staff access" do
+ before { sign_in(user) }
it "errors if the user does not have access to the group" do
post "/groups/#{group.id}/test_email_settings.json", params: params
@@ -2923,8 +2988,9 @@ RSpec.describe GroupsController do
end
context "when rate limited" do
- it "rate limits anon searches per user" do
+ it "rate limits per user" do
RateLimiter.enable
+ RateLimiter.any_instance.stubs(:rate_unlimited?).returns(false)
5.times { post "/groups/#{group.id}/test_email_settings.json", params: params }
post "/groups/#{group.id}/test_email_settings.json", params: params