mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 04:55:08 +01:00
Code Issues Projects Releases Wiki Activity

Strip spaces around URL when adding a relay (#22655)

Browse Source 
* Strip spaces around URL when adding a relay

Fixes #22650

* Gracefuly handle URL parsing errors in URL validator
This commit is contained in:
Claire 2023-01-05 13:33:33 +01:00 committed by GitHub
parent b3ab0014e6
commit 3654c94583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/relay.rb
View File

@ -18,6 +18,7 @@ class Relay < ApplicationRecord
scope :enabled, -> { accepted } scope :enabled, -> { accepted }
before_validation :strip_url
before_destroy :ensure_disabled before_destroy :ensure_disabled
alias enabled? accepted? alias enabled? accepted?
@ -74,4 +75,8 @@ class Relay < ApplicationRecord
def ensure_disabled def ensure_disabled
disable! if enabled? disable! if enabled?
end end
def strip_url
inbox_url&.strip!
end
end end

2
app/validators/url_validator.rb
View File

@ -10,5 +10,7 @@ class URLValidator < ActiveModel::EachValidator
def compliant?(url) def compliant?(url)
parsed_url = Addressable::URI.parse(url) parsed_url = Addressable::URI.parse(url)
parsed_url && %w(http https).include?(parsed_url.scheme) && parsed_url.host parsed_url && %w(http https).include?(parsed_url.scheme) && parsed_url.host
rescue Addressable::URI::InvalidURIError
false
end end
end end