]> cat aescling's git repositories - mastodon.git/commitdiff
cat aescling's git repositories / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d149c2d)
Fix failed profile verification when rel attribute including values other than me...
authorYamagishi Kazutoshi <ykzts@desire.sh>
Wed, 19 Sep 2018 14:47:31 +0000 (23:47 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 19 Sep 2018 14:47:31 +0000 (16:47 +0200)
app/services/verify_link_service.rb patch | blob | history
spec/services/verify_link_service_spec.rb patch | blob | history

diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 9da7f93c3941e310ab42d48c9503a6f6e068f6f5..846751cd59cf9589862916aad3806590314c9ac6 100644 (file)
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -27,6 +27,6 @@ class VerifyLinkService < BaseService
   def link_back_present?
     return false if @body.empty?
 
-    Nokogiri::HTML(@body).xpath('//a[@rel="me"]|//link[@rel="me"]').any? { |link| link['href'] == @link_back }
+    Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]').any? { |link| link['href'] == @link_back }
   end
 end
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 8ce867e9d4f31626ea688c18540b6b241a350709..acd4e851e5f4ca4ded8a2338c8e06d26d8e2685c 100644 (file)
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -26,6 +26,21 @@ RSpec.describe VerifyLinkService, type: :service do
     end
   end
 
+  context 'when a link contains an <a rel="noopener"> back' do
+    let(:html) do
+      <<-HTML
+        <!doctype html>
+        <body>
+          <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="noopener me" target="_blank">Follow me on Mastodon</a>
+        </body>
+      HTML
+    end
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be true
+    end
+  end
+
   context 'when a link contains a <link> back' do
     let(:html) do
       <<-HTML
source code fur Kibicat Mastodon