e99cf05875
Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
47 lines
1.1 KiB
Ruby
47 lines
1.1 KiB
Ruby
module Gitlab
|
|
module AkismetHelper
|
|
def akismet_enabled?
|
|
current_application_settings.akismet_enabled
|
|
end
|
|
|
|
def akismet_client
|
|
@akismet_client ||= ::Akismet::Client.new(current_application_settings.akismet_api_key,
|
|
Gitlab.config.gitlab.url)
|
|
end
|
|
|
|
def client_ip(env)
|
|
env['action_dispatch.remote_ip'].to_s
|
|
end
|
|
|
|
def user_agent(env)
|
|
env['HTTP_USER_AGENT']
|
|
end
|
|
|
|
def check_for_spam?(project, user)
|
|
akismet_enabled? && !project.team.member?(user)
|
|
end
|
|
|
|
def is_spam?(environment, user, text)
|
|
client = akismet_client
|
|
ip_address = client_ip(environment)
|
|
user_agent = user_agent(environment)
|
|
|
|
params = {
|
|
type: 'comment',
|
|
text: text,
|
|
created_at: DateTime.now,
|
|
author: user.name,
|
|
author_email: user.email,
|
|
referrer: environment['HTTP_REFERER'],
|
|
}
|
|
|
|
begin
|
|
is_spam, is_blatant = client.check(ip_address, user_agent, params)
|
|
is_spam || is_blatant
|
|
rescue => e
|
|
Rails.logger.error("Unable to connect to Akismet: #{e}, skipping check")
|
|
false
|
|
end
|
|
end
|
|
end
|
|
end
|