diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-04 15:47:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 15:47:03 +0200 |
commit | 7fe137d2f7792ed735be11eaca6d87fbc114043a (patch) | |
tree | 77d3cfbfdb19dbac86fbadaac3896c381431e20b /app/models | |
parent | 49b182cd5134f45ca825ae62d869bbb28d3c9266 (diff) |
Fix link verification for remote accounts (#8868)
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/account.rb | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index d8e5c7340..44963f3e6 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -312,8 +312,8 @@ class Account < ApplicationRecord def initialize(account, attributes) @account = account @attributes = attributes - @name = attributes['name'].strip[0, 255] - @value = attributes['value'].strip[0, 255] + @name = attributes['name'].strip[0, string_limit] + @value = attributes['value'].strip[0, string_limit] @verified_at = attributes['verified_at']&.to_datetime @errors = {} end @@ -322,8 +322,18 @@ class Account < ApplicationRecord verified_at.present? end + def value_for_verification + @value_for_verification ||= begin + if account.local? + value + else + ActionController::Base.helpers.strip_tags(value) + end + end + end + def verifiable? - value.present? && value.start_with?('http://', 'https://') + value_for_verification.present? && value_for_verification.start_with?('http://', 'https://') end def mark_verified! @@ -334,6 +344,16 @@ class Account < ApplicationRecord def to_h { name: @name, value: @value, verified_at: @verified_at } end + + private + + def string_limit + if account.local? + 255 + else + 2047 + end + end end class << self |