Skip to content

M
mybee
Commit e043c29e authored by Janoš Guljaš's avatar Janoš Guljaš Committed by GitHub
Browse files
Options

debug api as a concrete service (#1370)

parent 7da9e56e
Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 272 deletions
pkg/debugapi/balances.go
View file @ e043c29e
...@@ -31,12 +31,12 @@ type balancesResponse struct { ...@@ -31,12 +31,12 @@ type balancesResponse struct {
Balances []balanceResponse `json:"balances"` Balances []balanceResponse `json:"balances"`
} }
func (s *server) balancesHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) balancesHandler(w http.ResponseWriter, r *http.Request) {
balances, err := s.Accounting.Balances() balances, err := s.accounting.Balances()
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errCantBalances) jsonhttp.InternalServerError(w, errCantBalances)
s.Logger.Debugf("debug api: balances: %v", err) s.logger.Debugf("debug api: balances: %v", err)
s.Logger.Error("debug api: can not get balances") s.logger.Error("debug api: can not get balances")
return return
} }
...@@ -53,24 +53,24 @@ func (s *server) balancesHandler(w http.ResponseWriter, r *http.Request) { ...@@ -53,24 +53,24 @@ func (s *server) balancesHandler(w http.ResponseWriter, r *http.Request) {
jsonhttp.OK(w, balancesResponse{Balances: balResponses}) jsonhttp.OK(w, balancesResponse{Balances: balResponses})
} }
func (s *server) peerBalanceHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) peerBalanceHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: balances peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: balances peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: balances peer: invalid peer address %s", addr) s.logger.Errorf("debug api: balances peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
balance, err := s.Accounting.Balance(peer) balance, err := s.accounting.Balance(peer)
if err != nil { if err != nil {
if errors.Is(err, accounting.ErrPeerNoBalance) { if errors.Is(err, accounting.ErrPeerNoBalance) {
jsonhttp.NotFound(w, errNoBalance) jsonhttp.NotFound(w, errNoBalance)
return return
} }
s.Logger.Debugf("debug api: balances peer: get peer %s balance: %v", peer.String(), err) s.logger.Debugf("debug api: balances peer: get peer %s balance: %v", peer.String(), err)
s.Logger.Errorf("debug api: balances peer: can't get peer %s balance", peer.String()) s.logger.Errorf("debug api: balances peer: can't get peer %s balance", peer.String())
jsonhttp.InternalServerError(w, errCantBalance) jsonhttp.InternalServerError(w, errCantBalance)
return return
} }
...@@ -81,12 +81,12 @@ func (s *server) peerBalanceHandler(w http.ResponseWriter, r *http.Request) { ...@@ -81,12 +81,12 @@ func (s *server) peerBalanceHandler(w http.ResponseWriter, r *http.Request) {
}) })
} }
func (s *server) compensatedBalancesHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) compensatedBalancesHandler(w http.ResponseWriter, r *http.Request) {
balances, err := s.Accounting.CompensatedBalances() balances, err := s.accounting.CompensatedBalances()
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errCantBalances) jsonhttp.InternalServerError(w, errCantBalances)
s.Logger.Debugf("debug api: compensated balances: %v", err) s.logger.Debugf("debug api: compensated balances: %v", err)
s.Logger.Error("debug api: can not get compensated balances") s.logger.Error("debug api: can not get compensated balances")
return return
} }
...@@ -103,24 +103,24 @@ func (s *server) compensatedBalancesHandler(w http.ResponseWriter, r *http.Reque ...@@ -103,24 +103,24 @@ func (s *server) compensatedBalancesHandler(w http.ResponseWriter, r *http.Reque
jsonhttp.OK(w, balancesResponse{Balances: balResponses}) jsonhttp.OK(w, balancesResponse{Balances: balResponses})
} }
func (s *server) compensatedPeerBalanceHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) compensatedPeerBalanceHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: compensated balances peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: compensated balances peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: compensated balances peer: invalid peer address %s", addr) s.logger.Errorf("debug api: compensated balances peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
balance, err := s.Accounting.CompensatedBalance(peer) balance, err := s.accounting.CompensatedBalance(peer)
if err != nil { if err != nil {
if errors.Is(err, accounting.ErrPeerNoBalance) { if errors.Is(err, accounting.ErrPeerNoBalance) {
jsonhttp.NotFound(w, errNoBalance) jsonhttp.NotFound(w, errNoBalance)
return return
} }
s.Logger.Debugf("debug api: compensated balances peer: get peer %s balance: %v", peer.String(), err) s.logger.Debugf("debug api: compensated balances peer: get peer %s balance: %v", peer.String(), err)
s.Logger.Errorf("debug api: compensated balances peer: can't get peer %s balance", peer.String()) s.logger.Errorf("debug api: compensated balances peer: can't get peer %s balance", peer.String())
jsonhttp.InternalServerError(w, errCantBalance) jsonhttp.InternalServerError(w, errCantBalance)
return return
} }
......
pkg/debugapi/chequebook.go
View file @ e043c29e
...@@ -56,46 +56,46 @@ type chequebookLastChequesResponse struct { ...@@ -56,46 +56,46 @@ type chequebookLastChequesResponse struct {
LastCheques []chequebookLastChequesPeerResponse `json:"lastcheques"` LastCheques []chequebookLastChequesPeerResponse `json:"lastcheques"`
} }
func (s *server) chequebookBalanceHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookBalanceHandler(w http.ResponseWriter, r *http.Request) {
balance, err := s.Chequebook.Balance(r.Context()) balance, err := s.chequebook.Balance(r.Context())
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errChequebookBalance) jsonhttp.InternalServerError(w, errChequebookBalance)
s.Logger.Debugf("debug api: chequebook balance: %v", err) s.logger.Debugf("debug api: chequebook balance: %v", err)
s.Logger.Error("debug api: cannot get chequebook balance") s.logger.Error("debug api: cannot get chequebook balance")
return return
} }
availableBalance, err := s.Chequebook.AvailableBalance(r.Context()) availableBalance, err := s.chequebook.AvailableBalance(r.Context())
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errChequebookBalance) jsonhttp.InternalServerError(w, errChequebookBalance)
s.Logger.Debugf("debug api: chequebook availableBalance: %v", err) s.logger.Debugf("debug api: chequebook availableBalance: %v", err)
s.Logger.Error("debug api: cannot get chequebook availableBalance") s.logger.Error("debug api: cannot get chequebook availableBalance")
return return
} }
jsonhttp.OK(w, chequebookBalanceResponse{TotalBalance: balance, AvailableBalance: availableBalance}) jsonhttp.OK(w, chequebookBalanceResponse{TotalBalance: balance, AvailableBalance: availableBalance})
} }
func (s *server) chequebookAddressHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookAddressHandler(w http.ResponseWriter, r *http.Request) {
address := s.Chequebook.Address() address := s.chequebook.Address()
jsonhttp.OK(w, chequebookAddressResponse{Address: address.String()}) jsonhttp.OK(w, chequebookAddressResponse{Address: address.String()})
} }
func (s *server) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: chequebook cheque peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: chequebook cheque peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: chequebook cheque peer: invalid peer address %s", addr) s.logger.Errorf("debug api: chequebook cheque peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
var lastSentResponse *chequebookLastChequePeerResponse var lastSentResponse *chequebookLastChequePeerResponse
lastSent, err := s.Swap.LastSentCheque(peer) lastSent, err := s.swap.LastSentCheque(peer)
if err != nil && err != chequebook.ErrNoCheque { if err != nil && err != chequebook.ErrNoCheque {
s.Logger.Debugf("debug api: chequebook cheque peer: get peer %s last cheque: %v", peer.String(), err) s.logger.Debugf("debug api: chequebook cheque peer: get peer %s last cheque: %v", peer.String(), err)
s.Logger.Errorf("debug api: chequebook cheque peer: can't get peer %s last cheque", peer.String()) s.logger.Errorf("debug api: chequebook cheque peer: can't get peer %s last cheque", peer.String())
jsonhttp.InternalServerError(w, errCantLastChequePeer) jsonhttp.InternalServerError(w, errCantLastChequePeer)
return return
} }
...@@ -108,10 +108,10 @@ func (s *server) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reques ...@@ -108,10 +108,10 @@ func (s *server) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reques
} }
var lastReceivedResponse *chequebookLastChequePeerResponse var lastReceivedResponse *chequebookLastChequePeerResponse
lastReceived, err := s.Swap.LastReceivedCheque(peer) lastReceived, err := s.swap.LastReceivedCheque(peer)
if err != nil && err != chequebook.ErrNoCheque { if err != nil && err != chequebook.ErrNoCheque {
s.Logger.Debugf("debug api: chequebook cheque peer: get peer %s last cheque: %v", peer.String(), err) s.logger.Debugf("debug api: chequebook cheque peer: get peer %s last cheque: %v", peer.String(), err)
s.Logger.Errorf("debug api: chequebook cheque peer: can't get peer %s last cheque", peer.String()) s.logger.Errorf("debug api: chequebook cheque peer: can't get peer %s last cheque", peer.String())
jsonhttp.InternalServerError(w, errCantLastChequePeer) jsonhttp.InternalServerError(w, errCantLastChequePeer)
return return
} }
...@@ -130,18 +130,18 @@ func (s *server) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reques ...@@ -130,18 +130,18 @@ func (s *server) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reques
}) })
} }
func (s *server) chequebookAllLastHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookAllLastHandler(w http.ResponseWriter, r *http.Request) {
lastchequessent, err := s.Swap.LastSentCheques() lastchequessent, err := s.swap.LastSentCheques()
if err != nil { if err != nil {
s.Logger.Debugf("debug api: chequebook cheque all: get all last cheques: %v", err) s.logger.Debugf("debug api: chequebook cheque all: get all last cheques: %v", err)
s.Logger.Errorf("debug api: chequebook cheque all: can't get all last cheques") s.logger.Errorf("debug api: chequebook cheque all: can't get all last cheques")
jsonhttp.InternalServerError(w, errCantLastCheque) jsonhttp.InternalServerError(w, errCantLastCheque)
return return
} }
lastchequesreceived, err := s.Swap.LastReceivedCheques() lastchequesreceived, err := s.swap.LastReceivedCheques()
if err != nil { if err != nil {
s.Logger.Debugf("debug api: chequebook cheque all: get all last cheques: %v", err) s.logger.Debugf("debug api: chequebook cheque all: get all last cheques: %v", err)
s.Logger.Errorf("debug api: chequebook cheque all: can't get all last cheques") s.logger.Errorf("debug api: chequebook cheque all: can't get all last cheques")
jsonhttp.InternalServerError(w, errCantLastCheque) jsonhttp.InternalServerError(w, errCantLastCheque)
return return
} }
...@@ -194,20 +194,20 @@ type swapCashoutResponse struct { ...@@ -194,20 +194,20 @@ type swapCashoutResponse struct {
TransactionHash string `json:"transactionHash"` TransactionHash string `json:"transactionHash"`
} }
func (s *server) swapCashoutHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) swapCashoutHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: cashout peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: cashout peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: cashout peer: invalid peer address %s", addr) s.logger.Errorf("debug api: cashout peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
txHash, err := s.Swap.CashCheque(r.Context(), peer) txHash, err := s.swap.CashCheque(r.Context(), peer)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: cashout peer: cannot cash %s: %v", addr, err) s.logger.Debugf("debug api: cashout peer: cannot cash %s: %v", addr, err)
s.Logger.Errorf("debug api: cashout peer: cannot cash %s", addr) s.logger.Errorf("debug api: cashout peer: cannot cash %s", addr)
jsonhttp.InternalServerError(w, errCannotCash) jsonhttp.InternalServerError(w, errCannotCash)
return return
} }
...@@ -230,32 +230,32 @@ type swapCashoutStatusResponse struct { ...@@ -230,32 +230,32 @@ type swapCashoutStatusResponse struct {
Result *swapCashoutStatusResult `json:"result"` Result *swapCashoutStatusResult `json:"result"`
} }
func (s *server) swapCashoutStatusHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) swapCashoutStatusHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: cashout status peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: cashout status peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: cashout status peer: invalid peer address %s", addr) s.logger.Errorf("debug api: cashout status peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
status, err := s.Swap.CashoutStatus(r.Context(), peer) status, err := s.swap.CashoutStatus(r.Context(), peer)
if err != nil { if err != nil {
if errors.Is(err, chequebook.ErrNoCheque) { if errors.Is(err, chequebook.ErrNoCheque) {
s.Logger.Debugf("debug api: cashout status peer: %v", addr, err) s.logger.Debugf("debug api: cashout status peer: %v", addr, err)
s.Logger.Errorf("debug api: cashout status peer: %s", addr) s.logger.Errorf("debug api: cashout status peer: %s", addr)
jsonhttp.NotFound(w, errNoCheque) jsonhttp.NotFound(w, errNoCheque)
return return
} }
if errors.Is(err, chequebook.ErrNoCashout) { if errors.Is(err, chequebook.ErrNoCashout) {
s.Logger.Debugf("debug api: cashout status peer: %v", addr, err) s.logger.Debugf("debug api: cashout status peer: %v", addr, err)
s.Logger.Errorf("debug api: cashout status peer: %s", addr) s.logger.Errorf("debug api: cashout status peer: %s", addr)
jsonhttp.NotFound(w, errNoCashout) jsonhttp.NotFound(w, errNoCashout)
return return
} }
s.Logger.Debugf("debug api: cashout status peer: cannot get status %s: %v", addr, err) s.logger.Debugf("debug api: cashout status peer: cannot get status %s: %v", addr, err)
s.Logger.Errorf("debug api: cashout status peer: cannot get status %s", addr) s.logger.Errorf("debug api: cashout status peer: cannot get status %s", addr)
jsonhttp.InternalServerError(w, errCannotCashStatus) jsonhttp.InternalServerError(w, errCannotCashStatus)
return return
} }
...@@ -283,64 +283,64 @@ type chequebookTxResponse struct { ...@@ -283,64 +283,64 @@ type chequebookTxResponse struct {
TransactionHash common.Hash `json:"transactionHash"` TransactionHash common.Hash `json:"transactionHash"`
} }
func (s *server) chequebookWithdrawHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookWithdrawHandler(w http.ResponseWriter, r *http.Request) {
amountStr := r.URL.Query().Get("amount") amountStr := r.URL.Query().Get("amount")
if amountStr == "" { if amountStr == "" {
jsonhttp.BadRequest(w, errChequebookNoAmount) jsonhttp.BadRequest(w, errChequebookNoAmount)
s.Logger.Error("debug api: no withdraw amount") s.logger.Error("debug api: no withdraw amount")
return return
} }
amount, ok := big.NewInt(0).SetString(amountStr, 10) amount, ok := big.NewInt(0).SetString(amountStr, 10)
if !ok { if !ok {
jsonhttp.BadRequest(w, errChequebookNoAmount) jsonhttp.BadRequest(w, errChequebookNoAmount)
s.Logger.Error("debug api: invalid withdraw amount") s.logger.Error("debug api: invalid withdraw amount")
return return
} }
txHash, err := s.Chequebook.Withdraw(r.Context(), amount) txHash, err := s.chequebook.Withdraw(r.Context(), amount)
if errors.Is(err, chequebook.ErrInsufficientFunds) { if errors.Is(err, chequebook.ErrInsufficientFunds) {
jsonhttp.BadRequest(w, errChequebookInsufficientFunds) jsonhttp.BadRequest(w, errChequebookInsufficientFunds)
s.Logger.Debugf("debug api: chequebook withdraw: %v", err) s.logger.Debugf("debug api: chequebook withdraw: %v", err)
s.Logger.Error("debug api: cannot withdraw from chequebook") s.logger.Error("debug api: cannot withdraw from chequebook")
return return
} }
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errChequebookNoWithdraw) jsonhttp.InternalServerError(w, errChequebookNoWithdraw)
s.Logger.Debugf("debug api: chequebook withdraw: %v", err) s.logger.Debugf("debug api: chequebook withdraw: %v", err)
s.Logger.Error("debug api: cannot withdraw from chequebook") s.logger.Error("debug api: cannot withdraw from chequebook")
return return
} }
jsonhttp.OK(w, chequebookTxResponse{TransactionHash: txHash}) jsonhttp.OK(w, chequebookTxResponse{TransactionHash: txHash})
} }
func (s *server) chequebookDepositHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) chequebookDepositHandler(w http.ResponseWriter, r *http.Request) {
amountStr := r.URL.Query().Get("amount") amountStr := r.URL.Query().Get("amount")
if amountStr == "" { if amountStr == "" {
jsonhttp.BadRequest(w, errChequebookNoAmount) jsonhttp.BadRequest(w, errChequebookNoAmount)
s.Logger.Error("debug api: no deposit amount") s.logger.Error("debug api: no deposit amount")
return return
} }
amount, ok := big.NewInt(0).SetString(amountStr, 10) amount, ok := big.NewInt(0).SetString(amountStr, 10)
if !ok { if !ok {
jsonhttp.BadRequest(w, errChequebookNoAmount) jsonhttp.BadRequest(w, errChequebookNoAmount)
s.Logger.Error("debug api: invalid deposit amount") s.logger.Error("debug api: invalid deposit amount")
return return
} }
txHash, err := s.Chequebook.Deposit(r.Context(), amount) txHash, err := s.chequebook.Deposit(r.Context(), amount)
if errors.Is(err, chequebook.ErrInsufficientFunds) { if errors.Is(err, chequebook.ErrInsufficientFunds) {
jsonhttp.BadRequest(w, errChequebookInsufficientFunds) jsonhttp.BadRequest(w, errChequebookInsufficientFunds)
s.Logger.Debugf("debug api: chequebook deposit: %v", err) s.logger.Debugf("debug api: chequebook deposit: %v", err)
s.Logger.Error("debug api: cannot deposit from chequebook") s.logger.Error("debug api: cannot deposit from chequebook")
return return
} }
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errChequebookNoDeposit) jsonhttp.InternalServerError(w, errChequebookNoDeposit)
s.Logger.Debugf("debug api: chequebook deposit: %v", err) s.logger.Debugf("debug api: chequebook deposit: %v", err)
s.Logger.Error("debug api: cannot deposit from chequebook") s.logger.Error("debug api: cannot deposit from chequebook")
return return
} }
......
pkg/debugapi/chunk.go
View file @ e043c29e
...@@ -13,17 +13,17 @@ import ( ...@@ -13,17 +13,17 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
func (s *server) hasChunkHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) hasChunkHandler(w http.ResponseWriter, r *http.Request) {
addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"]) addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
if err != nil { if err != nil {
s.Logger.Debugf("debug api: parse chunk address: %v", err) s.logger.Debugf("debug api: parse chunk address: %v", err)
jsonhttp.BadRequest(w, "bad address") jsonhttp.BadRequest(w, "bad address")
return return
} }
has, err := s.Storer.Has(r.Context(), addr) has, err := s.storer.Has(r.Context(), addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: localstore has: %v", err) s.logger.Debugf("debug api: localstore has: %v", err)
jsonhttp.BadRequest(w, err) jsonhttp.BadRequest(w, err)
return return
} }
...@@ -35,17 +35,17 @@ func (s *server) hasChunkHandler(w http.ResponseWriter, r *http.Request) { ...@@ -35,17 +35,17 @@ func (s *server) hasChunkHandler(w http.ResponseWriter, r *http.Request) {
jsonhttp.OK(w, nil) jsonhttp.OK(w, nil)
} }
func (s *server) removeChunk(w http.ResponseWriter, r *http.Request) { func (s *Service) removeChunk(w http.ResponseWriter, r *http.Request) {
addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"]) addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
if err != nil { if err != nil {
s.Logger.Debugf("debug api: parse chunk address: %v", err) s.logger.Debugf("debug api: parse chunk address: %v", err)
jsonhttp.BadRequest(w, "bad address") jsonhttp.BadRequest(w, "bad address")
return return
} }
has, err := s.Storer.Has(r.Context(), addr) has, err := s.storer.Has(r.Context(), addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: localstore remove: %v", err) s.logger.Debugf("debug api: localstore remove: %v", err)
jsonhttp.BadRequest(w, err) jsonhttp.BadRequest(w, err)
return return
} }
...@@ -55,9 +55,9 @@ func (s *server) removeChunk(w http.ResponseWriter, r *http.Request) { ...@@ -55,9 +55,9 @@ func (s *server) removeChunk(w http.ResponseWriter, r *http.Request) {
return return
} }
err = s.Storer.Set(r.Context(), storage.ModeSetRemove, addr) err = s.storer.Set(r.Context(), storage.ModeSetRemove, addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: localstore remove: %v", err) s.logger.Debugf("debug api: localstore remove: %v", err)
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
......
pkg/debugapi/cors.go 0 → 100644
View file @ e043c29e
// Copyright 2021 The Swarm Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package debugapi
import (
"net/http"
"unicode/utf8"
)
// corsHandler sets CORS headers to HTTP response if allowed origins are configured.
func (s *Service) corsHandler(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if o := r.Header.Get("Origin"); o != "" && (len(s.corsAllowedOrigins) == 0 || checkOrigin(r, s.corsAllowedOrigins)) {
w.Header().Set("Access-Control-Allow-Credentials", "true")
w.Header().Set("Access-Control-Allow-Origin", o)
w.Header().Set("Access-Control-Allow-Headers", "Origin, Accept, Authorization, Content-Type, X-Requested-With, Access-Control-Request-Headers, Access-Control-Request-Method")
w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS, POST, PUT, DELETE")
w.Header().Set("Access-Control-Max-Age", "3600")
}
h.ServeHTTP(w, r)
})
}
// checkOrigin returns true if the origin header is not set or is equal to the request host.
func checkOrigin(r *http.Request, allowed []string) bool {
origin := r.Header["Origin"]
if len(origin) == 0 {
return true
}
scheme := "http"
if r.TLS != nil {
scheme = "https"
}
hosts := append(allowed, scheme+"://"+r.Host)
for _, v := range hosts {
if equalASCIIFold(origin[0], v) || v == "*" {
return true
}
}
return false
}
// equalASCIIFold returns true if s is equal to t with ASCII case folding as
// defined in RFC 4790.
func equalASCIIFold(s, t string) bool {
for s != "" && t != "" {
sr, size := utf8.DecodeRuneInString(s)
s = s[size:]
tr, size := utf8.DecodeRuneInString(t)
t = t[size:]
if sr == tr {
continue
}
if 'A' <= sr && sr <= 'Z' {
sr = sr + 'a' - 'A'
}
if 'A' <= tr && tr <= 'Z' {
tr = tr + 'a' - 'A'
}
if sr != tr {
return false
}
}
return s == t
}
pkg/debugapi/cors_test.go 0 → 100644
View file @ e043c29e
// Copyright 2021 The Swarm Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package debugapi_test
import (
"net/http"
"testing"
)
func TestCORSHeaders(t *testing.T) {
for _, tc := range []struct {
name string
origin string
allowedOrigins []string
wantCORS bool
}{
{
name: "none",
},
{
name: "no origin",
allowedOrigins: []string{"https://gateway.ethswarm.org"},
wantCORS: false,
},
{
name: "single explicit",
origin: "https://gateway.ethswarm.org",
allowedOrigins: []string{"https://gateway.ethswarm.org"},
wantCORS: true,
},
{
name: "single explicit blocked",
origin: "http://a-hacker.me",
allowedOrigins: []string{"https://gateway.ethswarm.org"},
wantCORS: false,
},
{
name: "multiple explicit",
origin: "https://staging.gateway.ethswarm.org",
allowedOrigins: []string{"https://gateway.ethswarm.org", "https://staging.gateway.ethswarm.org"},
wantCORS: true,
},
{
name: "multiple explicit blocked",
origin: "http://a-hacker.me",
allowedOrigins: []string{"https://gateway.ethswarm.org", "https://staging.gateway.ethswarm.org"},
wantCORS: false,
},
{
name: "wildcard",
origin: "http://localhost:1234",
allowedOrigins: []string{"*"},
wantCORS: true,
},
{
name: "wildcard",
origin: "https://gateway.ethswarm.org",
allowedOrigins: []string{"*"},
wantCORS: true,
},
} {
t.Run(tc.name, func(t *testing.T) {
testServer := newTestServer(t, testServerOptions{
CORSAllowedOrigins: tc.allowedOrigins,
})
req, err := http.NewRequest(http.MethodGet, "/", nil)
if err != nil {
t.Fatal(err)
}
if tc.origin != "" {
req.Header.Set("Origin", tc.origin)
}
r, err := testServer.Client.Do(req)
if err != nil {
t.Fatal(err)
}
got := r.Header.Get("Access-Control-Allow-Origin")
if tc.wantCORS {
if got != tc.origin {
t.Errorf("got Access-Control-Allow-Origin %q, want %q", got, tc.origin)
}
} else {
if got != "" {
t.Errorf("got Access-Control-Allow-Origin %q, want none", got)
}
}
})
}
}
pkg/debugapi/debugapi.go
View file @ e043c29e
...@@ -11,7 +11,6 @@ import ( ...@@ -11,7 +11,6 @@ import (
"crypto/ecdsa" "crypto/ecdsa"
"net/http" "net/http"
"sync" "sync"
"unicode/utf8"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethersphere/bee/pkg/accounting" "github.com/ethersphere/bee/pkg/accounting"
...@@ -29,93 +28,44 @@ import ( ...@@ -29,93 +28,44 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
type Service interface { // Service implements http.Handler interface to be used in HTTP server.
http.Handler type Service struct {
Configure(p2p p2p.DebugService, pingpong pingpong.Interface, topologyDriver topology.Driver, storer storage.Storer, tags *tags.Tags, accounting accounting.Interface, settlement settlement.Interface, chequebookEnabled bool, swap swap.ApiInterface, chequebook chequebook.Service) overlay swarm.Address
MustRegisterMetrics(cs ...prometheus.Collector) publicKey ecdsa.PublicKey
} pssPublicKey ecdsa.PublicKey
ethereumAddress common.Address
type server struct { p2p p2p.DebugService
Overlay swarm.Address pingpong pingpong.Interface
PublicKey ecdsa.PublicKey topologyDriver topology.Driver
PSSPublicKey ecdsa.PublicKey storer storage.Storer
EthereumAddress common.Address logger logging.Logger
P2P p2p.DebugService tracer *tracing.Tracer
Pingpong pingpong.Interface tags *tags.Tags
TopologyDriver topology.Driver accounting accounting.Interface
Storer storage.Storer settlement settlement.Interface
Logger logging.Logger chequebookEnabled bool
Tracer *tracing.Tracer chequebook chequebook.Service
Tags *tags.Tags swap swap.ApiInterface
Accounting accounting.Interface corsAllowedOrigins []string
Settlement settlement.Interface
ChequebookEnabled bool
Chequebook chequebook.Service
Swap swap.ApiInterface
CORSAllowedOrigins []string
metricsRegistry *prometheus.Registry metricsRegistry *prometheus.Registry
// handler is changed in the Configure method // handler is changed in the Configure method
handler http.Handler handler http.Handler
handlerMu sync.RWMutex handlerMu sync.RWMutex
} }
// checkOrigin returns true if the origin is not set or is equal to the request host.
func (s *server) checkOrigin(r *http.Request) bool {
origin := r.Header["Origin"]
if len(origin) == 0 {
return true
}
scheme := "http"
if r.TLS != nil {
scheme = "https"
}
hosts := append(s.CORSAllowedOrigins, scheme+"://"+r.Host)
for _, v := range hosts {
if equalASCIIFold(origin[0], v) || v == "*" {
return true
}
}
return false
}
// equalASCIIFold returns true if s is equal to t with ASCII case folding as
// defined in RFC 4790.
func equalASCIIFold(s, t string) bool {
for s != "" && t != "" {
sr, size := utf8.DecodeRuneInString(s)
s = s[size:]
tr, size := utf8.DecodeRuneInString(t)
t = t[size:]
if sr == tr {
continue
}
if 'A' <= sr && sr <= 'Z' {
sr = sr + 'a' - 'A'
}
if 'A' <= tr && tr <= 'Z' {
tr = tr + 'a' - 'A'
}
if sr != tr {
return false
}
}
return s == t
}
// New creates a new Debug API Service with only basic routers enabled in order // New creates a new Debug API Service with only basic routers enabled in order
// to expose /addresses, /health endpoints, Go metrics and pprof. It is useful to expose // to expose /addresses, /health endpoints, Go metrics and pprof. It is useful to expose
// these endpoints before all dependencies are configured and injected to have // these endpoints before all dependencies are configured and injected to have
// access to basic debugging tools and /health endpoint. // access to basic debugging tools and /health endpoint.
func New(overlay swarm.Address, publicKey, pssPublicKey ecdsa.PublicKey, ethereumAddress common.Address, logger logging.Logger, tracer *tracing.Tracer, corsAllowedOrigins []string) Service { func New(overlay swarm.Address, publicKey, pssPublicKey ecdsa.PublicKey, ethereumAddress common.Address, logger logging.Logger, tracer *tracing.Tracer, corsAllowedOrigins []string) *Service {
s := new(server) s := new(Service)
s.Overlay = overlay s.overlay = overlay
s.PublicKey = publicKey s.publicKey = publicKey
s.PSSPublicKey = pssPublicKey s.pssPublicKey = pssPublicKey
s.EthereumAddress = ethereumAddress s.ethereumAddress = ethereumAddress
s.Logger = logger s.logger = logger
s.Tracer = tracer s.tracer = tracer
s.CORSAllowedOrigins = corsAllowedOrigins s.corsAllowedOrigins = corsAllowedOrigins
s.metricsRegistry = newMetricsRegistry() s.metricsRegistry = newMetricsRegistry()
s.setRouter(s.newBasicRouter()) s.setRouter(s.newBasicRouter())
...@@ -126,22 +76,23 @@ func New(overlay swarm.Address, publicKey, pssPublicKey ecdsa.PublicKey, ethereu ...@@ -126,22 +76,23 @@ func New(overlay swarm.Address, publicKey, pssPublicKey ecdsa.PublicKey, ethereu
// Configure injects required dependencies and configuration parameters and // Configure injects required dependencies and configuration parameters and
// constructs HTTP routes that depend on them. It is intended and safe to call // constructs HTTP routes that depend on them. It is intended and safe to call
// this method only once. // this method only once.
func (s *server) Configure(p2p p2p.DebugService, pingpong pingpong.Interface, topologyDriver topology.Driver, storer storage.Storer, tags *tags.Tags, accounting accounting.Interface, settlement settlement.Interface, chequebookEnabled bool, swap swap.ApiInterface, chequebook chequebook.Service) { func (s *Service) Configure(p2p p2p.DebugService, pingpong pingpong.Interface, topologyDriver topology.Driver, storer storage.Storer, tags *tags.Tags, accounting accounting.Interface, settlement settlement.Interface, chequebookEnabled bool, swap swap.ApiInterface, chequebook chequebook.Service) {
s.P2P = p2p s.p2p = p2p
s.Pingpong = pingpong s.pingpong = pingpong
s.TopologyDriver = topologyDriver s.topologyDriver = topologyDriver
s.Storer = storer s.storer = storer
s.Tags = tags s.tags = tags
s.Accounting = accounting s.accounting = accounting
s.Settlement = settlement s.settlement = settlement
s.ChequebookEnabled = chequebookEnabled s.chequebookEnabled = chequebookEnabled
s.Chequebook = chequebook s.chequebook = chequebook
s.Swap = swap s.swap = swap
s.setRouter(s.newRouter()) s.setRouter(s.newRouter())
} }
func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) { // ServeHTTP implements http.Handler interface.
func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// protect handler as it is changed by the Configure method // protect handler as it is changed by the Configure method
s.handlerMu.RLock() s.handlerMu.RLock()
h := s.handler h := s.handler
......
pkg/debugapi/debugapi_test.go
View file @ e043c29e
...@@ -36,20 +36,21 @@ import ( ...@@ -36,20 +36,21 @@ import (
) )
type testServerOptions struct { type testServerOptions struct {
Overlay swarm.Address Overlay swarm.Address
PublicKey ecdsa.PublicKey PublicKey ecdsa.PublicKey
PSSPublicKey ecdsa.PublicKey PSSPublicKey ecdsa.PublicKey
EthereumAddress common.Address EthereumAddress common.Address
P2P *p2pmock.Service CORSAllowedOrigins []string
Pingpong pingpong.Interface P2P *p2pmock.Service
Storer storage.Storer Pingpong pingpong.Interface
Resolver resolver.Interface Storer storage.Storer
TopologyOpts []topologymock.Option Resolver resolver.Interface
Tags *tags.Tags TopologyOpts []topologymock.Option
AccountingOpts []accountingmock.Option Tags *tags.Tags
SettlementOpts []swapmock.Option AccountingOpts []accountingmock.Option
ChequebookOpts []chequebookmock.Option SettlementOpts []swapmock.Option
SwapOpts []swapmock.Option ChequebookOpts []chequebookmock.Option
SwapOpts []swapmock.Option
} }
type testServer struct { type testServer struct {
...@@ -63,7 +64,7 @@ func newTestServer(t *testing.T, o testServerOptions) *testServer { ...@@ -63,7 +64,7 @@ func newTestServer(t *testing.T, o testServerOptions) *testServer {
settlement := swapmock.New(o.SettlementOpts...) settlement := swapmock.New(o.SettlementOpts...)
chequebook := chequebookmock.NewChequebook(o.ChequebookOpts...) chequebook := chequebookmock.NewChequebook(o.ChequebookOpts...)
swapserv := swapmock.NewApiInterface(o.SwapOpts...) swapserv := swapmock.NewApiInterface(o.SwapOpts...)
s := debugapi.New(o.Overlay, o.PublicKey, o.PSSPublicKey, o.EthereumAddress, logging.New(ioutil.Discard, 0), nil, nil) s := debugapi.New(o.Overlay, o.PublicKey, o.PSSPublicKey, o.EthereumAddress, logging.New(ioutil.Discard, 0), nil, o.CORSAllowedOrigins)
s.Configure(o.P2P, o.Pingpong, topologyDriver, o.Storer, o.Tags, acc, settlement, true, swapserv, chequebook) s.Configure(o.P2P, o.Pingpong, topologyDriver, o.Storer, o.Tags, acc, settlement, true, swapserv, chequebook)
ts := httptest.NewServer(s) ts := httptest.NewServer(s)
t.Cleanup(ts.Close) t.Cleanup(ts.Close)
......
pkg/debugapi/metrics.go
View file @ e043c29e
...@@ -32,6 +32,6 @@ func newMetricsRegistry() (r *prometheus.Registry) { ...@@ -32,6 +32,6 @@ func newMetricsRegistry() (r *prometheus.Registry) {
return r return r
} }
func (s *server) MustRegisterMetrics(cs ...prometheus.Collector) { func (s *Service) MustRegisterMetrics(cs ...prometheus.Collector) {
s.metricsRegistry.MustRegister(cs...) s.metricsRegistry.MustRegister(cs...)
} }
pkg/debugapi/p2p.go
View file @ e043c29e
...@@ -23,25 +23,25 @@ type addressesResponse struct { ...@@ -23,25 +23,25 @@ type addressesResponse struct {
PSSPublicKey string `json:"pss_public_key"` PSSPublicKey string `json:"pss_public_key"`
} }
func (s *server) addressesHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) addressesHandler(w http.ResponseWriter, r *http.Request) {
// initialize variable to json encode as [] instead null if p2p is nil // initialize variable to json encode as [] instead null if p2p is nil
underlay := make([]multiaddr.Multiaddr, 0) underlay := make([]multiaddr.Multiaddr, 0)
// addresses endpoint is exposed before p2p service is configured // addresses endpoint is exposed before p2p service is configured
// to provide information about other addresses. // to provide information about other addresses.
if s.P2P != nil { if s.p2p != nil {
u, err := s.P2P.Addresses() u, err := s.p2p.Addresses()
if err != nil { if err != nil {
s.Logger.Debugf("debug api: p2p addresses: %v", err) s.logger.Debugf("debug api: p2p addresses: %v", err)
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
underlay = u underlay = u
} }
jsonhttp.OK(w, addressesResponse{ jsonhttp.OK(w, addressesResponse{
Overlay: s.Overlay, Overlay: s.overlay,
Underlay: underlay, Underlay: underlay,
Ethereum: s.EthereumAddress, Ethereum: s.ethereumAddress,
PublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.PublicKey)), PublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.publicKey)),
PSSPublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.PSSPublicKey)), PSSPublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.pssPublicKey)),
}) })
} }
pkg/debugapi/peer.go
View file @ e043c29e
...@@ -19,18 +19,18 @@ type peerConnectResponse struct { ...@@ -19,18 +19,18 @@ type peerConnectResponse struct {
Address string `json:"address"` Address string `json:"address"`
} }
func (s *server) peerConnectHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) peerConnectHandler(w http.ResponseWriter, r *http.Request) {
addr, err := multiaddr.NewMultiaddr("/" + mux.Vars(r)["multi-address"]) addr, err := multiaddr.NewMultiaddr("/" + mux.Vars(r)["multi-address"])
if err != nil { if err != nil {
s.Logger.Debugf("debug api: peer connect: parse multiaddress: %v", err) s.logger.Debugf("debug api: peer connect: parse multiaddress: %v", err)
jsonhttp.BadRequest(w, err) jsonhttp.BadRequest(w, err)
return return
} }
bzzAddr, err := s.P2P.Connect(r.Context(), addr) bzzAddr, err := s.p2p.Connect(r.Context(), addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: peer connect %s: %v", addr, err) s.logger.Debugf("debug api: peer connect %s: %v", addr, err)
s.Logger.Errorf("unable to connect to peer %s", addr) s.logger.Errorf("unable to connect to peer %s", addr)
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
...@@ -40,22 +40,22 @@ func (s *server) peerConnectHandler(w http.ResponseWriter, r *http.Request) { ...@@ -40,22 +40,22 @@ func (s *server) peerConnectHandler(w http.ResponseWriter, r *http.Request) {
}) })
} }
func (s *server) peerDisconnectHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) peerDisconnectHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["address"] addr := mux.Vars(r)["address"]
swarmAddr, err := swarm.ParseHexAddress(addr) swarmAddr, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: parse peer address %s: %v", addr, err) s.logger.Debugf("debug api: parse peer address %s: %v", addr, err)
jsonhttp.BadRequest(w, "invalid peer address") jsonhttp.BadRequest(w, "invalid peer address")
return return
} }
if err := s.P2P.Disconnect(swarmAddr); err != nil { if err := s.p2p.Disconnect(swarmAddr); err != nil {
s.Logger.Debugf("debug api: peer disconnect %s: %v", addr, err) s.logger.Debugf("debug api: peer disconnect %s: %v", addr, err)
if errors.Is(err, p2p.ErrPeerNotFound) { if errors.Is(err, p2p.ErrPeerNotFound) {
jsonhttp.BadRequest(w, "peer not found") jsonhttp.BadRequest(w, "peer not found")
return return
} }
s.Logger.Errorf("unable to disconnect peer %s", addr) s.logger.Errorf("unable to disconnect peer %s", addr)
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
...@@ -67,16 +67,16 @@ type peersResponse struct { ...@@ -67,16 +67,16 @@ type peersResponse struct {
Peers []p2p.Peer `json:"peers"` Peers []p2p.Peer `json:"peers"`
} }
func (s *server) peersHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) peersHandler(w http.ResponseWriter, r *http.Request) {
jsonhttp.OK(w, peersResponse{ jsonhttp.OK(w, peersResponse{
Peers: s.P2P.Peers(), Peers: s.p2p.Peers(),
}) })
} }
func (s *server) blocklistedPeersHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) blocklistedPeersHandler(w http.ResponseWriter, r *http.Request) {
peers, err := s.P2P.BlocklistedPeers() peers, err := s.p2p.BlocklistedPeers()
if err != nil { if err != nil {
s.Logger.Debugf("debug api: blocklisted peers: %v", err) s.logger.Debugf("debug api: blocklisted peers: %v", err)
jsonhttp.InternalServerError(w, nil) jsonhttp.InternalServerError(w, nil)
return return
} }
......
pkg/debugapi/pingpong.go
View file @ e043c29e
...@@ -18,11 +18,11 @@ type pingpongResponse struct { ...@@ -18,11 +18,11 @@ type pingpongResponse struct {
RTT string `json:"rtt"` RTT string `json:"rtt"`
} }
func (s *server) pingpongHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) pingpongHandler(w http.ResponseWriter, r *http.Request) {
peerID := mux.Vars(r)["peer-id"] peerID := mux.Vars(r)["peer-id"]
ctx := r.Context() ctx := r.Context()
span, logger, ctx := s.Tracer.StartSpanFromContext(ctx, "pingpong-api", s.Logger) span, logger, ctx := s.tracer.StartSpanFromContext(ctx, "pingpong-api", s.logger)
defer span.Finish() defer span.Finish()
address, err := swarm.ParseHexAddress(peerID) address, err := swarm.ParseHexAddress(peerID)
...@@ -32,7 +32,7 @@ func (s *server) pingpongHandler(w http.ResponseWriter, r *http.Request) { ...@@ -32,7 +32,7 @@ func (s *server) pingpongHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
rtt, err := s.Pingpong.Ping(ctx, address, "hey", "there", ",", "how are", "you", "?") rtt, err := s.pingpong.Ping(ctx, address, "hey", "there", ",", "how are", "you", "?")
if err != nil { if err != nil {
logger.Debugf("pingpong: ping %s: %v", peerID, err) logger.Debugf("pingpong: ping %s: %v", peerID, err)
if errors.Is(err, p2p.ErrPeerNotFound) { if errors.Is(err, p2p.ErrPeerNotFound) {
......
pkg/debugapi/router.go
View file @ e043c29e
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
// - vars // - vars
// - metrics // - metrics
// - /addresses // - /addresses
func (s *server) newBasicRouter() *mux.Router { func (s *Service) newBasicRouter() *mux.Router {
router := mux.NewRouter() router := mux.NewRouter()
router.NotFoundHandler = http.HandlerFunc(jsonhttp.NotFoundHandler) router.NotFoundHandler = http.HandlerFunc(jsonhttp.NotFoundHandler)
...@@ -65,7 +65,7 @@ func (s *server) newBasicRouter() *mux.Router { ...@@ -65,7 +65,7 @@ func (s *server) newBasicRouter() *mux.Router {
// newRouter construct the complete set of routes after all of the dependencies // newRouter construct the complete set of routes after all of the dependencies
// are injected and exposes /readiness endpoint to provide information that // are injected and exposes /readiness endpoint to provide information that
// Debug API is fully active. // Debug API is fully active.
func (s *server) newRouter() *mux.Router { func (s *Service) newRouter() *mux.Router {
router := s.newBasicRouter() router := s.newBasicRouter()
router.Handle("/readiness", web.ChainHandlers( router.Handle("/readiness", web.ChainHandlers(
...@@ -129,7 +129,7 @@ func (s *server) newRouter() *mux.Router { ...@@ -129,7 +129,7 @@ func (s *server) newRouter() *mux.Router {
"GET": http.HandlerFunc(s.peerSettlementsHandler), "GET": http.HandlerFunc(s.peerSettlementsHandler),
}) })
if s.ChequebookEnabled { if s.chequebookEnabled {
router.Handle("/chequebook/balance", jsonhttp.MethodHandler{ router.Handle("/chequebook/balance", jsonhttp.MethodHandler{
"GET": http.HandlerFunc(s.chequebookBalanceHandler), "GET": http.HandlerFunc(s.chequebookBalanceHandler),
}) })
...@@ -168,23 +168,12 @@ func (s *server) newRouter() *mux.Router { ...@@ -168,23 +168,12 @@ func (s *server) newRouter() *mux.Router {
} }
// setRouter sets the base Debug API handler with common middlewares. // setRouter sets the base Debug API handler with common middlewares.
func (s *server) setRouter(router http.Handler) { func (s *Service) setRouter(router http.Handler) {
h := http.NewServeMux() h := http.NewServeMux()
h.Handle("/", web.ChainHandlers( h.Handle("/", web.ChainHandlers(
httpaccess.NewHTTPAccessLogHandler(s.Logger, logrus.InfoLevel, s.Tracer, "debug api access"), httpaccess.NewHTTPAccessLogHandler(s.logger, logrus.InfoLevel, s.tracer, "debug api access"),
handlers.CompressHandler, handlers.CompressHandler,
func(h http.Handler) http.Handler { s.corsHandler,
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if o := r.Header.Get("Origin"); o != "" && (len(s.CORSAllowedOrigins) == 0 || s.checkOrigin(r)) {
w.Header().Set("Access-Control-Allow-Credentials", "true")
w.Header().Set("Access-Control-Allow-Origin", o)
w.Header().Set("Access-Control-Allow-Headers", "Origin, Accept, Authorization, Content-Type, X-Requested-With, Access-Control-Request-Headers, Access-Control-Request-Method")
w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS, POST, PUT, DELETE")
w.Header().Set("Access-Control-Max-Age", "3600")
}
h.ServeHTTP(w, r)
})
},
web.NoCacheHeadersHandler, web.NoCacheHeadersHandler,
web.FinalHandler(router), web.FinalHandler(router),
)) ))
......
pkg/debugapi/settlements.go
View file @ e043c29e
...@@ -32,20 +32,20 @@ type settlementsResponse struct { ...@@ -32,20 +32,20 @@ type settlementsResponse struct {
Settlements []settlementResponse `json:"settlements"` Settlements []settlementResponse `json:"settlements"`
} }
func (s *server) settlementsHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) settlementsHandler(w http.ResponseWriter, r *http.Request) {
settlementsSent, err := s.Settlement.SettlementsSent() settlementsSent, err := s.settlement.SettlementsSent()
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errCantSettlements) jsonhttp.InternalServerError(w, errCantSettlements)
s.Logger.Debugf("debug api: sent settlements: %v", err) s.logger.Debugf("debug api: sent settlements: %v", err)
s.Logger.Error("debug api: can not get sent settlements") s.logger.Error("debug api: can not get sent settlements")
return return
} }
settlementsReceived, err := s.Settlement.SettlementsReceived() settlementsReceived, err := s.settlement.SettlementsReceived()
if err != nil { if err != nil {
jsonhttp.InternalServerError(w, errCantSettlements) jsonhttp.InternalServerError(w, errCantSettlements)
s.Logger.Debugf("debug api: received settlements: %v", err) s.logger.Debugf("debug api: received settlements: %v", err)
s.Logger.Error("debug api: can not get received settlements") s.logger.Error("debug api: can not get received settlements")
return return
} }
...@@ -88,23 +88,23 @@ func (s *server) settlementsHandler(w http.ResponseWriter, r *http.Request) { ...@@ -88,23 +88,23 @@ func (s *server) settlementsHandler(w http.ResponseWriter, r *http.Request) {
jsonhttp.OK(w, settlementsResponse{TotalSettlementReceived: totalReceived, TotalSettlementSent: totalSent, Settlements: settlementResponsesArray}) jsonhttp.OK(w, settlementsResponse{TotalSettlementReceived: totalReceived, TotalSettlementSent: totalSent, Settlements: settlementResponsesArray})
} }
func (s *server) peerSettlementsHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) peerSettlementsHandler(w http.ResponseWriter, r *http.Request) {
addr := mux.Vars(r)["peer"] addr := mux.Vars(r)["peer"]
peer, err := swarm.ParseHexAddress(addr) peer, err := swarm.ParseHexAddress(addr)
if err != nil { if err != nil {
s.Logger.Debugf("debug api: settlements peer: invalid peer address %s: %v", addr, err) s.logger.Debugf("debug api: settlements peer: invalid peer address %s: %v", addr, err)
s.Logger.Errorf("debug api: settlements peer: invalid peer address %s", addr) s.logger.Errorf("debug api: settlements peer: invalid peer address %s", addr)
jsonhttp.NotFound(w, errInvaliAddress) jsonhttp.NotFound(w, errInvaliAddress)
return return
} }
peerexists := false peerexists := false
received, err := s.Settlement.TotalReceived(peer) received, err := s.settlement.TotalReceived(peer)
if err != nil { if err != nil {
if !errors.Is(err, settlement.ErrPeerNoSettlements) { if !errors.Is(err, settlement.ErrPeerNoSettlements) {
s.Logger.Debugf("debug api: settlements peer: get peer %s received settlement: %v", peer.String(), err) s.logger.Debugf("debug api: settlements peer: get peer %s received settlement: %v", peer.String(), err)
s.Logger.Errorf("debug api: settlements peer: can't get peer %s received settlement", peer.String()) s.logger.Errorf("debug api: settlements peer: can't get peer %s received settlement", peer.String())
jsonhttp.InternalServerError(w, errCantSettlementsPeer) jsonhttp.InternalServerError(w, errCantSettlementsPeer)
return return
} else { } else {
...@@ -116,11 +116,11 @@ func (s *server) peerSettlementsHandler(w http.ResponseWriter, r *http.Request) ...@@ -116,11 +116,11 @@ func (s *server) peerSettlementsHandler(w http.ResponseWriter, r *http.Request)
peerexists = true peerexists = true
} }
sent, err := s.Settlement.TotalSent(peer) sent, err := s.settlement.TotalSent(peer)
if err != nil { if err != nil {
if !errors.Is(err, settlement.ErrPeerNoSettlements) { if !errors.Is(err, settlement.ErrPeerNoSettlements) {
s.Logger.Debugf("debug api: settlements peer: get peer %s sent settlement: %v", peer.String(), err) s.logger.Debugf("debug api: settlements peer: get peer %s sent settlement: %v", peer.String(), err)
s.Logger.Errorf("debug api: settlements peer: can't get peer %s sent settlement", peer.String()) s.logger.Errorf("debug api: settlements peer: can't get peer %s sent settlement", peer.String())
jsonhttp.InternalServerError(w, errCantSettlementsPeer) jsonhttp.InternalServerError(w, errCantSettlementsPeer)
return return
} else { } else {
......
pkg/debugapi/tag.go
View file @ e043c29e
...@@ -42,27 +42,27 @@ func newTagResponse(tag *tags.Tag) tagResponse { ...@@ -42,27 +42,27 @@ func newTagResponse(tag *tags.Tag) tagResponse {
} }
} }
func (s *server) getTagHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) getTagHandler(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["id"] idStr := mux.Vars(r)["id"]
id, err := strconv.Atoi(idStr) id, err := strconv.Atoi(idStr)
if err != nil { if err != nil {
s.Logger.Debugf("get tag: parse id %s: %v", idStr, err) s.logger.Debugf("get tag: parse id %s: %v", idStr, err)
s.Logger.Error("get tag: parse id") s.logger.Error("get tag: parse id")
jsonhttp.BadRequest(w, "invalid id") jsonhttp.BadRequest(w, "invalid id")
return return
} }
tag, err := s.Tags.Get(uint32(id)) tag, err := s.tags.Get(uint32(id))
if err != nil { if err != nil {
if errors.Is(err, tags.ErrNotFound) { if errors.Is(err, tags.ErrNotFound) {
s.Logger.Debugf("get tag: tag not present: %v, id %s", err, idStr) s.logger.Debugf("get tag: tag not present: %v, id %s", err, idStr)
s.Logger.Error("get tag: tag not present") s.logger.Error("get tag: tag not present")
jsonhttp.NotFound(w, "tag not present") jsonhttp.NotFound(w, "tag not present")
return return
} }
s.Logger.Debugf("get tag: tag %v: %v", idStr, err) s.logger.Debugf("get tag: tag %v: %v", idStr, err)
s.Logger.Errorf("get tag: %v", idStr) s.logger.Errorf("get tag: %v", idStr)
jsonhttp.InternalServerError(w, "cannot get tag") jsonhttp.InternalServerError(w, "cannot get tag")
return return
} }
......
pkg/debugapi/topology.go
View file @ e043c29e
...@@ -13,17 +13,17 @@ import ( ...@@ -13,17 +13,17 @@ import (
"github.com/ethersphere/bee/pkg/jsonhttp" "github.com/ethersphere/bee/pkg/jsonhttp"
) )
func (s *server) topologyHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) topologyHandler(w http.ResponseWriter, r *http.Request) {
ms, ok := s.TopologyDriver.(json.Marshaler) ms, ok := s.topologyDriver.(json.Marshaler)
if !ok { if !ok {
s.Logger.Error("topology driver cast to json marshaler") s.logger.Error("topology driver cast to json marshaler")
jsonhttp.InternalServerError(w, "topology json marshal interface error") jsonhttp.InternalServerError(w, "topology json marshal interface error")
return return
} }
b, err := ms.MarshalJSON() b, err := ms.MarshalJSON()
if err != nil { if err != nil {
s.Logger.Errorf("topology marshal to json: %v", err) s.logger.Errorf("topology marshal to json: %v", err)
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
......
pkg/debugapi/welcome_message.go
View file @ e043c29e
...@@ -21,25 +21,25 @@ type welcomeMessageResponse struct { ...@@ -21,25 +21,25 @@ type welcomeMessageResponse struct {
WelcomeMesssage string `json:"welcome_message"` WelcomeMesssage string `json:"welcome_message"`
} }
func (s *server) getWelcomeMessageHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) getWelcomeMessageHandler(w http.ResponseWriter, r *http.Request) {
val := s.P2P.GetWelcomeMessage() val := s.p2p.GetWelcomeMessage()
jsonhttp.OK(w, welcomeMessageResponse{ jsonhttp.OK(w, welcomeMessageResponse{
WelcomeMesssage: val, WelcomeMesssage: val,
}) })
} }
func (s *server) setWelcomeMessageHandler(w http.ResponseWriter, r *http.Request) { func (s *Service) setWelcomeMessageHandler(w http.ResponseWriter, r *http.Request) {
var data welcomeMessageRequest var data welcomeMessageRequest
err := json.NewDecoder(r.Body).Decode(&data) err := json.NewDecoder(r.Body).Decode(&data)
if err != nil { if err != nil {
s.Logger.Debugf("debugapi: welcome message: failed to read request: %v", err) s.logger.Debugf("debugapi: welcome message: failed to read request: %v", err)
jsonhttp.BadRequest(w, err) jsonhttp.BadRequest(w, err)
return return
} }
if err := s.P2P.SetWelcomeMessage(data.WelcomeMesssage); err != nil { if err := s.p2p.SetWelcomeMessage(data.WelcomeMesssage); err != nil {
s.Logger.Debugf("debugapi: welcome message: failed to set: %v", err) s.logger.Debugf("debugapi: welcome message: failed to set: %v", err)
s.Logger.Errorf("Failed to set welcome message") s.logger.Errorf("Failed to set welcome message")
jsonhttp.InternalServerError(w, err) jsonhttp.InternalServerError(w, err)
return return
} }
......
pkg/node/node.go
View file @ e043c29e
...@@ -128,7 +128,7 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey, ...@@ -128,7 +128,7 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
tracerCloser: tracerCloser, tracerCloser: tracerCloser,
} }
var debugAPIService debugapi.Service var debugAPIService *debugapi.Service
if o.DebugAPIAddr != "" { if o.DebugAPIAddr != "" {
overlayEthAddress, err := signer.EthereumAddress() overlayEthAddress, err := signer.EthereumAddress()
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment