From 35a6edd6de3806a7af66e870ca6054d159bd7250 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 23 Sep 2020 13:16:41 +0300 Subject: [PATCH 1/2] Restricted list of addresses --- CHANGELOG.md | 1 + apps/block_scout_web/config/config.exs | 4 +- .../channels/address_channel.ex | 9 +-- .../address_coin_balance_by_day_controller.ex | 9 ++- .../address_coin_balance_controller.ex | 16 +++-- .../address_contract_controller.ex | 9 ++- .../controllers/address_controller.ex | 4 +- .../address_decompiled_contract_controller.ex | 9 ++- ...address_internal_transaction_controller.ex | 14 ++++- .../controllers/address_logs_controller.ex | 10 +-- .../address_read_contract_controller.ex | 6 +- .../address_read_proxy_controller.ex | 6 +- .../address_token_balance_controller.ex | 6 +- .../controllers/address_token_controller.ex | 16 +++-- .../address_token_transfer_controller.ex | 28 +++++++-- .../address_transaction_controller.ex | 14 ++++- .../address_validation_controller.ex | 16 +++-- .../address_write_contract_controller.ex | 6 +- .../address_write_proxy_controller.ex | 6 +- .../controllers/tokens/holder_controller.ex | 15 ++++- .../tokens/inventory_controller.ex | 15 ++++- .../tokens/read_contract_controller.ex | 9 ++- .../controllers/tokens/token_controller.ex | 3 +- .../controllers/tokens/transfer_controller.ex | 15 ++++- .../controllers/transaction_controller.ex | 13 ++-- ...saction_internal_transaction_controller.ex | 53 +++++++++++----- .../controllers/transaction_log_controller.ex | 24 ++++++-- .../transaction_raw_trace_controller.ex | 14 ++++- .../transaction_token_transfer_controller.ex | 61 ++++++++++++++----- .../templates/address/_balance_card.html.eex | 2 +- .../templates/address/_tabs.html.eex | 26 ++++---- .../address_coin_balance/index.html.eex | 2 +- .../index.html.eex | 16 +---- .../address_token_transfer/index.html.eex | 16 +---- .../address_transaction/index.html.eex | 16 +---- .../tokens/overview/_details.html.eex | 2 +- .../templates/tokens/overview/_tabs.html.eex | 8 +-- .../templates/transaction/_tabs.html.eex | 8 +-- .../block_scout_web/views/access_helpers.ex | 58 ++++++++++++++++++ .../views/address_coin_balance_view.ex | 1 + .../address_internal_transaction_view.ex | 2 + .../views/address_token_transfer_view.ex | 2 + .../views/address_transaction_view.ex | 1 + .../lib/block_scout_web/views/address_view.ex | 2 +- .../views/tokens/overview_view.ex | 2 +- .../transaction_internal_transaction_view.ex | 1 + .../block_scout_web/views/transaction_view.ex | 2 +- apps/block_scout_web/priv/gettext/default.pot | 38 ++++++------ .../priv/gettext/en/LC_MESSAGES/default.po | 38 ++++++------ 49 files changed, 446 insertions(+), 208 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/views/access_helpers.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index fb6148b775..cbb80b9473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3311](https://github.com/poanetwork/blockscout/pull/3311) - List of addresses with restricted access option - [#3293](https://github.com/poanetwork/blockscout/pull/3293) - Composite market cap for xDai: TokenBridge + OmniBridge - [#3282](https://github.com/poanetwork/blockscout/pull/3282) - Import bridged tokens custom metadata - [#3281](https://github.com/poanetwork/blockscout/pull/3281) - Write contract: display currently connected address diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index 34289b2cb6..f5d6feb38a 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -37,7 +37,9 @@ config :block_scout_web, external_apps: System.get_env("EXTERNAL_APPS"), multi_token_bridge_mediator: System.get_env("MULTI_TOKEN_BRIDGE_MEDIATOR"), foreign_json_rpc: System.get_env("FOREIGN_JSON_RPC"), - gas_price: System.get_env("GAS_PRICE", nil) + gas_price: System.get_env("GAS_PRICE", nil), + restricted_list: System.get_env("RESTRICTED_LIST", nil), + restricted_list_key: System.get_env("RESTRICTED_LIST_KEY", nil) config :block_scout_web, BlockScoutWeb.Counters.BlocksIndexedCounter, enabled: true diff --git a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex index cdadd54143..88b51ae7a1 100644 --- a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex +++ b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex @@ -39,7 +39,7 @@ defmodule BlockScoutWeb.AddressChannel do {:ok, address = %{fetched_coin_balance: balance}} when not is_nil(balance) <- Chain.hash_to_address(casted_address_hash), exchange_rate <- Market.get_exchange_rate(Explorer.coin()) || Token.null(), - {:ok, rendered} <- render_balance_card(address, exchange_rate, socket.assigns.locale) do + {:ok, rendered} <- render_balance_card(address, exchange_rate, socket) do reply = {:ok, %{ @@ -60,7 +60,7 @@ defmodule BlockScoutWeb.AddressChannel do %{address: address, exchange_rate: exchange_rate}, socket ) do - case render_balance_card(address, exchange_rate, socket.assigns.locale) do + case render_balance_card(address, exchange_rate, socket) do {:ok, rendered} -> push(socket, "balance", %{ balance_card: rendered, @@ -190,14 +190,15 @@ defmodule BlockScoutWeb.AddressChannel do {:noreply, socket} end - defp render_balance_card(address, exchange_rate, locale) do - Gettext.put_locale(BlockScoutWeb.Gettext, locale) + defp render_balance_card(address, exchange_rate, socket) do + Gettext.put_locale(BlockScoutWeb.Gettext, socket.assigns.locale) try do rendered = View.render_to_string( AddressView, "_balance_card.html", + conn: socket, address: address, coin_balance_status: :current, exchange_rate: exchange_rate diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_by_day_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_by_day_controller.ex index b440fc7d9f..030f80a88d 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_by_day_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_by_day_controller.ex @@ -5,10 +5,12 @@ defmodule BlockScoutWeb.AddressCoinBalanceByDayController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.Chain - def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"}) do - with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string) do + def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do + with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do balances_by_day = address_hash |> Chain.address_to_balances_by_day() @@ -17,6 +19,9 @@ defmodule BlockScoutWeb.AddressCoinBalanceByDayController do end) json(conn, balances_by_day) + else + _ -> + not_found(conn) end end end diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex index 538f8fd7f4..8c90d51ada 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex @@ -7,7 +7,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.AddressCoinBalanceView + alias BlockScoutWeb.{AccessHelpers, AddressCoinBalanceView} alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token @@ -16,7 +16,8 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - :ok <- Chain.check_address_exists(address_hash) do + :ok <- Chain.check_address_exists(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do full_options = paging_options(params) coin_balances_plus_one = Chain.address_to_coin_balances(address_hash, full_options) @@ -49,6 +50,9 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do json(conn, %{items: coin_balances_json, next_page_path: next_page_url}) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -57,9 +61,10 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do end end - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render(conn, "index.html", address: address, coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address), @@ -68,6 +73,9 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex index fcc01d9de0..ab4b8e63de 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex @@ -2,11 +2,12 @@ defmodule BlockScoutWeb.AddressContractController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do address_options = [ necessity_by_association: %{ :contracts_creation_internal_transaction => :optional, @@ -18,7 +19,8 @@ defmodule BlockScoutWeb.AddressContractController do ] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true) do + {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -28,6 +30,9 @@ defmodule BlockScoutWeb.AddressContractController do counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex index 212ee668e5..62587223ac 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.AddressController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.AddressView + alias BlockScoutWeb.{AccessHelpers, AddressView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Phoenix.View @@ -67,7 +67,7 @@ defmodule BlockScoutWeb.AddressController do end def show(conn, %{"id" => id}) do - redirect(conn, to: address_transaction_path(conn, :index, id)) + redirect(conn, to: AccessHelpers.get_path(conn, :address_transaction_path, :index, id)) end def address_counters(conn, %{"id" => address_hash_string}) do diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex index 2a62020a4f..079d5d9093 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_decompiled_contract_controller.ex @@ -1,13 +1,15 @@ defmodule BlockScoutWeb.AddressDecompiledContractController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.find_decompiled_contract_address(address_hash) do + {:ok, address} <- Chain.find_decompiled_contract_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -17,6 +19,9 @@ defmodule BlockScoutWeb.AddressDecompiledContractController do counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex index 76e5518705..509a83d98b 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_internal_transaction_controller.ex @@ -7,7 +7,7 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do import BlockScoutWeb.Chain, only: [current_filter: 1, paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.InternalTransactionView + alias BlockScoutWeb.{AccessHelpers, InternalTransactionView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand @@ -15,7 +15,8 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash, [], false) do + {:ok, address} <- Chain.hash_to_address(address_hash, [], false), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do full_options = [ necessity_by_association: %{ @@ -51,6 +52,9 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do json(conn, %{items: internal_transactions_json, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) @@ -61,7 +65,8 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -73,6 +78,9 @@ defmodule BlockScoutWeb.AddressInternalTransactionController do counters_path: address_path(conn, :address_counters, %{"id" => address_hash_string}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex index 2d0c7f342b..51cdf785c3 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex @@ -5,7 +5,7 @@ defmodule BlockScoutWeb.AddressLogsController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.AddressLogsView + alias BlockScoutWeb.{AccessHelpers, AddressLogsView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand @@ -15,7 +15,8 @@ defmodule BlockScoutWeb.AddressLogsController do def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - :ok <- Chain.check_address_exists(address_hash) do + :ok <- Chain.check_address_exists(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do logs_plus_one = Chain.address_to_logs(address_hash, paging_options(params)) {results, next_page} = split_list_by_page(logs_plus_one) @@ -52,9 +53,10 @@ defmodule BlockScoutWeb.AddressLogsController do end end - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex index 4523fbb068..4734b8f0f3 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex @@ -8,12 +8,13 @@ defmodule BlockScoutWeb.AddressReadContractController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do address_options = [ necessity_by_association: %{ :contracts_creation_internal_transaction => :optional, @@ -26,7 +27,8 @@ defmodule BlockScoutWeb.AddressReadContractController do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), - false <- is_nil(address.smart_contract) do + false <- is_nil(address.smart_contract), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex index 2429a8a04e..7ed05ef4b4 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex @@ -2,12 +2,13 @@ defmodule BlockScoutWeb.AddressReadProxyController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do address_options = [ necessity_by_association: %{ :contracts_creation_internal_transaction => :optional, @@ -20,7 +21,8 @@ defmodule BlockScoutWeb.AddressReadProxyController do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), - false <- is_nil(address.smart_contract) do + false <- is_nil(address.smart_contract), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex index 817a39d1c0..9a0e4809e9 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex @@ -1,11 +1,13 @@ defmodule BlockScoutWeb.AddressTokenBalanceController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do with true <- ajax?(conn), - {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string) do + {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do token_balances = address_hash |> Chain.fetch_last_token_balances() diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex index b7a445f67b..226130ed1d 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_controller.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.AddressTokenController do import BlockScoutWeb.Chain, only: [next_page_params: 3, paging_options: 1, split_list_by_page: 1] - alias BlockScoutWeb.AddressTokenView + alias BlockScoutWeb.{AccessHelpers, AddressTokenView} alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token @@ -12,7 +12,8 @@ defmodule BlockScoutWeb.AddressTokenController do def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash, [], false) do + {:ok, address} <- Chain.hash_to_address(address_hash, [], false), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do tokens_plus_one = Chain.address_tokens_with_balance(address_hash, paging_options(params)) {tokens, next_page} = split_list_by_page(tokens_plus_one) @@ -46,6 +47,9 @@ defmodule BlockScoutWeb.AddressTokenController do } ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -54,9 +58,10 @@ defmodule BlockScoutWeb.AddressTokenController do end end - def index(conn, %{"address_id" => address_hash_string} = _params) do + def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -67,6 +72,9 @@ defmodule BlockScoutWeb.AddressTokenController do counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex index 4af79088b0..d0449fd53e 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_transfer_controller.ex @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressTokenTransferController do use BlockScoutWeb, :controller - alias BlockScoutWeb.TransactionView + alias BlockScoutWeb.{AccessHelpers, TransactionView} alias Explorer.ExchangeRates.Token alias Explorer.{Chain, Market} alias Explorer.Chain.Address @@ -38,7 +38,8 @@ defmodule BlockScoutWeb.AddressTokenTransferController do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, token_hash} <- Chain.string_to_address_hash(token_hash_string), {:ok, address} <- Chain.hash_to_address(address_hash), - {:ok, _} <- Chain.token_from_address_hash(token_hash) do + {:ok, _} <- Chain.token_from_address_hash(token_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do transactions = Chain.address_to_transactions_with_token_transfers( address_hash, @@ -77,6 +78,9 @@ defmodule BlockScoutWeb.AddressTokenTransferController do json(conn, %{items: transfers_json, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -87,12 +91,13 @@ defmodule BlockScoutWeb.AddressTokenTransferController do def index( conn, - %{"address_id" => address_hash_string, "address_token_id" => token_hash_string} + %{"address_id" => address_hash_string, "address_token_id" => token_hash_string} = params ) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, token_hash} <- Chain.string_to_address_hash(token_hash_string), {:ok, address} <- Chain.hash_to_address(address_hash), - {:ok, token} <- Chain.token_from_address_hash(token_hash) do + {:ok, token} <- Chain.token_from_address_hash(token_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -104,6 +109,9 @@ defmodule BlockScoutWeb.AddressTokenTransferController do counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -120,7 +128,8 @@ defmodule BlockScoutWeb.AddressTokenTransferController do } = params ) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do options = @transaction_necessity_by_association |> Keyword.merge(paging_options(params)) @@ -162,6 +171,9 @@ defmodule BlockScoutWeb.AddressTokenTransferController do json(conn, %{items: transfers_json, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -175,7 +187,8 @@ defmodule BlockScoutWeb.AddressTokenTransferController do %{"address_id" => address_hash_string} = params ) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -187,6 +200,9 @@ defmodule BlockScoutWeb.AddressTokenTransferController do counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex index f4ede21255..f35d3b508b 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex @@ -7,7 +7,7 @@ defmodule BlockScoutWeb.AddressTransactionController do import BlockScoutWeb.Chain, only: [current_filter: 1, paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.TransactionView + alias BlockScoutWeb.{AccessHelpers, TransactionView} alias Explorer.{Chain, Market} alias Explorer.Chain.{AddressTokenTransferCsvExporter, AddressTransactionCsvExporter} alias Explorer.ExchangeRates.Token @@ -30,7 +30,8 @@ defmodule BlockScoutWeb.AddressTransactionController do address_options = [necessity_by_association: %{:names => :optional}] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash, address_options, false) do + {:ok, address} <- Chain.hash_to_address(address_hash, address_options, false), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do options = @transaction_necessity_by_association |> Keyword.merge(paging_options(params)) @@ -82,6 +83,9 @@ defmodule BlockScoutWeb.AddressTransactionController do :error -> unprocessable_entity(conn) + {:restricted_access, _} -> + not_found(conn) + {:error, :not_found} -> case Chain.Hash.Address.validate(address_hash_string) do {:ok, _} -> @@ -95,7 +99,8 @@ defmodule BlockScoutWeb.AddressTransactionController do def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.hash_to_address(address_hash) do + {:ok, address} <- Chain.hash_to_address(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -110,6 +115,9 @@ defmodule BlockScoutWeb.AddressTransactionController do :error -> unprocessable_entity(conn) + {:restricted_access, _} -> + not_found(conn) + {:error, :not_found} -> {:ok, address_hash} = Chain.string_to_address_hash(address_hash_string) address = %Chain.Address{hash: address_hash, smart_contract: nil, token: nil} diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex index 3074471ddf..cf4a5742da 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_validation_controller.ex @@ -7,7 +7,7 @@ defmodule BlockScoutWeb.AddressValidationController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.BlockView + alias BlockScoutWeb.{AccessHelpers, BlockView} alias Explorer.ExchangeRates.Token alias Explorer.{Chain, Market} alias Indexer.Fetcher.CoinBalanceOnDemand @@ -15,7 +15,8 @@ defmodule BlockScoutWeb.AddressValidationController do def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, _} <- Chain.find_or_insert_address_from_hash(address_hash, [], false) do + {:ok, _} <- Chain.find_or_insert_address_from_hash(address_hash, [], false), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do full_options = Keyword.merge( [ @@ -59,14 +60,18 @@ defmodule BlockScoutWeb.AddressValidationController do json(conn, %{items: items, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) end end - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, address} <- Chain.find_or_insert_address_from_hash(address_hash) do + {:ok, address} <- Chain.find_or_insert_address_from_hash(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -77,6 +82,9 @@ defmodule BlockScoutWeb.AddressValidationController do exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null() ) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex index c066914f46..f3b50dd4a2 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_contract_controller.ex @@ -8,12 +8,13 @@ defmodule BlockScoutWeb.AddressWriteContractController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do address_options = [ necessity_by_association: %{ :contracts_creation_internal_transaction => :optional, @@ -26,7 +27,8 @@ defmodule BlockScoutWeb.AddressWriteContractController do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), - false <- is_nil(address.smart_contract) do + false <- is_nil(address.smart_contract), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex index 1e558f7bbb..e82fc17c29 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_write_proxy_controller.ex @@ -2,12 +2,13 @@ defmodule BlockScoutWeb.AddressWriteProxyController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.Chain.Address alias Explorer.ExchangeRates.Token alias Indexer.Fetcher.CoinBalanceOnDemand - def index(conn, %{"address_id" => address_hash_string}) do + def index(conn, %{"address_id" => address_hash_string} = params) do address_options = [ necessity_by_association: %{ :contracts_creation_internal_transaction => :optional, @@ -20,7 +21,8 @@ defmodule BlockScoutWeb.AddressWriteProxyController do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), - false <- is_nil(address.smart_contract) do + false <- is_nil(address.smart_contract), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/holder_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/holder_controller.ex index 078aac9e56..e12d14cb77 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/holder_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/holder_controller.ex @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.Tokens.HolderController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias BlockScoutWeb.Tokens.HolderView alias Explorer.{Chain, Market} alias Explorer.Chain.Address @@ -16,7 +17,8 @@ defmodule BlockScoutWeb.Tokens.HolderController do def index(conn, %{"token_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, token} <- Chain.token_from_address_hash(address_hash), - token_balances <- Chain.fetch_token_holders_from_token_hash(address_hash, paging_options(params)) do + token_balances <- Chain.fetch_token_holders_from_token_hash(address_hash, paging_options(params)), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do {token_balances_paginated, next_page} = split_list_by_page(token_balances) next_page_path = @@ -35,6 +37,9 @@ defmodule BlockScoutWeb.Tokens.HolderController do json(conn, %{items: token_balances_json, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) @@ -43,11 +48,12 @@ defmodule BlockScoutWeb.Tokens.HolderController do end end - def index(conn, %{"token_id" => address_hash_string}) do + def index(conn, %{"token_id" => address_hash_string} = params) do options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, token} <- Chain.token_from_address_hash(address_hash, options) do + {:ok, token} <- Chain.token_from_address_hash(address_hash, options), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -56,6 +62,9 @@ defmodule BlockScoutWeb.Tokens.HolderController do counters_path: token_path(conn, :token_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex index f257334a07..41f562554b 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/inventory_controller.ex @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.Tokens.InventoryController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias BlockScoutWeb.Tokens.InventoryView alias Explorer.{Chain, Market} alias Explorer.Chain.{Address, TokenTransfer} @@ -10,7 +11,8 @@ defmodule BlockScoutWeb.Tokens.InventoryController do def index(conn, %{"token_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, token} <- Chain.token_from_address_hash(address_hash) do + {:ok, token} <- Chain.token_from_address_hash(address_hash), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do unique_tokens = Chain.address_to_unique_tokens( token.contract_address_hash, @@ -53,6 +55,9 @@ defmodule BlockScoutWeb.Tokens.InventoryController do } ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) @@ -61,11 +66,12 @@ defmodule BlockScoutWeb.Tokens.InventoryController do end end - def index(conn, %{"token_id" => address_hash_string}) do + def index(conn, %{"token_id" => address_hash_string} = params) do options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, token} <- Chain.token_from_address_hash(address_hash, options) do + {:ok, token} <- Chain.token_from_address_hash(address_hash, options), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -74,6 +80,9 @@ defmodule BlockScoutWeb.Tokens.InventoryController do counters_path: token_path(conn, :token_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/read_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/read_contract_controller.ex index 96b0cfe23b..9f76a59aff 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/read_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/read_contract_controller.ex @@ -1,15 +1,17 @@ defmodule BlockScoutWeb.Tokens.ReadContractController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias Explorer.{Chain, Market} alias Explorer.Chain.Address - def index(conn, %{"token_id" => address_hash_string}) do + def index(conn, %{"token_id" => address_hash_string} = params) do options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), :ok <- Chain.check_verified_smart_contract_exists(address_hash), - {:ok, token} <- Chain.token_from_address_hash(address_hash, options) do + {:ok, token} <- Chain.token_from_address_hash(address_hash, options), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -19,6 +21,9 @@ defmodule BlockScoutWeb.Tokens.ReadContractController do counters_path: token_path(conn, :token_counters, %{"id" => Address.checksum(address_hash)}) ) else + {:restricted_access, _} -> + not_found(conn) + :not_found -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/token_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/token_controller.ex index fb5891d07f..71e66676ab 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/token_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/token_controller.ex @@ -3,10 +3,11 @@ defmodule BlockScoutWeb.Tokens.TokenController do require Logger + alias BlockScoutWeb.AccessHelpers alias Explorer.Chain def show(conn, %{"id" => address_hash_string}) do - redirect(conn, to: token_transfer_path(conn, :index, address_hash_string)) + redirect(conn, to: AccessHelpers.get_path(conn, :token_transfer_path, :index, address_hash_string)) end def token_counters(conn, %{"id" => address_hash_string}) do diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex index fd3579efbd..afc879c212 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/transfer_controller.ex @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.Tokens.TransferController do use BlockScoutWeb, :controller + alias BlockScoutWeb.AccessHelpers alias BlockScoutWeb.Tokens.TransferView alias Explorer.{Chain, Market} alias Explorer.Chain.Address @@ -15,7 +16,8 @@ defmodule BlockScoutWeb.Tokens.TransferController do def index(conn, %{"token_id" => address_hash_string, "type" => "JSON"} = params) do with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, token} <- Chain.token_from_address_hash(address_hash), - token_transfers <- Chain.fetch_token_transfers_from_token_hash(address_hash, paging_options(params)) do + token_transfers <- Chain.fetch_token_transfers_from_token_hash(address_hash, paging_options(params)), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do {token_transfers_paginated, next_page} = split_list_by_page(token_transfers) next_page_path = @@ -46,6 +48,9 @@ defmodule BlockScoutWeb.Tokens.TransferController do json(conn, %{items: transfers_json, next_page_path: next_page_path}) else + {:restricted_access, _} -> + not_found(conn) + :error -> unprocessable_entity(conn) @@ -54,11 +59,12 @@ defmodule BlockScoutWeb.Tokens.TransferController do end end - def index(conn, %{"token_id" => address_hash_string}) do + def index(conn, %{"token_id" => address_hash_string} = params) do options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, token} <- Chain.token_from_address_hash(address_hash, options) do + {:ok, token} <- Chain.token_from_address_hash(address_hash, options), + {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do render( conn, "index.html", @@ -68,6 +74,9 @@ defmodule BlockScoutWeb.Tokens.TransferController do token_total_supply_status: TokenTotalSupplyOnDemand.trigger_fetch(address_hash) ) else + {:restricted_access, _} -> + not_found(conn) + :error -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex index 9643a356bd..37c4b2127f 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.TransactionController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.TransactionView + alias BlockScoutWeb.{AccessHelpers, TransactionView} alias Explorer.Chain alias Phoenix.View @@ -69,13 +69,16 @@ defmodule BlockScoutWeb.TransactionController do with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(id), :ok <- Chain.check_transaction_exists(transaction_hash) do if Chain.transaction_has_token_transfers?(transaction_hash) do - redirect(conn, to: transaction_token_transfer_path(conn, :index, id)) + redirect(conn, to: AccessHelpers.get_path(conn, :transaction_token_transfer_path, :index, id)) else - redirect(conn, to: transaction_internal_transaction_path(conn, :index, id)) + redirect(conn, to: AccessHelpers.get_path(conn, :transaction_internal_transaction_path, :index, id)) end else - :error -> conn |> put_status(422) |> render("invalid.html", transaction_hash: id) - :not_found -> conn |> put_status(404) |> render("not_found.html", transaction_hash: id) + :error -> + conn |> put_status(422) |> render("invalid.html", transaction_hash: id) + + :not_found -> + conn |> put_status(404) |> render("not_found.html", transaction_hash: id) end end end diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex index ca154a0136..2e2601f23a 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex @@ -3,14 +3,17 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.{InternalTransactionView, TransactionView} + alias BlockScoutWeb.{AccessHelpers, InternalTransactionView, TransactionView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Phoenix.View - def index(conn, %{"transaction_id" => hash_string, "type" => "JSON"} = params) do - with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string), - :ok <- Chain.check_transaction_exists(hash) do + def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do + with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string), + :ok <- Chain.check_transaction_exists(transaction_hash), + {:ok, transaction} <- Chain.hash_to_transaction(transaction_hash, []), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do full_options = Keyword.merge( [ @@ -24,7 +27,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do paging_options(params) ) - internal_transactions_plus_one = Chain.transaction_to_internal_transactions(hash, full_options) + internal_transactions_plus_one = Chain.transaction_to_internal_transactions(transaction_hash, full_options) {internal_transactions, next_page} = split_list_by_page(internal_transactions_plus_one) @@ -37,7 +40,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do transaction_internal_transaction_path( conn, :index, - hash, + transaction_hash, Map.delete(next_page_params, "type") ) end @@ -60,25 +63,37 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do } ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) |> put_view(TransactionView) - |> render("invalid.html", transaction_hash: hash_string) + |> render("invalid.html", transaction_hash: transaction_hash_string) + + {:error, :not_found} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) :not_found -> conn |> put_status(404) |> put_view(TransactionView) - |> render("not_found.html", transaction_hash: hash_string) + |> render("not_found.html", transaction_hash: transaction_hash_string) end end - def index(conn, %{"transaction_id" => hash_string}) do - with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string), + def index(conn, %{"transaction_id" => transaction_hash_string} = params) do + with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string), {:ok, transaction} <- Chain.hash_to_transaction( - hash, + transaction_hash, necessity_by_association: %{ :block => :optional, [created_contract_address: :names] => :optional, @@ -87,28 +102,36 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do [to_address: :smart_contract] => :optional, :token_transfers => :optional } - ) do + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do render( conn, "index.html", exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(), current_path: current_path(conn), block_height: Chain.block_height(), - show_token_transfers: Chain.transaction_has_token_transfers?(hash), + show_token_transfers: Chain.transaction_has_token_transfers?(transaction_hash), transaction: transaction ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) |> put_view(TransactionView) - |> render("invalid.html", transaction_hash: hash_string) + |> render("invalid.html", transaction_hash: transaction_hash_string) {:error, :not_found} -> conn |> put_status(404) |> put_view(TransactionView) - |> render("not_found.html", transaction_hash: hash_string) + |> render("not_found.html", transaction_hash: transaction_hash_string) end end end diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex index e076b9ee7b..5fec4bfda4 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.TransactionLogController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.{TransactionLogView, TransactionView} + alias BlockScoutWeb.{AccessHelpers, TransactionLogView, TransactionView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Phoenix.View @@ -13,7 +13,9 @@ defmodule BlockScoutWeb.TransactionLogController do {:ok, transaction} <- Chain.hash_to_transaction(transaction_hash, necessity_by_association: %{[to_address: :smart_contract] => :optional} - ) do + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do full_options = Keyword.merge( [ @@ -57,6 +59,12 @@ defmodule BlockScoutWeb.TransactionLogController do } ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) @@ -71,7 +79,7 @@ defmodule BlockScoutWeb.TransactionLogController do end end - def index(conn, %{"transaction_id" => transaction_hash_string}) do + def index(conn, %{"transaction_id" => transaction_hash_string} = params) do with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string), {:ok, transaction} <- Chain.hash_to_transaction( @@ -84,7 +92,9 @@ defmodule BlockScoutWeb.TransactionLogController do [to_address: :smart_contract] => :optional, :token_transfers => :optional } - ) do + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do render( conn, "index.html", @@ -95,6 +105,12 @@ defmodule BlockScoutWeb.TransactionLogController do exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null() ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex index 82f189e9b3..cbf36743b0 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex @@ -1,14 +1,14 @@ defmodule BlockScoutWeb.TransactionRawTraceController do use BlockScoutWeb, :controller - alias BlockScoutWeb.TransactionView + alias BlockScoutWeb.{AccessHelpers, TransactionView} alias EthereumJSONRPC alias Explorer.{Chain, Market} alias Explorer.Chain.Import alias Explorer.Chain.Import.Runner.InternalTransactions alias Explorer.ExchangeRates.Token - def index(conn, %{"transaction_id" => hash_string}) do + def index(conn, %{"transaction_id" => hash_string} = params) do with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string), {:ok, transaction} <- Chain.hash_to_transaction( @@ -21,7 +21,9 @@ defmodule BlockScoutWeb.TransactionRawTraceController do [to_address: :smart_contract] => :optional, :token_transfers => :optional } - ) do + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do internal_transactions = Chain.all_transaction_to_internal_transactions(hash) first_trace_exists = @@ -76,6 +78,12 @@ defmodule BlockScoutWeb.TransactionRawTraceController do transaction: transaction ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: hash_string) + :error -> conn |> put_status(422) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex index afb2fa373e..827e8866aa 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] - alias BlockScoutWeb.{TransactionTokenTransferView, TransactionView} + alias BlockScoutWeb.{AccessHelpers, TransactionTokenTransferView, TransactionView} alias Explorer.{Chain, Market} alias Explorer.ExchangeRates.Token alias Phoenix.View @@ -11,9 +11,16 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000") @burn_address_hash burn_address_hash - def index(conn, %{"transaction_id" => hash_string, "type" => "JSON"} = params) do - with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string), - :ok <- Chain.check_transaction_exists(hash) do + def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do + with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string), + :ok <- Chain.check_transaction_exists(transaction_hash), + {:ok, transaction} <- + Chain.hash_to_transaction( + transaction_hash, + [] + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do full_options = Keyword.merge( [ @@ -26,7 +33,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do paging_options(params) ) - token_transfers_plus_one = Chain.transaction_to_token_transfers(hash, full_options) + token_transfers_plus_one = Chain.transaction_to_token_transfers(transaction_hash, full_options) {token_transfers, next_page} = split_list_by_page(token_transfers_plus_one) @@ -36,7 +43,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do nil next_page_params -> - transaction_token_transfer_path(conn, :index, hash, Map.delete(next_page_params, "type")) + transaction_token_transfer_path(conn, :index, transaction_hash, Map.delete(next_page_params, "type")) end items = @@ -59,25 +66,37 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do } ) else + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) |> put_view(TransactionView) - |> render("invalid.html", transaction_hash: hash_string) + |> render("invalid.html", transaction_hash: transaction_hash_string) + + {:error, :not_found} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) :not_found -> conn |> put_status(404) |> put_view(TransactionView) - |> render("not_found.html", transaction_hash: hash_string) + |> render("not_found.html", transaction_hash: transaction_hash_string) end end - def index(conn, %{"transaction_id" => hash_string}) do - with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string), + def index(conn, %{"transaction_id" => transaction_hash_string} = params) do + with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string), {:ok, transaction} <- Chain.hash_to_transaction( - hash, + transaction_hash, necessity_by_association: %{ :block => :optional, [created_contract_address: :names] => :optional, @@ -86,7 +105,9 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do [to_address: :smart_contract] => :optional, :token_transfers => :optional } - ) do + ), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.from_address_hash), params), + {:ok, false} <- AccessHelpers.restricted_access?(to_string(transaction.to_address_hash), params) do render( conn, "index.html", @@ -97,17 +118,29 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do transaction: transaction ) else + :not_found -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) + :error -> conn |> put_status(422) |> put_view(TransactionView) - |> render("invalid.html", transaction_hash: hash_string) + |> render("invalid.html", transaction_hash: transaction_hash_string) {:error, :not_found} -> conn |> put_status(404) |> put_view(TransactionView) - |> render("not_found.html", transaction_hash: hash_string) + |> render("not_found.html", transaction_hash: transaction_hash_string) + + {:restricted_access, _} -> + conn + |> put_status(404) + |> put_view(TransactionView) + |> render("not_found.html", transaction_hash: transaction_hash_string) end end end diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex index 08da882238..c8140fb812 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex @@ -19,7 +19,7 @@

<%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex index be0b86685f..c7cd85e21a 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex @@ -25,29 +25,19 @@
<%= link( gettext("All"), - to: address_internal_transaction_path(@conn, :index, @address.hash), + to: AccessHelpers.get_path(@conn, :address_internal_transaction_path, :index, @address.hash), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("To"), - to: address_internal_transaction_path( - @conn, - :index, - @address.hash, - filter: "to" - ), + to: AccessHelpers.get_path(@conn, :address_internal_transaction_path, :index, @address.hash, %{:filter => "to"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("From"), - to: address_internal_transaction_path( - @conn, - :index, - @address.hash, - filter: "from" - ), + to: AccessHelpers.get_path(@conn, :address_internal_transaction_path, :index, @address.hash, %{:filter => "from"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex index 209288253a..bf8099123b 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex @@ -23,29 +23,19 @@
<%= link( gettext("All"), - to: address_token_transfers_path(@conn, :index, to_string(@address.hash)), + to: AccessHelpers.get_path(@conn, :address_token_transfers_path, :index, to_string(@address.hash)), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("To"), - to: address_token_transfers_path( - @conn, - :index, - to_string(@address.hash), - filter: "to" - ), + to: AccessHelpers.get_path(@conn, :address_token_transfers_path, :index, to_string(@address.hash), %{:filter => "to"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("From"), - to: address_token_transfers_path( - @conn, - :index, - to_string(@address.hash), - filter: "from" - ), + to: AccessHelpers.get_path(@conn, :address_token_transfers_path, :index, to_string(@address.hash), %{:filter => "from"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex index 418b8eff2b..5d45a773dc 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex @@ -21,29 +21,19 @@
<%= link( gettext("All"), - to: address_transaction_path(@conn, :index, @address.hash), + to: AccessHelpers.get_path(@conn, :address_transaction_path, :index, @address.hash), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("To"), - to: address_transaction_path( - @conn, - :index, - @address.hash, - filter: "to" - ), + to: AccessHelpers.get_path(@conn, :address_transaction_path, :index, @address.hash, %{:filter => "to"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> <%= link( gettext("From"), - to: address_transaction_path( - @conn, - :index, - @address.hash, - filter: "from" - ), + to: AccessHelpers.get_path(@conn, :address_transaction_path, :index, @address.hash, %{:filter => "from"}), class: "address__link address__link--active dropdown-item", "data-test": "filter_option" ) %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex index 5e0fbe962c..3402a90ce0 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex @@ -65,7 +65,7 @@
<%= link to: - address_path(@conn, :show, Address.checksum(@token.contract_address_hash)), + AccessHelpers.get_path(@conn, :address_path, :show, Address.checksum(@token.contract_address_hash)), "data-test": "token_contract_address" do %> <%= gettext "View Contract" %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex index 444a1a2acf..c520145f9c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_tabs.html.eex @@ -2,28 +2,28 @@ <%= link( gettext("Token Transfers"), class: "card-tab #{tab_status("token-transfers", @conn.request_path)}", - to: token_path(@conn, :show, @token.contract_address_hash) + to: AccessHelpers.get_path(@conn, :token_path, :show, @token.contract_address_hash) ) %> <%= link( gettext("Token Holders"), class: "card-tab #{tab_status("token-holders", @conn.request_path)}", "data-test": "token_holders_tab", - to: token_holder_path(@conn, :index, Address.checksum(@token.contract_address_hash)) + to: AccessHelpers.get_path(@conn, :token_holder_path, :index, Address.checksum(@token.contract_address_hash)) ) %> <%= if display_inventory?(@token) do %> <%= link( gettext("Inventory"), class: "card-tab #{tab_status("inventory", @conn.request_path)}", - to: token_inventory_path(@conn, :index, Address.checksum(@token.contract_address_hash)) + to: AccessHelpers.get_path(@conn, :token_inventory_path, :index, Address.checksum(@token.contract_address_hash)) ) %> <% end %> <%= if smart_contract_with_read_only_functions?(@token) do %> <%= link( gettext("Read Contract"), - to: token_read_contract_path(@conn, :index, Address.checksum(@token.contract_address_hash)), + to: AccessHelpers.get_path(@conn, :token_read_contract_path, :index, Address.checksum(@token.contract_address_hash)), class: "card-tab #{tab_status("read-contract", @conn.request_path)}") %> <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex index 6aa66e18d5..4d4e2bbfe3 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tabs.html.eex @@ -3,26 +3,26 @@ <%= link( gettext("Token Transfers"), class: "card-tab #{tab_status("token-transfers", @conn.request_path)}", - to: transaction_token_transfer_path(@conn, :index, @transaction) + to: AccessHelpers.get_path(@conn, :transaction_token_transfer_path, :index, @transaction) ) %> <% end %> <%= link( gettext("Internal Transactions"), class: "card-tab #{tab_status("internal-transactions", @conn.request_path)}", - to: transaction_internal_transaction_path(@conn, :index, @transaction) + to: AccessHelpers.get_path(@conn, :transaction_internal_transaction_path, :index, @transaction) ) %> <%= link( gettext("Logs"), class: "card-tab #{tab_status("logs", @conn.request_path)}", - to: transaction_log_path(@conn, :index, @transaction), + to: AccessHelpers.get_path(@conn, :transaction_log_path, :index, @transaction), "data-test": "transaction_logs_link" ) %> <%= link( gettext("Raw Trace"), class: "card-tab #{tab_status("raw-trace", @conn.request_path)}", - to: transaction_raw_trace_path(@conn, :index, @transaction) + to: AccessHelpers.get_path(@conn, :transaction_raw_trace_path, :index, @transaction) ) %>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/access_helpers.ex b/apps/block_scout_web/lib/block_scout_web/views/access_helpers.ex new file mode 100644 index 0000000000..06d4a2fd0e --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/access_helpers.ex @@ -0,0 +1,58 @@ +defmodule BlockScoutWeb.AccessHelpers do + @moduledoc """ + Helpers to restrict access to some pages filtering by address + """ + + alias BlockScoutWeb.WebRouter.Helpers + alias Plug.Conn + + defp get_restricted_key(%Phoenix.Socket{}) do + nil + end + + defp get_restricted_key(conn) do + conn_with_params = Conn.fetch_query_params(conn) + conn_with_params.query_params["key"] + end + + def restricted_access?(address_hash, params) do + formatted_address_hash = String.downcase(address_hash) + key = if params && Map.has_key?(params, "key"), do: Map.get(params, "key"), else: nil + + restricted_list_var = Application.get_env(:block_scout_web, :restricted_list) + restricted_list = (restricted_list_var && String.split(restricted_list_var, ",")) || [] + + formatted_restricted_list = + restricted_list + |> Enum.map(fn addr -> + String.downcase(addr) + end) + + address_restricted = + formatted_restricted_list + |> Enum.member?(formatted_address_hash) + + correct_key = key && key == Application.get_env(:block_scout_web, :restricted_list_key) + + if address_restricted && !correct_key, do: {:restricted_access, true}, else: {:ok, false} + end + + def get_path(conn, path, template, address_hash) do + basic_args = [conn, template, address_hash] + key = get_restricted_key(conn) + # credo:disable-for-next-line + full_args = if key, do: basic_args ++ [%{:key => key}], else: basic_args + + apply(Helpers, path, full_args) + end + + def get_path(conn, path, template, address_hash, additional_params) do + basic_args = [conn, template, address_hash] + key = get_restricted_key(conn) + full_additional_params = if key, do: Map.put(additional_params, :key, key), else: additional_params + # credo:disable-for-next-line + full_args = basic_args ++ [full_additional_params] + + apply(Helpers, path, full_args) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_coin_balance_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_coin_balance_view.ex index 944aee3eb1..0551d94036 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_coin_balance_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_coin_balance_view.ex @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceView do use BlockScoutWeb, :view + alias BlockScoutWeb.AccessHelpers alias Explorer.Chain.Wei def format(%Wei{} = value) do diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_internal_transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_internal_transaction_view.ex index f242cb2753..7ce8667b6d 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_internal_transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_internal_transaction_view.ex @@ -1,6 +1,8 @@ defmodule BlockScoutWeb.AddressInternalTransactionView do use BlockScoutWeb, :view + alias BlockScoutWeb.AccessHelpers + def format_current_filter(filter) do case filter do "to" -> gettext("To") diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_token_transfer_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_token_transfer_view.ex index 523d2fecca..965feca80f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_token_transfer_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_token_transfer_view.ex @@ -1,6 +1,8 @@ defmodule BlockScoutWeb.AddressTokenTransferView do use BlockScoutWeb, :view + alias BlockScoutWeb.AccessHelpers + def format_current_filter(filter) do case filter do "to" -> gettext("To") diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_transaction_view.ex index 7b9aa98a61..64ba591cec 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_transaction_view.ex @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.AddressTransactionView do use BlockScoutWeb, :view + alias BlockScoutWeb.AccessHelpers alias Explorer.Chain.Address def format_current_filter(filter) do diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex index 9076b62907..91eeef3cb5 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.AddressView do require Logger - alias BlockScoutWeb.LayoutView + alias BlockScoutWeb.{AccessHelpers, LayoutView} alias Explorer.Chain alias Explorer.Chain.{Address, Hash, InternalTransaction, SmartContract, Token, TokenTransfer, Transaction, Wei} alias Explorer.Chain.Block.Reward diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex index 9130f9bf87..4ef916711f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.Tokens.OverviewView do alias Explorer.Chain.{Address, SmartContract, Token} - alias BlockScoutWeb.{CurrencyHelpers, LayoutView} + alias BlockScoutWeb.{AccessHelpers, CurrencyHelpers, LayoutView} @tabs ["token-transfers", "token-holders", "read-contract", "inventory"] @etherscan_token_link "https://etherscan.io/token/" diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex index 74ff6042cc..e2f83de578 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex @@ -1,4 +1,5 @@ defmodule BlockScoutWeb.TransactionInternalTransactionView do use BlockScoutWeb, :view + @dialyzer :no_match end diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex index 98c0750df9..4691235980 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.TransactionView do use BlockScoutWeb, :view - alias BlockScoutWeb.{AddressView, BlockView, TabHelpers} + alias BlockScoutWeb.{AccessHelpers, AddressView, BlockView, TabHelpers} alias BlockScoutWeb.Cldr.Number alias Explorer.{Chain, Repo} alias Explorer.Chain.Block.Reward diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 23826451bc..1a34d1811a 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -139,9 +139,9 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:23 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 #: lib/block_scout_web/templates/layout/_topnav.html.eex:88 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:8 -#: lib/block_scout_web/views/address_token_transfer_view.ex:8 -#: lib/block_scout_web/views/address_transaction_view.ex:10 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:10 +#: lib/block_scout_web/views/address_token_transfer_view.ex:10 +#: lib/block_scout_web/views/address_transaction_view.ex:11 msgid "All" msgstr "" @@ -252,7 +252,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_token/index.html.eex:28 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:74 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:64 msgid "CSV" msgstr "" @@ -703,12 +703,12 @@ msgid "Forked Blocks (Reorgs)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:44 -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:42 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:40 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:7 -#: lib/block_scout_web/views/address_token_transfer_view.ex:7 -#: lib/block_scout_web/views/address_transaction_view.ex:9 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:39 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:37 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:35 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:9 +#: lib/block_scout_web/views/address_token_transfer_view.ex:9 +#: lib/block_scout_web/views/address_transaction_view.ex:10 msgid "From" msgstr "" @@ -801,7 +801,7 @@ msgid "There are no holders for this Token." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:65 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:55 msgid "There are no internal transactions for this address." msgstr "" @@ -817,7 +817,7 @@ msgid "There are no logs for this transaction." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:60 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:50 msgid "There are no token transfers for this address." msgstr "" @@ -832,7 +832,7 @@ msgid "There are no tokens." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_transaction/index.html.eex:64 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:54 msgid "There are no transactions for this address." msgstr "" @@ -856,9 +856,9 @@ msgstr "" #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:33 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:31 #: lib/block_scout_web/templates/address_transaction/index.html.eex:29 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:6 -#: lib/block_scout_web/views/address_token_transfer_view.ex:6 -#: lib/block_scout_web/views/address_transaction_view.ex:8 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:8 +#: lib/block_scout_web/views/address_token_transfer_view.ex:8 +#: lib/block_scout_web/views/address_transaction_view.ex:9 msgid "To" msgstr "" @@ -1302,11 +1302,11 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_coin_balance/index.html.eex:36 -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:61 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:51 #: lib/block_scout_web/templates/address_logs/index.html.eex:21 #: lib/block_scout_web/templates/address_token/index.html.eex:13 -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:65 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:59 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:55 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:49 #: lib/block_scout_web/templates/address_validation/index.html.eex:22 #: lib/block_scout_web/templates/block_transaction/index.html.eex:23 #: lib/block_scout_web/templates/chain/show.html.eex:154 diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 23826451bc..1a34d1811a 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -139,9 +139,9 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:23 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 #: lib/block_scout_web/templates/layout/_topnav.html.eex:88 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:8 -#: lib/block_scout_web/views/address_token_transfer_view.ex:8 -#: lib/block_scout_web/views/address_transaction_view.ex:10 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:10 +#: lib/block_scout_web/views/address_token_transfer_view.ex:10 +#: lib/block_scout_web/views/address_transaction_view.ex:11 msgid "All" msgstr "" @@ -252,7 +252,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_token/index.html.eex:28 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:74 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:64 msgid "CSV" msgstr "" @@ -703,12 +703,12 @@ msgid "Forked Blocks (Reorgs)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:44 -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:42 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:40 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:7 -#: lib/block_scout_web/views/address_token_transfer_view.ex:7 -#: lib/block_scout_web/views/address_transaction_view.ex:9 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:39 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:37 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:35 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:9 +#: lib/block_scout_web/views/address_token_transfer_view.ex:9 +#: lib/block_scout_web/views/address_transaction_view.ex:10 msgid "From" msgstr "" @@ -801,7 +801,7 @@ msgid "There are no holders for this Token." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:65 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:55 msgid "There are no internal transactions for this address." msgstr "" @@ -817,7 +817,7 @@ msgid "There are no logs for this transaction." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:60 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:50 msgid "There are no token transfers for this address." msgstr "" @@ -832,7 +832,7 @@ msgid "There are no tokens." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_transaction/index.html.eex:64 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:54 msgid "There are no transactions for this address." msgstr "" @@ -856,9 +856,9 @@ msgstr "" #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:33 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:31 #: lib/block_scout_web/templates/address_transaction/index.html.eex:29 -#: lib/block_scout_web/views/address_internal_transaction_view.ex:6 -#: lib/block_scout_web/views/address_token_transfer_view.ex:6 -#: lib/block_scout_web/views/address_transaction_view.ex:8 +#: lib/block_scout_web/views/address_internal_transaction_view.ex:8 +#: lib/block_scout_web/views/address_token_transfer_view.ex:8 +#: lib/block_scout_web/views/address_transaction_view.ex:9 msgid "To" msgstr "" @@ -1302,11 +1302,11 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_coin_balance/index.html.eex:36 -#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:61 +#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:51 #: lib/block_scout_web/templates/address_logs/index.html.eex:21 #: lib/block_scout_web/templates/address_token/index.html.eex:13 -#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:65 -#: lib/block_scout_web/templates/address_transaction/index.html.eex:59 +#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:55 +#: lib/block_scout_web/templates/address_transaction/index.html.eex:49 #: lib/block_scout_web/templates/address_validation/index.html.eex:22 #: lib/block_scout_web/templates/block_transaction/index.html.eex:23 #: lib/block_scout_web/templates/chain/show.html.eex:154 From 54ce4a9e3bfa5065a8e12619ff0a8306a4683bcc Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 24 Sep 2020 19:06:00 +0300 Subject: [PATCH 2/2] token balances display fix --- .../address_token_balance_controller.ex | 20 +++++++++++++------ .../transaction_internal_transaction_view.ex | 1 - 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex index 9a0e4809e9..548b92b20d 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_token_balance_controller.ex @@ -6,17 +6,25 @@ defmodule BlockScoutWeb.AddressTokenBalanceController do def index(conn, %{"address_id" => address_hash_string} = params) do with true <- ajax?(conn), - {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), - {:ok, false} <- AccessHelpers.restricted_access?(address_hash_string, params) do + {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string) do token_balances = address_hash |> Chain.fetch_last_token_balances() |> Market.add_price() - conn - |> put_status(200) - |> put_layout(false) - |> render("_token_balances.html", token_balances: token_balances) + case AccessHelpers.restricted_access?(address_hash_string, params) do + {:ok, false} -> + conn + |> put_status(200) + |> put_layout(false) + |> render("_token_balances.html", token_balances: token_balances) + + _ -> + conn + |> put_status(200) + |> put_layout(false) + |> render("_token_balances.html", token_balances: []) + end else _ -> not_found(conn) diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex index e2f83de578..74ff6042cc 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_internal_transaction_view.ex @@ -1,5 +1,4 @@ defmodule BlockScoutWeb.TransactionInternalTransactionView do use BlockScoutWeb, :view - @dialyzer :no_match end