v4.0.0-branch #7
10 changed files with 195 additions and 94 deletions
|
@ -3,7 +3,7 @@ Changelog
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
## [Unreleased]
|
## [4.0.0] - 2022-11-14
|
||||||
|
|
||||||
Some of the features in this release have been funded through the [NGI0 Discovery](https://nlnet.nl/discovery) Fund, a fund established by [NLnet](https://nlnet.nl/) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu/) programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 825322.
|
Some of the features in this release have been funded through the [NGI0 Discovery](https://nlnet.nl/discovery) Fund, a fund established by [NLnet](https://nlnet.nl/) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu/) programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 825322.
|
||||||
|
|
||||||
|
@ -196,6 +196,10 @@ Some of the features in this release have been funded through the [NGI0 Discover
|
||||||
### Security
|
### Security
|
||||||
|
|
||||||
- Fix being able to spoof link verification ([Gargron](https://github.com/mastodon/mastodon/pull/20217))
|
- Fix being able to spoof link verification ([Gargron](https://github.com/mastodon/mastodon/pull/20217))
|
||||||
|
- Fix emoji substitution not applying only to text nodes in backend code ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20641))
|
||||||
|
- Fix emoji substitution not applying only to text nodes in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20640))
|
||||||
|
- Fix rate limiting for paths with formats ([Gargron](https://github.com/mastodon/mastodon/pull/20675))
|
||||||
|
- Fix out-of-bound reads in blurhash transcoder ([delroth](https://github.com/mastodon/mastodon/pull/20388))
|
||||||
|
|
||||||
## [3.5.3] - 2022-05-26
|
## [3.5.3] - 2022-05-26
|
||||||
### Added
|
### Added
|
||||||
|
|
3
Gemfile
3
Gemfile
|
@ -122,6 +122,7 @@ group :test do
|
||||||
gem 'simplecov', '~> 0.21', require: false
|
gem 'simplecov', '~> 0.21', require: false
|
||||||
gem 'webmock', '~> 3.18'
|
gem 'webmock', '~> 3.18'
|
||||||
gem 'rspec_junit_formatter', '~> 0.6'
|
gem 'rspec_junit_formatter', '~> 0.6'
|
||||||
|
gem 'rack-test', '~> 2.0'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
|
@ -152,7 +153,5 @@ end
|
||||||
|
|
||||||
gem 'concurrent-ruby', require: false
|
gem 'concurrent-ruby', require: false
|
||||||
gem 'connection_pool', require: false
|
gem 'connection_pool', require: false
|
||||||
|
|
||||||
gem 'xorcist', '~> 1.1'
|
gem 'xorcist', '~> 1.1'
|
||||||
|
|
||||||
gem 'cocoon', '~> 1.2'
|
gem 'cocoon', '~> 1.2'
|
||||||
|
|
|
@ -815,6 +815,7 @@ DEPENDENCIES
|
||||||
rack (~> 2.2.4)
|
rack (~> 2.2.4)
|
||||||
rack-attack (~> 6.6)
|
rack-attack (~> 6.6)
|
||||||
rack-cors (~> 1.1)
|
rack-cors (~> 1.1)
|
||||||
|
rack-test (~> 2.0)
|
||||||
rails (~> 6.1.7)
|
rails (~> 6.1.7)
|
||||||
rails-controller-testing (~> 1.0)
|
rails-controller-testing (~> 1.0)
|
||||||
rails-i18n (~> 6.0)
|
rails-i18n (~> 6.0)
|
||||||
|
|
|
@ -19,15 +19,23 @@ const emojiFilename = (filename) => {
|
||||||
return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
|
return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
|
||||||
};
|
};
|
||||||
|
|
||||||
const emojify = (str, customEmojis = {}) => {
|
const emojifyTextNode = (node, customEmojis) => {
|
||||||
const tagCharsWithoutEmojis = '<&';
|
const parentElement = node.parentElement;
|
||||||
const tagCharsWithEmojis = Object.keys(customEmojis).length ? '<&:' : '<&';
|
let str = node.textContent;
|
||||||
let rtn = '', tagChars = tagCharsWithEmojis, invisible = 0;
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
let match, i = 0, tag;
|
let match, i = 0;
|
||||||
while (i < str.length && (tag = tagChars.indexOf(str[i])) === -1 && (invisible || !(match = trie.search(str.slice(i))))) {
|
|
||||||
|
if (customEmojis === null) {
|
||||||
|
while (i < str.length && !(match = trie.search(str.slice(i)))) {
|
||||||
i += str.codePointAt(i) < 65536 ? 1 : 2;
|
i += str.codePointAt(i) < 65536 ? 1 : 2;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
|
||||||
|
i += str.codePointAt(i) < 65536 ? 1 : 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let rend, replacement = '';
|
let rend, replacement = '';
|
||||||
if (i === str.length) {
|
if (i === str.length) {
|
||||||
break;
|
break;
|
||||||
|
@ -35,8 +43,6 @@ const emojify = (str, customEmojis = {}) => {
|
||||||
if (!(() => {
|
if (!(() => {
|
||||||
rend = str.indexOf(':', i + 1) + 1;
|
rend = str.indexOf(':', i + 1) + 1;
|
||||||
if (!rend) return false; // no pair of ':'
|
if (!rend) return false; // no pair of ':'
|
||||||
const lt = str.indexOf('<', i + 1);
|
|
||||||
if (!(lt === -1 || lt >= rend)) return false; // tag appeared before closing ':'
|
|
||||||
const shortname = str.slice(i, rend);
|
const shortname = str.slice(i, rend);
|
||||||
// now got a replacee as ':shortname:'
|
// now got a replacee as ':shortname:'
|
||||||
// if you want additional emoji handler, add statements below which set replacement and return true.
|
// if you want additional emoji handler, add statements below which set replacement and return true.
|
||||||
|
@ -47,29 +53,6 @@ const emojify = (str, customEmojis = {}) => {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
})()) rend = ++i;
|
})()) rend = ++i;
|
||||||
} else if (tag >= 0) { // <, &
|
|
||||||
rend = str.indexOf('>;'[tag], i + 1) + 1;
|
|
||||||
if (!rend) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (tag === 0) {
|
|
||||||
if (invisible) {
|
|
||||||
if (str[i + 1] === '/') { // closing tag
|
|
||||||
if (!--invisible) {
|
|
||||||
tagChars = tagCharsWithEmojis;
|
|
||||||
}
|
|
||||||
} else if (str[rend - 2] !== '/') { // opening tag
|
|
||||||
invisible++;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (str.startsWith('<span class="invisible">', i)) {
|
|
||||||
// avoid emojifying on invisible text
|
|
||||||
invisible = 1;
|
|
||||||
tagChars = tagCharsWithoutEmojis;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
i = rend;
|
|
||||||
} else { // matched to unicode emoji
|
} else { // matched to unicode emoji
|
||||||
const { filename, shortCode } = unicodeMapping[match];
|
const { filename, shortCode } = unicodeMapping[match];
|
||||||
const title = shortCode ? `:${shortCode}:` : '';
|
const title = shortCode ? `:${shortCode}:` : '';
|
||||||
|
@ -80,10 +63,39 @@ const emojify = (str, customEmojis = {}) => {
|
||||||
rend += 1;
|
rend += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rtn += str.slice(0, i) + replacement;
|
|
||||||
|
node.textContent = str.slice(0, i);
|
||||||
|
parentElement.insertAdjacentHTML('beforeend', replacement);
|
||||||
str = str.slice(rend);
|
str = str.slice(rend);
|
||||||
|
node = document.createTextNode(str);
|
||||||
|
parentElement.append(node);
|
||||||
}
|
}
|
||||||
return rtn + str;
|
};
|
||||||
|
|
||||||
|
const emojifyNode = (node, customEmojis) => {
|
||||||
|
for (const child of node.childNodes) {
|
||||||
|
switch(child.nodeType) {
|
||||||
|
case Node.TEXT_NODE:
|
||||||
|
emojifyTextNode(child, customEmojis);
|
||||||
|
break;
|
||||||
|
case Node.ELEMENT_NODE:
|
||||||
|
if (!child.classList.contains('invisible'))
|
||||||
|
emojifyNode(child, customEmojis);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const emojify = (str, customEmojis = {}) => {
|
||||||
|
const wrapper = document.createElement('div');
|
||||||
|
wrapper.innerHTML = str;
|
||||||
|
|
||||||
|
if (!Object.keys(customEmojis).length)
|
||||||
|
customEmojis = null;
|
||||||
|
|
||||||
|
emojifyNode(wrapper, customEmojis);
|
||||||
|
|
||||||
|
return wrapper.innerHTML;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default emojify;
|
export default emojify;
|
||||||
|
|
|
@ -436,7 +436,7 @@ export default function compose(state = initialState, action) {
|
||||||
.setIn(['media_modal', 'dirty'], false)
|
.setIn(['media_modal', 'dirty'], false)
|
||||||
.update('media_attachments', list => list.map(item => {
|
.update('media_attachments', list => list.map(item => {
|
||||||
if (item.get('id') === action.media.id) {
|
if (item.get('id') === action.media.id) {
|
||||||
return fromJS(action.media);
|
return fromJS(action.media).set('unattached', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
|
|
|
@ -23,48 +23,40 @@ class EmojiFormatter
|
||||||
def to_s
|
def to_s
|
||||||
return html if custom_emojis.empty? || html.blank?
|
return html if custom_emojis.empty? || html.blank?
|
||||||
|
|
||||||
|
tree = Nokogiri::HTML.fragment(html)
|
||||||
|
tree.xpath('./text()|.//text()[not(ancestor[@class="invisible"])]').to_a.each do |node|
|
||||||
i = -1
|
i = -1
|
||||||
tag_open_index = nil
|
|
||||||
inside_shortname = false
|
inside_shortname = false
|
||||||
shortname_start_index = -1
|
shortname_start_index = -1
|
||||||
invisible_depth = 0
|
|
||||||
last_index = 0
|
last_index = 0
|
||||||
result = ''.dup
|
text = node.content
|
||||||
|
result = Nokogiri::XML::NodeSet.new(tree.document)
|
||||||
|
|
||||||
while i + 1 < html.size
|
while i + 1 < text.size
|
||||||
i += 1
|
i += 1
|
||||||
|
|
||||||
if invisible_depth.zero? && inside_shortname && html[i] == ':'
|
if inside_shortname && text[i] == ':'
|
||||||
inside_shortname = false
|
inside_shortname = false
|
||||||
shortcode = html[shortname_start_index + 1..i - 1]
|
shortcode = text[shortname_start_index + 1..i - 1]
|
||||||
char_after = html[i + 1]
|
char_after = text[i + 1]
|
||||||
|
|
||||||
next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
|
next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
|
||||||
|
|
||||||
result << html[last_index..shortname_start_index - 1] if shortname_start_index.positive?
|
result << Nokogiri::XML::Text.new(text[last_index..shortname_start_index - 1], tree.document) if shortname_start_index.positive?
|
||||||
result << image_for_emoji(shortcode, emoji)
|
result << Nokogiri::HTML.fragment(image_for_emoji(shortcode, emoji))
|
||||||
last_index = i + 1
|
|
||||||
elsif tag_open_index && html[i] == '>'
|
|
||||||
tag = html[tag_open_index..i]
|
|
||||||
tag_open_index = nil
|
|
||||||
|
|
||||||
if invisible_depth.positive?
|
last_index = i + 1
|
||||||
invisible_depth += count_tag_nesting(tag)
|
elsif text[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(text[i - 1]))
|
||||||
elsif tag == '<span class="invisible">'
|
|
||||||
invisible_depth = 1
|
|
||||||
end
|
|
||||||
elsif html[i] == '<'
|
|
||||||
tag_open_index = i
|
|
||||||
inside_shortname = false
|
|
||||||
elsif !tag_open_index && html[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(html[i - 1]))
|
|
||||||
inside_shortname = true
|
inside_shortname = true
|
||||||
shortname_start_index = i
|
shortname_start_index = i
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
result << html[last_index..-1]
|
result << Nokogiri::XML::Text.new(text[last_index..-1], tree.document)
|
||||||
|
node.replace(result)
|
||||||
|
end
|
||||||
|
|
||||||
result.html_safe # rubocop:disable Rails/OutputSafety
|
tree.to_html.html_safe # rubocop:disable Rails/OutputSafety
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -17,6 +17,18 @@ class Rack::Attack
|
||||||
@remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
|
@remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def throttleable_remote_ip
|
||||||
|
@throttleable_remote_ip ||= begin
|
||||||
|
ip = IPAddr.new(remote_ip)
|
||||||
|
|
||||||
|
if ip.ipv6?
|
||||||
|
ip.mask(64)
|
||||||
|
else
|
||||||
|
ip
|
||||||
|
end
|
||||||
|
end.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def authenticated_user_id
|
def authenticated_user_id
|
||||||
authenticated_token&.resource_owner_id
|
authenticated_token&.resource_owner_id
|
||||||
end
|
end
|
||||||
|
@ -29,6 +41,10 @@ class Rack::Attack
|
||||||
path.start_with?('/api')
|
path.start_with?('/api')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def path_matches?(other_path)
|
||||||
|
/\A#{Regexp.escape(other_path)}(\..*)?\z/ =~ path
|
||||||
|
end
|
||||||
|
|
||||||
def web_request?
|
def web_request?
|
||||||
!api_request?
|
!api_request?
|
||||||
end
|
end
|
||||||
|
@ -51,19 +67,19 @@ class Rack::Attack
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req|
|
throttle('throttle_unauthenticated_api', limit: 300, period: 5.minutes) do |req|
|
||||||
req.remote_ip if req.api_request? && req.unauthenticated?
|
req.throttleable_remote_ip if req.api_request? && req.unauthenticated?
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req|
|
throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req|
|
||||||
req.authenticated_user_id if req.post? && req.path.match?('^/api/v\d+/media')
|
req.authenticated_user_id if req.post? && req.path.match?(/\A\/api\/v\d+\/media\z/i)
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_media_proxy', limit: 30, period: 10.minutes) do |req|
|
throttle('throttle_media_proxy', limit: 30, period: 10.minutes) do |req|
|
||||||
req.remote_ip if req.path.start_with?('/media_proxy')
|
req.throttleable_remote_ip if req.path.start_with?('/media_proxy')
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_api_sign_up', limit: 5, period: 30.minutes) do |req|
|
throttle('throttle_api_sign_up', limit: 5, period: 30.minutes) do |req|
|
||||||
req.remote_ip if req.post? && req.path == '/api/v1/accounts'
|
req.throttleable_remote_ip if req.post? && req.path == '/api/v1/accounts'
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
|
throttle('throttle_authenticated_paging', limit: 300, period: 15.minutes) do |req|
|
||||||
|
@ -71,39 +87,34 @@ class Rack::Attack
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_unauthenticated_paging', limit: 300, period: 15.minutes) do |req|
|
throttle('throttle_unauthenticated_paging', limit: 300, period: 15.minutes) do |req|
|
||||||
req.remote_ip if req.paging_request? && req.unauthenticated?
|
req.throttleable_remote_ip if req.paging_request? && req.unauthenticated?
|
||||||
end
|
end
|
||||||
|
|
||||||
API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog/.freeze
|
API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog\z/.freeze
|
||||||
API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze
|
API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+\z/.freeze
|
||||||
|
|
||||||
throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
|
throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
|
||||||
req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
|
req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
|
throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
|
||||||
if req.post? && req.path == '/auth'
|
req.throttleable_remote_ip if req.post? && req.path_matches?('/auth')
|
||||||
addr = req.remote_ip
|
|
||||||
addr = IPAddr.new(addr) if addr.is_a?(String)
|
|
||||||
addr = addr.mask(64) if addr.ipv6?
|
|
||||||
addr.to_s
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_password_resets/ip', limit: 25, period: 5.minutes) do |req|
|
throttle('throttle_password_resets/ip', limit: 25, period: 5.minutes) do |req|
|
||||||
req.remote_ip if req.post? && req.path == '/auth/password'
|
req.throttleable_remote_ip if req.post? && req.path_matches?('/auth/password')
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_password_resets/email', limit: 5, period: 30.minutes) do |req|
|
throttle('throttle_password_resets/email', limit: 5, period: 30.minutes) do |req|
|
||||||
req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/password'
|
req.params.dig('user', 'email').presence if req.post? && req.path_matches?('/auth/password')
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
|
throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
|
||||||
req.remote_ip if req.post? && %w(/auth/confirmation /api/v1/emails/confirmations).include?(req.path)
|
req.throttleable_remote_ip if req.post? && (req.path_matches?('/auth/confirmation') || req.path == '/api/v1/emails/confirmations')
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
|
throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
|
||||||
if req.post? && req.path == '/auth/password'
|
if req.post? && req.path_matches?('/auth/password')
|
||||||
req.params.dig('user', 'email').presence
|
req.params.dig('user', 'email').presence
|
||||||
elsif req.post? && req.path == '/api/v1/emails/confirmations'
|
elsif req.post? && req.path == '/api/v1/emails/confirmations'
|
||||||
req.authenticated_user_id
|
req.authenticated_user_id
|
||||||
|
@ -111,11 +122,11 @@ class Rack::Attack
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
|
throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
|
||||||
req.remote_ip if req.post? && req.path == '/auth/sign_in'
|
req.throttleable_remote_ip if req.post? && req.path_matches?('/auth/sign_in')
|
||||||
end
|
end
|
||||||
|
|
||||||
throttle('throttle_login_attempts/email', limit: 25, period: 1.hour) do |req|
|
throttle('throttle_login_attempts/email', limit: 25, period: 1.hour) do |req|
|
||||||
req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/sign_in'
|
req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path_matches?('/auth/sign_in')
|
||||||
end
|
end
|
||||||
|
|
||||||
self.throttled_responder = lambda do |request|
|
self.throttled_responder = lambda do |request|
|
||||||
|
|
|
@ -73,7 +73,7 @@ Rails.application.routes.draw do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
devise_for :users, path: 'auth', controllers: {
|
devise_for :users, path: 'auth', format: false, controllers: {
|
||||||
omniauth_callbacks: 'auth/omniauth_callbacks',
|
omniauth_callbacks: 'auth/omniauth_callbacks',
|
||||||
sessions: 'auth/sessions',
|
sessions: 'auth/sessions',
|
||||||
registrations: 'auth/registrations',
|
registrations: 'auth/registrations',
|
||||||
|
@ -216,7 +216,7 @@ Rails.application.routes.draw do
|
||||||
resource :relationships, only: [:show, :update]
|
resource :relationships, only: [:show, :update]
|
||||||
resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
|
resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
|
||||||
|
|
||||||
get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy
|
get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false
|
||||||
|
|
||||||
resource :authorize_interaction, only: [:show, :create]
|
resource :authorize_interaction, only: [:show, :create]
|
||||||
resource :share, only: [:show, :create]
|
resource :share, only: [:show, :create]
|
||||||
|
@ -404,7 +404,7 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
get '/admin', to: redirect('/admin/dashboard', status: 302)
|
get '/admin', to: redirect('/admin/dashboard', status: 302)
|
||||||
|
|
||||||
namespace :api do
|
namespace :api, format: false do
|
||||||
# OEmbed
|
# OEmbed
|
||||||
get '/oembed', to: 'oembed#show', as: :oembed
|
get '/oembed', to: 'oembed#show', as: :oembed
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ module Mastodon
|
||||||
end
|
end
|
||||||
|
|
||||||
def flags
|
def flags
|
||||||
'rc4'
|
''
|
||||||
end
|
end
|
||||||
|
|
||||||
def suffix
|
def suffix
|
||||||
|
|
82
spec/config/initializers/rack_attack_spec.rb
Normal file
82
spec/config/initializers/rack_attack_spec.rb
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
describe Rack::Attack do
|
||||||
|
include Rack::Test::Methods
|
||||||
|
|
||||||
|
def app
|
||||||
|
Rails.application
|
||||||
|
end
|
||||||
|
|
||||||
|
shared_examples 'throttled endpoint' do
|
||||||
|
context 'when the number of requests is lower than the limit' do
|
||||||
|
it 'does not change the request status' do
|
||||||
|
limit.times do
|
||||||
|
request.call
|
||||||
|
expect(last_response.status).to_not eq(429)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when the number of requests is higher than the limit' do
|
||||||
|
it 'returns http too many requests' do
|
||||||
|
(limit * 2).times do |i|
|
||||||
|
request.call
|
||||||
|
expect(last_response.status).to eq(429) if i > limit
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:remote_ip) { '1.2.3.5' }
|
||||||
|
|
||||||
|
describe 'throttle excessive sign-up requests by IP address' do
|
||||||
|
context 'through the website' do
|
||||||
|
let(:limit) { 25 }
|
||||||
|
let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
|
||||||
|
|
||||||
|
context 'for exact path' do
|
||||||
|
let(:path) { '/auth' }
|
||||||
|
it_behaves_like 'throttled endpoint'
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'for path with format' do
|
||||||
|
let(:path) { '/auth.html' }
|
||||||
|
it_behaves_like 'throttled endpoint'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'through the API' do
|
||||||
|
let(:limit) { 5 }
|
||||||
|
let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
|
||||||
|
|
||||||
|
context 'for exact path' do
|
||||||
|
let(:path) { '/api/v1/accounts' }
|
||||||
|
it_behaves_like 'throttled endpoint'
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'for path with format' do
|
||||||
|
let(:path) { '/api/v1/accounts.json' }
|
||||||
|
|
||||||
|
it 'returns http not found' do
|
||||||
|
request.call
|
||||||
|
expect(last_response.status).to eq(404)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'throttle excessive sign-in requests by IP address' do
|
||||||
|
let(:limit) { 25 }
|
||||||
|
let(:request) { ->() { post path, {}, 'REMOTE_ADDR' => remote_ip } }
|
||||||
|
|
||||||
|
context 'for exact path' do
|
||||||
|
let(:path) { '/auth/sign_in' }
|
||||||
|
it_behaves_like 'throttled endpoint'
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'for path with format' do
|
||||||
|
let(:path) { '/auth/sign_in.html' }
|
||||||
|
it_behaves_like 'throttled endpoint'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue