Merge branch 'main' into glitch-soc/merge-upstream

2022-11-22 10:28:43 +01:00
parent e0e7a09cfe f343ed42ff
commit ff42233aae
5 changed files with 17 additions and 3 deletions
--- a/app/models/account/field.rb
+++ b/app/models/account/field.rb
@@ -46,7 +46,8 @@ class Account::Field < ActiveModelSerializers::Model
      parsed_url.user.nil? &&
      parsed_url.password.nil? &&
      parsed_url.host.present? &&
-      parsed_url.normalized_host == parsed_url.host
+      parsed_url.normalized_host == parsed_url.host &&
+      (parsed_url.path.empty? || parsed_url.path == parsed_url.normalized_path)
  rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
    false
  end