fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 10:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix min_id and max_id causing error in search API (#32857)

Browse source
This commit is contained in:
Eugen Rochko 2024-11-18 10:37:01 +01:00 committed by Claire
parent f9f586d1fe
commit 5a7affedbb
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/lib/search_query_transformer.rb
View file

@ -144,6 +144,8 @@ class SearchQueryTransformer < Parslet::Transform
end end
class PrefixClause class PrefixClause
EPOCH_RE = /\A\d+\z/
attr_reader :operator, :prefix, :term attr_reader :operator, :prefix, :term
def initialize(prefix, operator, term, options = {}) def initialize(prefix, operator, term, options = {})
@ -168,15 +170,15 @@ class SearchQueryTransformer < Parslet::Transform
when 'before' when 'before'
@filter = :created_at @filter = :created_at
@type = :range @type = :range
@term = { lt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' } @term = { lt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'after' when 'after'
@filter = :created_at @filter = :created_at
@type = :range @type = :range
@term = { gt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' } @term = { gt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'during' when 'during'
@filter = :created_at @filter = :created_at
@type = :range @type = :range
@term = { gte: TermValidator.validate_date!(term), lte: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' } @term = { gte: date_from_term(term), lte: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
when 'in' when 'in'
@operator = :flag @operator = :flag
@term = term @term = term
@ -222,16 +224,10 @@ class SearchQueryTransformer < Parslet::Transform
term term
end end
end
class TermValidator def date_from_term(term)
STRICT_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}\z/ # yyyy-MM-dd DateTime.iso8601(term) unless term.match?(EPOCH_RE) # This will raise Date::Error if the date is invalid
EPOCH_MILLIS_REGEX = /\A\d{1,19}\z/ term
def self.validate_date!(value)
return value if value.match?(STRICT_DATE_REGEX) || value.match?(EPOCH_MILLIS_REGEX)
raise Mastodon::FilterValidationError, "Invalid date #{value}"
end end
end end

1
lib/exceptions.rb
View file

@ -8,7 +8,6 @@ module Mastodon
class LengthValidationError < ValidationError; end class LengthValidationError < ValidationError; end
class DimensionsValidationError < ValidationError; end class DimensionsValidationError < ValidationError; end
class StreamValidationError < ValidationError; end class StreamValidationError < ValidationError; end
class FilterValidationError < ValidationError; end
class RaceConditionError < Error; end class RaceConditionError < Error; end
class RateLimitExceededError < Error; end class RateLimitExceededError < Error; end
class SyntaxError < Error; end class SyntaxError < Error; end

2
spec/lib/search_query_transformer_spec.rb
View file

@ -34,7 +34,7 @@ RSpec.describe SearchQueryTransformer do
let(:query) { "#{operator}:\"abc\"" } let(:query) { "#{operator}:\"abc\"" }
it 'raises an exception' do it 'raises an exception' do
expect { subject }.to raise_error(Mastodon::FilterValidationError, 'Invalid date abc') expect { subject }.to raise_error(Date::Error)
end end
end end
end end