IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: sendgrid webhooks

Browse Source
This commit is contained in:
Régis Hanol
2016-06-01 21:48:06 +02:00
parent 0f8b4dcc86
commit 9704603fab
7 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/auth/default_current_user_provider.rb
View File

@@ -120,12 +120,11 @@ class Auth::DefaultCurrentUserProvider
protected
def lookup_api_user(api_key_value, request)
api_key = ApiKey.where(key: api_key_value).includes(:user).first
if api_key
if api_key = ApiKey.where(key: api_key_value).includes(:user).first
api_username = request["api_username"]
if api_key.allowed_ips.present? && !api_key.allowed_ips.any?{|ip| ip.include?(request.ip)}
Rails.logger.warn("Unauthorized API access: #{api_username} ip address: #{request.ip}")
if api_key.allowed_ips.present? && !api_key.allowed_ips.any? { |ip| ip.include?(request.ip) }
Rails.logger.warn("[Unauthorized API Access] username: #{api_username}, IP address: #{request.ip}")
return nil
end