Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch external_url method to constrain set of valid uris #1000

Merged
merged 3 commits into from
Dec 7, 2023
Merged

Patch external_url method to constrain set of valid uris #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a9c098
Failing test.
rkachowski Dec 7, 2023
83daba8
Fix test.
rkachowski Dec 7, 2023
0f5c53d
Update translations (idk).
rkachowski Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../block_scout_web/lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="d-flex flex-row justify-content-start text-muted">
<%= if external_url(@token_instance.instance) do %>
<span class="mr-4">
<a data-test="external_url" href=<%=external_url(@token_instance.instance) %> target="_blank">
<a data-test="external_url" href=<%= external_url(@token_instance.instance) %> target="_blank">
View In App <span class="external-token-icon"><%= render BlockScoutWeb.IconsView, "_external_link.html" %></span>
</a>
</span>
Expand Down
6 changes: 5 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/views/tokens/instance/overview_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ defmodule BlockScoutWeb.Tokens.Instance.OverviewView do

def external_url(nil), do: nil

def external_url("http" <> _rest = external_url), do: external_url

def external_url(string) when is_binary(string), do: external_url(nil)

def external_url(instance) do
result =
if instance.metadata && instance.metadata["external_url"] do
instance.metadata["external_url"]
instance.metadata["external_url"] |> external_url()
else
external_url(nil)
end
Expand Down
4 changes: 2 additions & 2 deletions apps/block_scout_web/priv/gettext/default.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@ msgstr ""

#: lib/block_scout_web/templates/tokens/instance/metadata/index.html.eex:18
#: lib/block_scout_web/templates/tokens/instance/overview/_tabs.html.eex:10
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:198
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:202
#, elixir-autogen, elixir-format
msgid "Metadata"
msgstr ""
Expand Down Expand Up @@ -2659,7 +2659,7 @@ msgstr ""
#: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
#: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
#: lib/block_scout_web/views/address_view.ex:434
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:197
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:201
#: lib/block_scout_web/views/tokens/overview_view.ex:39
#: lib/block_scout_web/views/transaction_view.ex:526
#, elixir-autogen, elixir-format
Expand Down
4 changes: 2 additions & 2 deletions apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@ msgstr ""

#: lib/block_scout_web/templates/tokens/instance/metadata/index.html.eex:18
#: lib/block_scout_web/templates/tokens/instance/overview/_tabs.html.eex:10
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:198
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:202
#, elixir-autogen, elixir-format
msgid "Metadata"
msgstr ""
Expand Down Expand Up @@ -2659,7 +2659,7 @@ msgstr ""
#: lib/block_scout_web/templates/transaction/_tabs.html.eex:4
#: lib/block_scout_web/templates/transaction_token_transfer/index.html.eex:7
#: lib/block_scout_web/views/address_view.ex:434
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:197
#: lib/block_scout_web/views/tokens/instance/overview_view.ex:201
#: lib/block_scout_web/views/tokens/overview_view.ex:39
#: lib/block_scout_web/views/transaction_view.ex:526
#, elixir-autogen, elixir-format
Expand Down
36 changes: 36 additions & 0 deletions apps/block_scout_web/test/block_scout_web/views/tokens/instance/overview_view_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,40 @@ defmodule BlockScoutWeb.Tokens.Instance.OverviewViewTest do
"https://assets.cargo.build/611a883b0d039100261bfe79/b89cf189-13e9-47ed-b801-a1f6aa15a7bf/a0784ea0-45be-41cd-9cdd-cc40ad20f20d-zombiepngpng.png"
end
end

describe "external_url/1" do
test "does not return invalid url scheme" do
json = """
{
"name": "CELO XSS",
"image": "https://0-a.nl/nft/nft.jpg",
"description": "CELO XSS",
"external_url": "javascript:eval(atob('YWxlcnQoIndoYXRzdXAgaXQncyB5YSBib3l5Iik'))"
}
"""

data = Jason.decode!(json)

result = OverviewView.external_url(%{metadata: data})

assert result == nil, "non http url schemes should be stripped from external_url and treated as missing"
end

test "Returns valid uri scheme" do
json = """
{
"name": "CELO NFT test",
"image": "https://0-a.nl/nft/nft.jpg",
"description": "CELO NFT test",
"external_url": "https://happyland.nft"
}
"""

data = Jason.decode!(json)

result = OverviewView.external_url(%{metadata: data})

assert String.starts_with?(result, "http"), "Valid url should be returned"
end
end
end
Loading