diff options
| author | lain <lain@soykaf.club> | 2020-11-10 09:34:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-10 09:34:13 +0000 |
| commit | 4a3d1e78f678773b9aba0c25bdb584d7d61f1ff0 (patch) | |
| tree | 2ec30536f5d2c0285572fd10b46f076dc7f8248b /lib | |
| parent | db07b538a511b315a3638f3d0b1abfb4877d10c9 (diff) | |
| parent | 0c68b9ac137e98867cf8aacfef1f264412cc7b3e (diff) | |
| download | pleroma-4a3d1e78f678773b9aba0c25bdb584d7d61f1ff0.tar.gz pleroma-4a3d1e78f678773b9aba0c25bdb584d7d61f1ff0.zip | |
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/feed/feed_view.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/templates/feed/feed/_activity.atom.eex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/templates/feed/feed/_activity.rss.eex | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex index 1ae03e7e2..56c024617 100644 --- a/lib/pleroma/web/feed/feed_view.ex +++ b/lib/pleroma/web/feed/feed_view.ex @@ -83,7 +83,7 @@ defmodule Pleroma.Web.Feed.FeedView do def activity_content(_), do: "" - def activity_context(activity), do: activity.data["context"] + def activity_context(activity), do: escape(activity.data["context"]) def attachment_href(attachment) do attachment["url"] diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex index 78350f2aa..3fd150c4e 100644 --- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex +++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex @@ -12,7 +12,7 @@ <link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/> <%= if @data["summary"] do %> - <summary><%= @data["summary"] %></summary> + <summary><%= escape(@data["summary"]) %></summary> <% end %> <%= if @activity.local do %> diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex index a304a16af..42960de7d 100644 --- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex +++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex @@ -12,7 +12,7 @@ <link rel="ostatus:conversation"><%= activity_context(@activity) %></link> <%= if @data["summary"] do %> - <description><%= @data["summary"] %></description> + <description><%= escape(@data["summary"]) %></description> <% end %> <%= if @activity.local do %> |