diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 0a39d7f26e..7496fe2d51 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -28,7 +28,7 @@ class VerifyLinkService < BaseService
links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]')
- if links.any? { |link| link['href'].downcase == @link_back.downcase }
+ if links.any? { |link| link['href']&.downcase == @link_back.downcase }
true
elsif links.empty?
false
@@ -38,6 +38,8 @@ class VerifyLinkService < BaseService
end
def link_redirects_back?(test_url)
+ return false if test_url.blank?
+
redirect_to_url = Request.new(:head, test_url, follow: false).perform do |res|
res.headers['Location']
end
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 3fc88e60e4..52ba454cce 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -76,7 +76,25 @@ RSpec.describe VerifyLinkService, type: :service do
context 'when a link does not contain a link back' do
let(:html) { '' }
- it 'marks the field as verified' do
+ it 'does not mark the field as verified' do
+ expect(field.verified?).to be false
+ end
+ end
+
+ context 'when link has no `href` attribute' do
+ let(:html) do
+ <<-HTML
+
+
+
+
+
+ Follow me on Mastodon
+
+ HTML
+ end
+
+ it 'does not mark the field as verified' do
expect(field.verified?).to be false
end
end