5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
84 lines
2.2 KiB
Ruby
84 lines
2.2 KiB
Ruby
module Spammable
|
|
extend ActiveSupport::Concern
|
|
|
|
module ClassMethods
|
|
def attr_spammable(attr, options = {})
|
|
spammable_attrs << [attr.to_s, options]
|
|
end
|
|
end
|
|
|
|
included do
|
|
has_one :user_agent_detail, as: :subject, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
|
|
|
|
attr_accessor :spam
|
|
attr_accessor :spam_log
|
|
|
|
after_validation :check_for_spam, on: [:create, :update]
|
|
|
|
cattr_accessor :spammable_attrs, instance_accessor: false do
|
|
[]
|
|
end
|
|
|
|
delegate :ip_address, :user_agent, to: :user_agent_detail, allow_nil: true
|
|
end
|
|
|
|
def submittable_as_spam_by?(current_user)
|
|
current_user && current_user.admin? && submittable_as_spam?
|
|
end
|
|
|
|
def submittable_as_spam?
|
|
if user_agent_detail
|
|
user_agent_detail.submittable? && Gitlab::CurrentSettings.current_application_settings.akismet_enabled
|
|
else
|
|
false
|
|
end
|
|
end
|
|
|
|
def spam?
|
|
@spam
|
|
end
|
|
|
|
def check_for_spam
|
|
error_msg = if Gitlab::Recaptcha.enabled?
|
|
"Your #{spammable_entity_type} has been recognized as spam. "\
|
|
"Please, change the content or solve the reCAPTCHA to proceed."
|
|
else
|
|
"Your #{spammable_entity_type} has been recognized as spam and has been discarded."
|
|
end
|
|
|
|
self.errors.add(:base, error_msg) if spam?
|
|
end
|
|
|
|
def spammable_entity_type
|
|
self.class.name.underscore
|
|
end
|
|
|
|
def spam_title
|
|
attr = self.class.spammable_attrs.find do |_, options|
|
|
options.fetch(:spam_title, false)
|
|
end
|
|
|
|
public_send(attr.first) if attr && respond_to?(attr.first.to_sym) # rubocop:disable GitlabSecurity/PublicSend
|
|
end
|
|
|
|
def spam_description
|
|
attr = self.class.spammable_attrs.find do |_, options|
|
|
options.fetch(:spam_description, false)
|
|
end
|
|
|
|
public_send(attr.first) if attr && respond_to?(attr.first.to_sym) # rubocop:disable GitlabSecurity/PublicSend
|
|
end
|
|
|
|
def spammable_text
|
|
result = self.class.spammable_attrs.map do |attr|
|
|
public_send(attr.first) # rubocop:disable GitlabSecurity/PublicSend
|
|
end
|
|
|
|
result.reject(&:blank?).join("\n")
|
|
end
|
|
|
|
# Override in Spammable if further checks are necessary
|
|
def check_for_spam?
|
|
true
|
|
end
|
|
end
|