diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-27 20:36:31 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-27 20:36:31 -0500 |
| commit | f688c8df82b955b50552b3198ddc153a716451c2 (patch) | |
| tree | f7235592a050ca8b43b484cab238e486ee2e58fd /lib | |
| parent | f43518eb7433a6c50d635d6536c3fbe3a37ea82b (diff) | |
| download | pleroma-f688c8df82b955b50552b3198ddc153a716451c2.tar.gz pleroma-f688c8df82b955b50552b3198ddc153a716451c2.zip | |
Fix User.registration_reason HTML sanitizing issues
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emails/admin_email.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex index fae7faf00..c27ad1065 100644 --- a/lib/pleroma/emails/admin_email.ex +++ b/lib/pleroma/emails/admin_email.ex @@ -8,6 +8,7 @@ defmodule Pleroma.Emails.AdminEmail do import Swoosh.Email alias Pleroma.Config + alias Pleroma.HTML alias Pleroma.Web.Router.Helpers defp instance_config, do: Config.get(:instance) @@ -86,7 +87,7 @@ defmodule Pleroma.Emails.AdminEmail do def new_unapproved_registration(to, account) do html_body = """ <p>New account for review: <a href="#{user_url(account)}">@#{account.nickname}</a></p> - <blockquote>#{account.registration_reason}</blockquote> + <blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote> <a href="#{Pleroma.Web.base_url()}/pleroma/admin">Visit AdminFE</a> """ diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 424a705dd..2294d9d0d 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -7,7 +7,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.Emails.Mailer alias Pleroma.Emails.UserEmail - alias Pleroma.HTML alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken @@ -20,7 +19,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do |> Map.put(:nickname, params[:username]) |> Map.put(:name, Map.get(params, :fullname, params[:username])) |> Map.put(:password_confirmation, params[:password]) - |> Map.put(:registration_reason, HTML.strip_tags(params[:reason])) + |> Map.put(:registration_reason, params[:reason]) if Pleroma.Config.get([:instance, :registrations_open]) do create_user(params, opts) |