This commit is contained in:
Devin Howard 2017-01-22 16:28:18 -05:00
parent 3dc1db8836
commit 4a99d74fd8
6 changed files with 93 additions and 85 deletions

View file

@ -1,21 +1,26 @@
# frozen_string_literal: true
class Attachment < ApplicationRecord class Attachment < ApplicationRecord
belongs_to :attachable, polymorphic: true belongs_to :attachable, polymorphic: true
has_attached_file :file, has_attached_file :file,
styles: lambda { |a| styles: lambda { |a|
a.instance.is_image? ? { if a.instance.image?
{
small: 'x200>', small: 'x200>',
medium: 'x300>', medium: 'x300>',
large: 'x400>' large: 'x400>'
} : {} }
else
{}
end
} }
validates_attachment_content_type :file, :content_type => [ validates_attachment_content_type :file, content_type: [
/\Aimage\/.*\Z/, %r{\Aimage/.*\Z},
/\Avideo\/.*\Z/ %r{\Avideo/.*\Z}
] ]
def is_image? def image?
file.instance.file_content_type =~ %r(image) file.instance.file_content_type =~ /image/
end end
end end

View file

@ -132,16 +132,16 @@ class Topic < ApplicationRecord
end end
def after_updated def after_updated
attrs = ['name', 'desc', 'link', 'metacode_id', 'permission', 'defer_to_map_id'] attrs = %w(name desc link metacode_id permission defer_to_map_id)
if attrs.any? { |k| changed_attributes.key?(k) } if attrs.any? { |k| changed_attributes.key?(k) }
new = self.attributes.select {|k| attrs.include?(k) } new = attributes.select { |k| attrs.include?(k) }
old = changed_attributes.select { |k| attrs.include?(k) } old = changed_attributes.select { |k| attrs.include?(k) }
meta = new.merge(old) # we are prioritizing the old values, keeping them meta = new.merge(old) # we are prioritizing the old values, keeping them
meta['changed'] = changed_attributes.keys.select { |k| attrs.include?(k) } meta['changed'] = changed_attributes.keys.select { |k| attrs.include?(k) }
Events::TopicUpdated.publish!(self, user, meta) Events::TopicUpdated.publish!(self, user, meta)
maps.each {|map| maps.each do |map|
ActionCable.server.broadcast 'map_' + map.id.to_s, type: 'topicUpdated', id: id ActionCable.server.broadcast 'map_' + map.id.to_s, type: 'topicUpdated', id: id
} end
end end
end end
end end

View file

@ -1,61 +0,0 @@
# frozen_string_literal: true
class Rack::Attack
Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
# Throttle all requests by IP (60rpm)
#
# Key: "rack::attack:#{Time.now.to_i/:period}:req/ip:#{req.ip}"
# throttle('req/ip', :limit => 300, :period => 5.minutes) do |req|
# req.ip # unless req.path.start_with?('/assets')
# end
# Throttle POST requests to /login by IP address
#
# Key: "rack::attack:#{Time.now.to_i/:period}:logins/ip:#{req.ip}"
throttle('logins/ip', limit: 5, period: 20.seconds) do |req|
req.ip if req.path == '/login' && req.post?
end
# Throttle POST requests to /login by email param
#
# Key: "rack::attack:#{Time.now.to_i/:period}:logins/email:#{req.email}"
#
# Note: This creates a problem where a malicious user could intentionally
# throttle logins for another user and force their login requests to be
# denied, but that's not very common and shouldn't happen to you. (Knock
# on wood!)
throttle('logins/email', limit: 5, period: 20.seconds) do |req|
if req.path == '/login' && req.post?
# return the email if present, nil otherwise
req.params['email'].presence
end
end
throttle('load_url_title/req/5mins/ip', limit: 300, period: 5.minutes) do |req|
req.ip if req.path == 'hacks/load_url_title'
end
throttle('load_url_title/req/1s/ip', limit: 5, period: 1.second) do |req|
# If the return value is truthy, the cache key for the return value
# is incremented and compared with the limit. In this case:
# "rack::attack:#{Time.now.to_i/1.second}:load_url_title/req/ip:#{req.ip}"
#
# If falsy, the cache key is neither incremented nor checked.
req.ip if req.path == 'hacks/load_url_title'
end
self.throttled_response = lambda do |env|
now = Time.now
match_data = env['rack.attack.match_data']
period = match_data[:period]
limit = match_data[:limit]
headers = {
'X-RateLimit-Limit' => limit.to_s,
'X-RateLimit-Remaining' => '0',
'X-RateLimit-Reset' => (now + (period - now.to_i % period)).to_s
}
[429, headers, ['']]
end
end

View file

@ -0,0 +1,63 @@
# frozen_string_literal: true
module Rack
class Attack
Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
# Throttle all requests by IP (60rpm)
#
# Key: "rack::attack:#{Time.now.to_i/:period}:req/ip:#{req.ip}"
# throttle('req/ip', :limit => 300, :period => 5.minutes) do |req|
# req.ip # unless req.path.start_with?('/assets')
# end
# Throttle POST requests to /login by IP address
#
# Key: "rack::attack:#{Time.now.to_i/:period}:logins/ip:#{req.ip}"
throttle('logins/ip', limit: 5, period: 20.seconds) do |req|
req.ip if req.path == '/login' && req.post?
end
# Throttle POST requests to /login by email param
#
# Key: "rack::attack:#{Time.now.to_i/:period}:logins/email:#{req.email}"
#
# Note: This creates a problem where a malicious user could intentionally
# throttle logins for another user and force their login requests to be
# denied, but that's not very common and shouldn't happen to you. (Knock
# on wood!)
throttle('logins/email', limit: 5, period: 20.seconds) do |req|
if req.path == '/login' && req.post?
# return the email if present, nil otherwise
req.params['email'].presence
end
end
throttle('load_url_title/req/5mins/ip', limit: 300, period: 5.minutes) do |req|
req.ip if req.path == 'hacks/load_url_title'
end
throttle('load_url_title/req/1s/ip', limit: 5, period: 1.second) do |req|
# If the return value is truthy, the cache key for the return value
# is incremented and compared with the limit. In this case:
# "rack::attack:#{Time.now.to_i/1.second}:load_url_title/req/ip:#{req.ip}"
#
# If falsy, the cache key is neither incremented nor checked.
req.ip if req.path == 'hacks/load_url_title'
end
self.throttled_response = lambda do |env|
now = Time.zone.now
match_data = env['rack.attack.match_data']
period = match_data[:period]
limit = match_data[:limit]
headers = {
'X-RateLimit-Limit' => limit.to_s,
'X-RateLimit-Remaining' => '0',
'X-RateLimit-Reset' => (now + (period - now.to_i % period)).to_s
}
[429, headers, ['']]
end
end
end

View file

@ -1,9 +1,10 @@
# frozen_string_literal: true
Warden::Manager.after_set_user do |user, auth, opts| Warden::Manager.after_set_user do |user, auth, opts|
scope = opts[:scope] scope = opts[:scope]
auth.cookies.signed["#{scope}.id"] = user.id auth.cookies.signed["#{scope}.id"] = user.id
auth.cookies.signed["#{scope}.expires_at"] = 30.minutes.from_now auth.cookies.signed["#{scope}.expires_at"] = 30.minutes.from_now
end end
Warden::Manager.before_logout do |user, auth, opts| Warden::Manager.before_logout do |_user, auth, opts|
scope = opts[:scope] scope = opts[:scope]
auth.cookies.signed["#{scope}.id"] = nil auth.cookies.signed["#{scope}.id"] = nil
auth.cookies.signed["#{scope}.expires_at"] = nil auth.cookies.signed["#{scope}.expires_at"] = nil