Merge branch 'bugfix/rel-me_list' into 'develop'

Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901

Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901
07f8c79a · kaniini · d249ea8e · 788a354c · 07f8c79a · 07f8c79a
Commit 07f8c79a authored Mar 06, 2019 by kaniini
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -28,7 +28,8 @@ defp parse_url(url) do
    {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options)

    data =
-      Floki.attribute(html, "link[rel=me]", "href") ++ Floki.attribute(html, "a[rel=me]", "href")
+      Floki.attribute(html, "link[rel~=me]", "href") ++
+        Floki.attribute(html, "a[rel~=me]", "href")

    {:ok, data}
  rescue

--- a/test/fixtures/rel_me_anchor_nofollow.html
+++ b/test/fixtures/rel_me_anchor_nofollow.html
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8"/>
+		<title>Blog</title>
+	</head>
+	<body>
+	<article>
+		<h1>Lorem ipsum</h1>
+		<p>Lorem ipsum dolor sit ameph, …</p>
+		<a rel="me nofollow" href="https://social.example.org/users/lain">lain’s account</a>
+	</article>
+	</body>
+</html>
--- a/test/fixtures/rel_me_null.html
+++ b/test/fixtures/rel_me_null.html
@@ -8,6 +8,7 @@
 	<article>
 		<h1>Lorem ipsum</h1>
 		<p>Lorem ipsum dolor sit ameph, …</p>
+		<a rel="nofollow" href="https://social.example.org/users/lain">lain’s account</a>
 	</article>
 	</body>
 </html>
--- a/test/web/rel_me_test.exs
+++ b/test/web/rel_me_test.exs
@@ -9,6 +9,12 @@ defmodule Pleroma.Web.RelMeTest do
      } ->
        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor.html")}

+      %{
+        method: :get,
+        url: "http://example.com/rel_me/anchor_nofollow"
+      } ->
+        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor_nofollow.html")}
+
      %{
        method: :get,
        url: "http://example.com/rel_me/link"
@@ -33,6 +39,7 @@ test "parse/1" do

    assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/link") == {:ok, hrefs}
    assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor") == {:ok, hrefs}
+    assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor_nofollow") == {:ok, hrefs}
  end

  test "maybe_put_rel_me/2" do
@@ -49,6 +56,11 @@ test "maybe_put_rel_me/2" do
    assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/anchor", profile_urls) ==
             attr

+    assert Pleroma.Web.RelMe.maybe_put_rel_me(
+             "http://example.com/rel_me/anchor_nofollow",
+             profile_urls
+           ) == attr
+
    assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/link", profile_urls) ==
             attr
  end