potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix site upload validations (#22479)

Browse source 
* Fix site settings media upload handling of DimensionsValidationError

Fixes #22234

* Fix underlying validations not being performed for site uploads
This commit is contained in:
Claire 2023-01-05 13:42:03 +01:00 committed by GitHub
parent 42f9693d00
commit acec1fb745
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/models/form/admin_settings.rb
View file

@ -66,6 +66,7 @@ class Form::AdminSettings
validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) }
validate :validate_site_uploads
KEYS.each do |key|
define_method(key) do
@ -87,11 +88,16 @@ class Form::AdminSettings
define_method("#{key}=") do |file|
value = public_send(key)
value.file = file
rescue Mastodon::DimensionsValidationError => e
errors.add(key.to_sym, e.message)
end
end
def save
return false unless valid?
# NOTE: Annoyingly, files are processed and can error out before
# validations are called, and `valid?` clears errors…
# So for now, return early if errors aren't empty.
return false unless errors.empty? && valid?
KEYS.each do |key|
next unless instance_variable_defined?("@#{key}")
@ -116,4 +122,16 @@ class Form::AdminSettings
value
end
end
def validate_site_uploads
UPLOAD_KEYS.each do |key|
next unless instance_variable_defined?("@#{key}")
upload = instance_variable_get("@#{key}")
next if upload.valid?
upload.errors.each do |error|
errors.import(error, attribute: key)
end
end
end
end