No OneTemporary
Actions

Authored By

Unknown

Size

16 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.credo.exs b/.credo.exs
	index 8a1cc1c9c..94e19c4b5 100644
	--- a/.credo.exs
	+++ b/.credo.exs
	@@ -1,138 +1,139 @@
	# This file contains the configuration for Credo and you are probably reading
	# this after creating it with `mix credo.gen.config`.
	#
	# If you find anything wrong or unclear in this file, please report an
	# issue on GitHub: https://github.com/rrrene/credo/issues
	#
	%{
	#
	# You can have as many configs as you like in the `configs:` field.
	configs: [
	%{
	#
	# Run any config using `mix credo -C <name>`. If no config name is given
	# "default" is used.
	name: "default",
	#
	# These are the files included in the analysis:
	files: %{
	#
	# You can give explicit globs or simply directories.
	# In the latter case `*/.{ex,exs}` will be used.
	included: ["lib/", "src/", "web/", "apps/"],
	excluded: [~r"/_build/", ~r"/deps/"]
	},
	#
	# If you create your own checks, you must specify the source files for
	# them here, so they can be loaded by Credo before running the analysis.
	requires: [],
	#
	# Credo automatically checks for updates, like e.g. Hex does.
	# You can disable this behaviour below:
	check_for_updates: true,
	#
	# If you want to enforce a style guide and need a more traditional linting
	# experience, you can change `strict` to `true` below:
	strict: false,
	#
	# If you want to use uncolored output by default, you can change `color`
	# to `false` below:
	color: true,
	#
	# You can customize the parameters of any check by adding a second element
	# to the tuple.
	#
	# To disable a check put `false` as second element:
	#
	# {Credo.Check.Design.DuplicatedCode, false}
	#
	checks: [
	{Credo.Check.Consistency.ExceptionNames},
	{Credo.Check.Consistency.LineEndings},
	{Credo.Check.Consistency.MultiAliasImportRequireUse},
	{Credo.Check.Consistency.ParameterPatternMatching},
	{Credo.Check.Consistency.SpaceAroundOperators},
	{Credo.Check.Consistency.SpaceInParentheses},
	{Credo.Check.Consistency.TabsOrSpaces},

	# For some checks, like AliasUsage, you can only customize the priority
	# Priority values are: `low, normal, high, higher`
	{Credo.Check.Design.AliasUsage, priority: :low, if_called_more_often_than: 3},

	# For others you can set parameters

	# If you don't want the `setup` and `test` macro calls in ExUnit tests
	# or the `schema` macro in Ecto schemas to trigger DuplicatedCode, just
	# set the `excluded_macros` parameter to `[:schema, :setup, :test]`.
	{Credo.Check.Design.DuplicatedCode, excluded_macros: []},

	# You can also customize the exit_status of each check.
	# If you don't want TODO comments to cause `mix credo` to fail, just
	# set this value to 0 (zero).
	{Credo.Check.Design.TagTODO, exit_status: 2},
	{Credo.Check.Design.TagFIXME},

	{Credo.Check.Readability.FunctionNames},
	{Credo.Check.Readability.LargeNumbers},
	{Credo.Check.Readability.MaxLineLength, priority: :low, max_length: 100},
	{Credo.Check.Readability.ModuleAttributeNames},
	{Credo.Check.Readability.ModuleDoc, false},
	{Credo.Check.Readability.ModuleNames},
	{Credo.Check.Readability.ParenthesesOnZeroArityDefs},
	{Credo.Check.Readability.ParenthesesInCondition},
	{Credo.Check.Readability.PredicateFunctionNames},
	{Credo.Check.Readability.PreferImplicitTry},
	{Credo.Check.Readability.RedundantBlankLines},
	{Credo.Check.Readability.StringSigils},
	{Credo.Check.Readability.TrailingBlankLine},
	{Credo.Check.Readability.TrailingWhiteSpace},
	{Credo.Check.Readability.VariableNames},
	{Credo.Check.Readability.Semicolons},
	{Credo.Check.Readability.SpaceAfterCommas},

	{Credo.Check.Refactor.DoubleBooleanNegation},
	{Credo.Check.Refactor.CondStatements},
	{Credo.Check.Refactor.CyclomaticComplexity},
	{Credo.Check.Refactor.FunctionArity},
	{Credo.Check.Refactor.MatchInCondition},
	{Credo.Check.Refactor.NegatedConditionsInUnless},
	{Credo.Check.Refactor.NegatedConditionsWithElse},
	{Credo.Check.Refactor.Nesting},
	{Credo.Check.Refactor.PipeChainStart},
	{Credo.Check.Refactor.UnlessWithElse},

	{Credo.Check.Warning.BoolOperationOnSameValues},
	{Credo.Check.Warning.IExPry},
	{Credo.Check.Warning.IoInspect},
	- {Credo.Check.Warning.LazyLogging},
	+ # Got too much of them, not sure if relevant
	+ {Credo.Check.Warning.LazyLogging, false},
	{Credo.Check.Warning.OperationOnSameValues},
	{Credo.Check.Warning.OperationWithConstantResult},
	{Credo.Check.Warning.UnusedEnumOperation},
	{Credo.Check.Warning.UnusedFileOperation},
	{Credo.Check.Warning.UnusedKeywordOperation},
	{Credo.Check.Warning.UnusedListOperation},
	{Credo.Check.Warning.UnusedPathOperation},
	{Credo.Check.Warning.UnusedRegexOperation},
	{Credo.Check.Warning.UnusedStringOperation},
	{Credo.Check.Warning.UnusedTupleOperation},

	# Controversial and experimental checks (opt-in, just remove `, false`)
	#
	{Credo.Check.Refactor.ABCSize, false},
	{Credo.Check.Refactor.AppendSingleItem, false},
	{Credo.Check.Refactor.VariableRebinding, false},
	{Credo.Check.Warning.MapGetUnsafePass, false},

	# Deprecated checks (these will be deleted after a grace period)
	{Credo.Check.Readability.Specs, false},
	{Credo.Check.Warning.NameRedeclarationByAssignment, false},
	{Credo.Check.Warning.NameRedeclarationByCase, false},
	{Credo.Check.Warning.NameRedeclarationByDef, false},
	{Credo.Check.Warning.NameRedeclarationByFn, false},

	# Custom checks can be created using `mix credo.gen.check`.
	#
	]
	}
	]
	}
	diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
	index 0fd41ffb8..291b0e612 100644
	--- a/lib/pleroma/html.ex
	+++ b/lib/pleroma/html.ex
	@@ -1,234 +1,231 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.HTML do
	alias HtmlSanitizeEx.Scrubber

	defp get_scrubbers(scrubber) when is_atom(scrubber), do: [scrubber]
	defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers
	defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default]

	def get_scrubbers() do
	Pleroma.Config.get([:markup, :scrub_policy])
	\|> get_scrubbers
	end

	def filter_tags(html, nil) do
	filter_tags(html, get_scrubbers())
	end

	def filter_tags(html, scrubbers) when is_list(scrubbers) do
	Enum.reduce(scrubbers, html, fn scrubber, html ->
	filter_tags(html, scrubber)
	end)
	end

	def filter_tags(html, scrubber), do: Scrubber.scrub(html, scrubber)
	def filter_tags(html), do: filter_tags(html, nil)
	def strip_tags(html), do: Scrubber.scrub(html, Scrubber.StripTags)

	def get_cached_scrubbed_html_for_object(content, scrubbers, object, module) do
	key = "#{module}#{generate_scrubber_signature(scrubbers)}\|#{object.id}"
	Cachex.fetch!(:scrubber_cache, key, fn _key -> ensure_scrubbed_html(content, scrubbers) end)
	end

	def get_cached_stripped_html_for_object(content, object, module) do
	get_cached_scrubbed_html_for_object(
	content,
	HtmlSanitizeEx.Scrubber.StripTags,
	object,
	module
	)
	end

	def ensure_scrubbed_html(
	content,
	scrubbers
	) do
	{:commit, filter_tags(content, scrubbers)}
	end

	defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
	generate_scrubber_signature([scrubber])
	end

	defp generate_scrubber_signature(scrubbers) do
	Enum.reduce(scrubbers, "", fn scrubber, signature ->
	"#{signature}#{to_string(scrubber)}"
	end)
	end

	def extract_first_external_url(_, nil), do: {:error, "No content"}

	def extract_first_external_url(object, content) do
	key = "URL\|#{object.id}"

	Cachex.fetch!(:scrubber_cache, key, fn _key ->
	result =
	content
	\|> Floki.filter_out("a.mention")
	\|> Floki.attribute("a", "href")
	\|> Enum.at(0)

	{:commit, {:ok, result}}
	end)
	end
	end

	defmodule Pleroma.HTML.Scrubber.TwitterText do
	@moduledoc """
	An HTML scrubbing policy which limits to twitter-style text. Only
	paragraphs, breaks and links are allowed through the filter.
	"""

	@markup Application.get_env(:pleroma, :markup)
	- @uri_schemes Application.get_env(:pleroma, :uri_schemes, [])
	- @valid_schemes Keyword.get(@uri_schemes, :valid_schemes, [])
	+ @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])

	require HtmlSanitizeEx.Scrubber.Meta
	alias HtmlSanitizeEx.Scrubber.Meta

	Meta.remove_cdata_sections_before_scrub()
	Meta.strip_comments()

	# links
	Meta.allow_tag_with_uri_attributes("a", ["href", "data-user", "data-tag"], @valid_schemes)
	Meta.allow_tag_with_these_attributes("a", ["name", "title", "class"])

	# paragraphs and linebreaks
	Meta.allow_tag_with_these_attributes("br", [])
	Meta.allow_tag_with_these_attributes("p", [])

	# microformats
	Meta.allow_tag_with_these_attributes("span", ["class"])

	# allow inline images for custom emoji
	@allow_inline_images Keyword.get(@markup, :allow_inline_images)

	if @allow_inline_images do
	# restrict img tags to http/https only, because of MediaProxy.
	Meta.allow_tag_with_uri_attributes("img", ["src"], ["http", "https"])

	Meta.allow_tag_with_these_attributes("img", [
	"width",
	"height",
	"title",
	"alt"
	])
	end

	Meta.strip_everything_not_covered()
	end

	defmodule Pleroma.HTML.Scrubber.Default do
	@doc "The default HTML scrubbing policy: no "

	require HtmlSanitizeEx.Scrubber.Meta
	-
	alias HtmlSanitizeEx.Scrubber.Meta

	@markup Application.get_env(:pleroma, :markup)
	- @uri_schemes Application.get_env(:pleroma, :uri_schemes, [])
	- @valid_schemes Keyword.get(@uri_schemes, :valid_schemes, [])
	+ @valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])

	Meta.remove_cdata_sections_before_scrub()
	Meta.strip_comments()

	Meta.allow_tag_with_uri_attributes("a", ["href", "data-user", "data-tag"], @valid_schemes)
	Meta.allow_tag_with_these_attributes("a", ["name", "title", "class"])

	Meta.allow_tag_with_these_attributes("abbr", ["title"])

	Meta.allow_tag_with_these_attributes("b", [])
	Meta.allow_tag_with_these_attributes("blockquote", [])
	Meta.allow_tag_with_these_attributes("br", [])
	Meta.allow_tag_with_these_attributes("code", [])
	Meta.allow_tag_with_these_attributes("del", [])
	Meta.allow_tag_with_these_attributes("em", [])
	Meta.allow_tag_with_these_attributes("i", [])
	Meta.allow_tag_with_these_attributes("li", [])
	Meta.allow_tag_with_these_attributes("ol", [])
	Meta.allow_tag_with_these_attributes("p", [])
	Meta.allow_tag_with_these_attributes("pre", [])
	Meta.allow_tag_with_these_attributes("span", ["class"])
	Meta.allow_tag_with_these_attributes("strong", [])
	Meta.allow_tag_with_these_attributes("u", [])
	Meta.allow_tag_with_these_attributes("ul", [])

	@allow_inline_images Keyword.get(@markup, :allow_inline_images)

	if @allow_inline_images do
	# restrict img tags to http/https only, because of MediaProxy.
	Meta.allow_tag_with_uri_attributes("img", ["src"], ["http", "https"])

	Meta.allow_tag_with_these_attributes("img", [
	"width",
	"height",
	"title",
	"alt"
	])
	end

	@allow_tables Keyword.get(@markup, :allow_tables)

	if @allow_tables do
	Meta.allow_tag_with_these_attributes("table", [])
	Meta.allow_tag_with_these_attributes("tbody", [])
	Meta.allow_tag_with_these_attributes("td", [])
	Meta.allow_tag_with_these_attributes("th", [])
	Meta.allow_tag_with_these_attributes("thead", [])
	Meta.allow_tag_with_these_attributes("tr", [])
	end

	@allow_headings Keyword.get(@markup, :allow_headings)

	if @allow_headings do
	Meta.allow_tag_with_these_attributes("h1", [])
	Meta.allow_tag_with_these_attributes("h2", [])
	Meta.allow_tag_with_these_attributes("h3", [])
	Meta.allow_tag_with_these_attributes("h4", [])
	Meta.allow_tag_with_these_attributes("h5", [])
	end

	@allow_fonts Keyword.get(@markup, :allow_fonts)

	if @allow_fonts do
	Meta.allow_tag_with_these_attributes("font", ["face"])
	end

	Meta.strip_everything_not_covered()
	end

	defmodule Pleroma.HTML.Transform.MediaProxy do
	@moduledoc "Transforms inline image URIs to use MediaProxy."

	alias Pleroma.Web.MediaProxy

	def before_scrub(html), do: html

	def scrub_attribute("img", {"src", "http" <> target}) do
	media_url =
	("http" <> target)
	\|> MediaProxy.url()

	{"src", media_url}
	end

	def scrub_attribute(_tag, attribute), do: attribute

	def scrub({"img", attributes, children}) do
	attributes =
	attributes
	\|> Enum.map(fn attr -> scrub_attribute("img", attr) end)
	\|> Enum.reject(&is_nil(&1))

	{"img", attributes, children}
	end

	def scrub({:comment, _children}), do: ""

	def scrub({tag, attributes, children}), do: {tag, attributes, children}
	def scrub({_tag, children}), do: children
	def scrub(text), do: text
	end
	diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
	index 30558e692..4d5fd028e 100644
	--- a/lib/pleroma/web/web.ex
	+++ b/lib/pleroma/web/web.ex
	@@ -1,96 +1,98 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web do
	@moduledoc """
	A module that keeps using definitions for controllers,
	views and so on.

	This can be used in your application as:

	use Pleroma.Web, :controller
	use Pleroma.Web, :view

	The definitions below will be executed for every view,
	controller, etc, so keep them short and clean, focused
	on imports, uses and aliases.

	Do NOT define functions inside the quoted expressions
	below.
	"""

	def controller do
	quote do
	use Phoenix.Controller, namespace: Pleroma.Web
	import Plug.Conn
	import Pleroma.Web.{Gettext, Router.Helpers}
	end
	end

	def view do
	quote do
	use Phoenix.View,
	root: "lib/pleroma/web/templates",
	namespace: Pleroma.Web

	# Import convenience functions from controllers
	import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1]

	import Pleroma.Web.{ErrorHelpers, Gettext, Router.Helpers}

	require Logger

	@doc "Same as `render/3` but wrapped in a rescue block"
	def safe_render(view, template, assigns \\ %{}) do
	Phoenix.View.render(view, template, assigns)
	rescue
	error ->
	Logger.error(
	"#{__MODULE__} failed to render #{inspect({view, template})}: #{inspect(error)}"
	)

	Logger.error(inspect(__STACKTRACE__))
	nil
	end

	@doc """
	Same as `render_many/4` but wrapped in rescue block.
	"""
	def safe_render_many(collection, view, template, assigns \\ %{}) do
	Enum.map(collection, fn resource ->
	as = Map.get(assigns, :as) \|\| view.__resource__
	assigns = Map.put(assigns, as, resource)
	safe_render(view, template, assigns)
	end)
	\|> Enum.filter(& &1)
	end
	end
	end

	def router do
	quote do
	use Phoenix.Router
	+ # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
	import Plug.Conn
	import Phoenix.Controller
	end
	end

	def channel do
	quote do
	+ # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
	use Phoenix.Channel
	import Pleroma.Web.Gettext
	end
	end

	@doc """
	When used, dispatch to the appropriate controller/view/etc.
	"""
	defmacro __using__(which) when is_atom(which) do
	apply(__MODULE__, which, [])
	end

	def base_url do
	Pleroma.Web.Endpoint.url()
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Sat, Oct 31, 12:44 PM (21 h, 12 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1801415
Default Alt Text: (16 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions