Skip to content

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

SECURITY: Redact group history related to email password to group owners

Nat59af844e0ee2
diff --git a/app/serializers/basic_group_history_serializer.rb b/app/serializers/basic_group_history_serializer.rb
index 40518bd8ec8..19aef46a952 100644
--- a/app/serializers/basic_group_history_serializer.rb
+++ b/app/serializers/basic_group_history_serializer.rb
@@ -1,6 +1,9 @@
# frozen_string_literal: true
class BasicGroupHistorySerializer < ApplicationSerializer
+ EMAIL_SETTING_SUBJECTS =
+ Set.new(%w[email_password email_username smtp_server smtp_port smtp_ssl_mode])
+
attributes :action, :subject, :prev_value, :new_value, :created_at
has_one :acting_user, embed: :objects, serializer: BasicUserSerializer
@@ -9,4 +12,22 @@ class BasicGroupHistorySerializer < ApplicationSerializer
def action
GroupHistory.actions[object.action]
end
+
+ def prev_value
+ redact_email_setting_value(object.prev_value)
+ end
+
+ def new_value
+ redact_email_setting_value(object.new_value)
+ end
+
+ private
+
+ def redact_email_setting_value(value)
+ return value if value.blank?
+ return value if !EMAIL_SETTING_SUBJECTS.include?(object.subject)
+ return value if scope&.can_admin_group?(object.group)
+
+ I18n.t("staff_action_logs.redacted")
+ end
end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 9dd86838cd5..ddb1ea19b08 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -2595,6 +2595,29 @@ RSpec.describe GroupsController do
end
end
+ it "does not expose email setting values in history logs" do
+ group.update!(
+ email_password: "secret_smtp_pass",
+ email_username: "[email protected]",
+ smtp_server: "smtp.example.com",
+ smtp_port: 587,
+ smtp_ssl_mode: "starttls",
+ )
+ GroupActionLogger.new(admin, group).log_change_group_settings
+
+ get "/groups/#{group.name}/logs.json"
+
+ expect(response.status).to eq(200)
+
+ logs = response.parsed_body["logs"]
+ redacted = I18n.t("staff_action_logs.redacted")
+
+ %w[email_password email_username smtp_server smtp_port smtp_ssl_mode].each do |subject|
+ entry = logs.find { |log| log["subject"] == subject }
+ expect(entry["new_value"]).to eq(redacted)
+ end
+ end
+
it "should not be allowed to view history of an automatic group" do
group = Group.find_by(id: Group::AUTO_GROUPS[:admins])