Optimize some regex matching (#15528)

* Use Regex#match?

* Replace =~ too

* Avoid to call match? from Nil

* Keep value of Regexp.last_match
signup-info-prompt
luigi 2021-01-22 04:09:08 -05:00 committed by GitHub
parent 7d0031a515
commit eb51e43fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 20 additions and 20 deletions

View File

@ -7,14 +7,14 @@ module Extractor
# :yields: username, list_slug, start, end # :yields: username, list_slug, start, end
def extract_mentions_or_lists_with_indices(text) def extract_mentions_or_lists_with_indices(text)
return [] unless text =~ Twitter::Regex[:at_signs] return [] unless Twitter::Regex[:at_signs].match?(text)
possible_entries = [] possible_entries = []
text.to_s.scan(Account::MENTION_RE) do |screen_name, _| text.to_s.scan(Account::MENTION_RE) do |screen_name, _|
match_data = $LAST_MATCH_INFO match_data = $LAST_MATCH_INFO
after = $' after = $'
unless after =~ Twitter::Regex[:end_mention_match] unless Twitter::Regex[:end_mention_match].match?(after)
start_position = match_data.char_begin(1) - 1 start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1) end_position = match_data.char_end(1)
possible_entries << { possible_entries << {
@ -33,7 +33,7 @@ module Extractor
end end
def extract_hashtags_with_indices(text, **) def extract_hashtags_with_indices(text, **)
return [] unless text =~ /#/ return [] unless /#/.match?(text)
tags = [] tags = []
text.scan(Tag::HASHTAG_RE) do |hash_text, _| text.scan(Tag::HASHTAG_RE) do |hash_text, _|
@ -41,7 +41,7 @@ module Extractor
start_position = match_data.char_begin(1) - 1 start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1) end_position = match_data.char_end(1)
after = $' after = $'
if after =~ %r{\A://} if %r{\A://}.match?(after)
hash_text.match(/(.+)(https?\Z)/) do |matched| hash_text.match(/(.+)(https?\Z)/) do |matched|
hash_text = matched[1] hash_text = matched[1]
end_position -= matched[2].char_length end_position -= matched[2].char_length

View File

@ -396,8 +396,8 @@ class FeedManager
active_filters.map! do |filter| active_filters.map! do |filter|
if filter.whole_word if filter.whole_word
sb = filter.phrase =~ /\A[[:word:]]/ ? '\b' : '' sb = /\A[[:word:]]/.match?(filter.phrase) ? '\b' : ''
eb = filter.phrase =~ /[[:word:]]\z/ ? '\b' : '' eb = /[[:word:]]\z/.match?(filter.phrase) ? '\b' : ''
/(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/ /(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/
else else
@ -417,7 +417,7 @@ class FeedManager
status.media_attachments.map(&:description).join("\n\n"), status.media_attachments.map(&:description).join("\n\n"),
].compact.join("\n\n") ].compact.join("\n\n")
!combined_regex.match(combined_text).nil? combined_regex.match?(combined_text)
end end
# Adds a status to an account's feed, returning true if a status was # Adds a status to an account's feed, returning true if a status was

View File

@ -222,7 +222,7 @@ class Formatter
escaped = text.chars.map do |c| escaped = text.chars.map do |c|
output = begin output = begin
if c.ord.to_s(16).length > 2 && UNICODE_ESCAPE_BLACKLIST_RE.match(c).nil? if c.ord.to_s(16).length > 2 && !UNICODE_ESCAPE_BLACKLIST_RE.match?(c)
CGI.escape(c) CGI.escape(c)
else else
c c

View File

@ -145,7 +145,7 @@ class Request
end end
def block_hidden_service? def block_hidden_service?
!Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match(@url.host) !Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match?(@url.host)
end end
module ClientLimit module ClientLimit

View File

@ -28,9 +28,9 @@ class Sanitize
return unless class_list return unless class_list
class_list.keep_if do |e| class_list.keep_if do |e|
next true if e =~ /^(h|p|u|dt|e)-/ # microformats classes next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
next true if e =~ /^(mention|hashtag)$/ # semantic classes next true if /^(mention|hashtag)$/.match?(e) # semantic classes
next true if e =~ /^(ellipsis|invisible)$/ # link formatting classes next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
end end
node['class'] = class_list.join(' ') node['class'] = class_list.join(' ')

View File

@ -57,7 +57,7 @@ module Omniauthable
user = User.new(user_params_from_auth(email, auth)) user = User.new(user_params_from_auth(email, auth))
user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/ user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image)
user.skip_confirmation! user.skip_confirmation!
user.save! user.save!
user user

View File

@ -175,7 +175,7 @@ class AccountSearchService < BaseService
end end
def username_complete? def username_complete?
query.include?('@') && "@#{query}" =~ /\A#{Account::MENTION_RE}\Z/ query.include?('@') && "@#{query}".match?(/\A#{Account::MENTION_RE}\Z/)
end end
def likely_acct? def likely_acct?

View File

@ -72,7 +72,7 @@ class SearchService < BaseService
end end
def url_query? def url_query?
@resolve && @query =~ /\Ahttps?:\/\// @resolve && /\Ahttps?:\/\//.match?(@query)
end end
def url_resource_results def url_resource_results

View File

@ -22,7 +22,7 @@ class BlacklistedEmailValidator < ActiveModel::Validator
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.') domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
regexp = Regexp.new("@(.+\\.)?(#{domains})", true) regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
@email =~ regexp regexp.match?(@email)
end end
def not_on_whitelist? def not_on_whitelist?

View File

@ -15,6 +15,6 @@ class HtmlValidator < ActiveModel::EachValidator
def html_errors(str) def html_errors(str)
fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str) fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str)
fragment.errors.select { |error| ERROR_RE =~ error.message } fragment.errors.select { |error| ERROR_RE.match?(error.message) }
end end
end end

View File

@ -3,6 +3,6 @@ require 'open-uri'
module OpenURI module OpenURI
def self.redirectable?(uri1, uri2) # :nodoc: def self.redirectable?(uri1, uri2) # :nodoc:
uri1.scheme.casecmp(uri2.scheme).zero? || uri1.scheme.casecmp(uri2.scheme).zero? ||
(/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme) (/\A(?:http|https|ftp)\z/i.match?(uri1.scheme) && /\A(?:http|https|ftp)\z/i.match?(uri2.scheme))
end end
end end

View File

@ -78,7 +78,7 @@ class Rack::Attack
API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.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 =~ API_DELETE_REBLOG_REGEX) || (req.delete? && req.path =~ 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|

View File

@ -93,7 +93,7 @@ module Mastodon
work_unit = ->(domain) do work_unit = ->(domain) do
next if stats.key?(domain) next if stats.key?(domain)
next if options[:exclude_suspended] && domain.match(blocked_domains) next if options[:exclude_suspended] && domain.match?(blocked_domains)
stats[domain] = nil stats[domain] = nil