exp/services/recoverysigner: add basic logs

exp/services/recoverysigner/internal/serve/account_delete.go

@@ -37,12 +37,18 @@ func (h accountDeleteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	l := h.Logger.Ctx(ctx).
+		WithField("account", req.Address.Address())
+
+	l.Info("Request to delete account.")
+
 	acc, err := h.AccountStore.Get(req.Address.Address())
 	if err == account.ErrNotFound {
+		l.Info("Account not found.")
 		notFound.Render(w)
 		return
 	} else if err != nil {
-		h.Logger.Error(err)
+		l.Error(err)
 		serverError.Render(w)
 		return
 	}
@@ -54,6 +60,7 @@ func (h accountDeleteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 	// Authorized if authenticated as the account.
 	authorized := claims.Address == req.Address.Address()
+	l.Infof("Authorized with self: %v.", authorized)
 
 	// Authorized if authenticated as an identity registered with the account.
 	for _, i := range acc.Identities {
@@ -66,17 +73,22 @@ func (h accountDeleteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 				(m.Type == account.AuthMethodTypeEmail && m.Value == claims.Email)) {
 				respIdentity.Authenticated = true
 				authorized = true
+				l.Infof("Authorized with %s.", m.Type)
 				break
 			}
 		}
 
 		resp.Identities = append(resp.Identities, respIdentity)
 	}
+
+	l.Infof("Authorized: %v.", authorized)
 	if !authorized {
 		notFound.Render(w)
 		return
 	}
 
+	l.Info("Deleting account.")
+
 	err = h.AccountStore.Delete(req.Address.Address())
 	if err == account.ErrNotFound {
 		// It can happen if two authorized users are trying to delete the account at the same time.

exp/services/recoverysigner/internal/serve/account_get.go

@@ -37,12 +37,18 @@ func (h accountGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	l := h.Logger.Ctx(ctx).
+		WithField("account", req.Address.Address())
+
+	l.Info("Request to get account.")
+
 	acc, err := h.AccountStore.Get(req.Address.Address())
 	if err == account.ErrNotFound {
+		l.Info("Account not found.")
 		notFound.Render(w)
 		return
 	} else if err != nil {
-		h.Logger.Error(err)
+		l.Error(err)
 		serverError.Render(w)
 		return
 	}
@@ -54,6 +60,7 @@ func (h accountGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// Authorized if authenticated as the account.
 	authorized := claims.Address == req.Address.Address()
+	l.Infof("Authorized with self: %v.", authorized)
 
 	// Authorized if authenticated as an identity registered with the account.
 	for _, i := range acc.Identities {
@@ -66,16 +73,21 @@ func (h accountGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				(m.Type == account.AuthMethodTypeEmail && m.Value == claims.Email)) {
 				respIdentity.Authenticated = true
 				authorized = true
+				l.Infof("Authorized with %s.", m.Type)
 				break
 			}
 		}
 
 		resp.Identities = append(resp.Identities, respIdentity)
 	}
+
+	l.Infof("Authorized: %v.", authorized)
 	if !authorized {
 		notFound.Render(w)
 		return
 	}
 
+	l.Info("Getting account.")
+
 	httpjson.Render(w, resp, httpjson.JSON)
 }

exp/services/recoverysigner/internal/serve/account_list.go

@@ -2,6 +2,7 @@ package serve
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
@@ -29,6 +30,21 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	l := h.Logger.Ctx(ctx)
+
+	authMethodTypes := []string{}
+	if claims.Address != "" {
+		authMethodTypes = append(authMethodTypes, string(account.AuthMethodTypeAddress))
+	}
+	if claims.PhoneNumber != "" {
+		authMethodTypes = append(authMethodTypes, string(account.AuthMethodTypePhoneNumber))
+	}
+	if claims.Email != "" {
+		authMethodTypes = append(authMethodTypes, string(account.AuthMethodTypeEmail))
+	}
+	l.WithField("auth_method_types", strings.Join(authMethodTypes, ", ")).
+		Info("Request to get accounts with auth methods.")
+
 	resp := accountListResponse{
 		Accounts: []accountResponse{},
 	}
@@ -40,7 +56,7 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		if err == account.ErrNotFound {
 			// Do nothing.
 		} else if err != nil {
-			h.Logger.Error(err)
+			l.Error(err)
 			serverError.Render(w)
 			return
 		} else {
@@ -55,12 +71,15 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				accResp.Identities = append(accResp.Identities, accRespIdentity)
 			}
 			resp.Accounts = append(resp.Accounts, accResp)
+			l.WithField("account", acc.Address).
+				WithField("auth_method_type", account.AuthMethodTypeAddress).
+				Info("Found account with auth method type as self.")
 		}
 
 		// Find accounts that have the address listed as an owner or other identity.
 		accs, err := h.AccountStore.FindWithIdentityAddress(claims.Address)
 		if err != nil {
-			h.Logger.Error(err)
+			l.Error(err)
 			serverError.Render(w)
 			return
 		}
@@ -82,6 +101,9 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				accResp.Identities = append(accResp.Identities, accRespIdentity)
 			}
 			resp.Accounts = append(resp.Accounts, accResp)
+			l.WithField("account", acc.Address).
+				WithField("auth_method_type", account.AuthMethodTypeAddress).
+				Info("Found account with auth method type as identity.")
 		}
 	}
 
@@ -111,6 +133,9 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				accResp.Identities = append(accResp.Identities, accRespIdentity)
 			}
 			resp.Accounts = append(resp.Accounts, accResp)
+			l.WithField("account", acc.Address).
+				WithField("auth_method_type", account.AuthMethodTypePhoneNumber).
+				Info("Found account with auth method type as identity.")
 		}
 	}
 
@@ -140,6 +165,9 @@ func (h accountListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				accResp.Identities = append(accResp.Identities, accRespIdentity)
 			}
 			resp.Accounts = append(resp.Accounts, accResp)
+			l.WithField("account", acc.Address).
+				WithField("auth_method_type", account.AuthMethodTypeEmail).
+				Info("Found account with auth method type as identity.")
 		}
 	}
 

exp/services/recoverysigner/internal/serve/account_post.go

@@ -86,16 +86,25 @@ func (h accountPostHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	l := h.Logger.Ctx(ctx).
+		WithField("account", req.Address.Address())
+
+	l.Info("Request to register account.")
+
 	if req.Address.Address() != claims.Address {
+		l.WithField("address", claims.Address).
+			Info("Not authorized as self, authorized as other address.")
 		unauthorized.Render(w)
 		return
 	}
 
 	if req.Validate() != nil {
+		l.Info("Request validation failed.")
 		badRequest.Render(w)
 		return
 	}
 
+	authMethodCount := 0
 	acc := account.Account{
 		Address:    req.Address.Address(),
 		Identities: []account.Identity{},
@@ -109,20 +118,27 @@ func (h accountPostHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				Type:  account.AuthMethodType(m.Type),
 				Value: m.Value,
 			})
+			authMethodCount++
 		}
 		acc.Identities = append(acc.Identities, accIdentity)
 	}
+	l = l.
+		WithField("identities_count", len(acc.Identities)).
+		WithField("auth_methods_count", authMethodCount)
 
 	err = h.AccountStore.Add(acc)
 	if err == account.ErrAlreadyExists {
+		l.Info("Account already registered.")
 		conflict.Render(w)
 		return
 	} else if err != nil {
-		h.Logger.Error(err)
+		l.Error(err)
 		serverError.Render(w)
 		return
 	}
 
+	l.Info("Account registered.")
+
 	resp := accountResponse{
 		Address: acc.Address,
 		Signer:  h.SigningAddress.Address(),

exp/services/recoverysigner/internal/serve/account_put.go

@@ -81,23 +81,36 @@ func (h accountPutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	req := accountPutRequest{}
 	err := httpdecode.Decode(r, &req)
-	if err != nil || req.Address == nil || req.Validate() != nil {
+	if err != nil || req.Address == nil {
+		badRequest.Render(w)
+		return
+	}
+
+	l := h.Logger.Ctx(ctx).
+		WithField("account", req.Address.Address())
+
+	l.Info("Request to update account.")
+
+	if req.Validate() != nil {
+		l.Info("Request validation failed.")
 		badRequest.Render(w)
 		return
 	}
 
 	acc, err := h.AccountStore.Get(req.Address.Address())
 	if err == account.ErrNotFound {
+		l.Info("Account not found.")
 		notFound.Render(w)
 		return
 	} else if err != nil {
-		h.Logger.Error(err)
+		l.Error(err)
 		serverError.Render(w)
 		return
 	}
 
 	// Authorized if authenticated as the account.
 	authorized := claims.Address == req.Address.Address()
+	l.Infof("Authorized with self: %v.", authorized)
 
 	// Authorized if authenticated as an identity registered with the account.
 	for _, i := range acc.Identities {
@@ -106,6 +119,7 @@ func (h accountPutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				(m.Type == account.AuthMethodTypePhoneNumber && m.Value == claims.PhoneNumber) ||
 				(m.Type == account.AuthMethodTypeEmail && m.Value == claims.Email)) {
 				authorized = true
+				l.Infof("Authorized with %s.", m.Type)
 				break
 			}
 		}
@@ -115,6 +129,7 @@ func (h accountPutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	authMethodCount := 0
 	accWithNewIdentiies := account.Account{
 		Address:    req.Address.Address(),
 		Identities: []account.Identity{},
@@ -128,13 +143,18 @@ func (h accountPutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				Type:  account.AuthMethodType(m.Type),
 				Value: m.Value,
 			})
+			authMethodCount++
 		}
 		accWithNewIdentiies.Identities = append(accWithNewIdentiies.Identities, accIdentity)
 	}
+	l = l.
+		WithField("identities_count", len(accWithNewIdentiies.Identities)).
+		WithField("auth_methods_count", authMethodCount)
 
 	err = h.AccountStore.Update(accWithNewIdentiies)
 	if err == account.ErrNotFound {
 		// It can happen if another authorized user is trying to delete the account at the same time.
+		l.Info("Account not found.")
 		notFound.Render(w)
 		return
 	} else if err != nil {
@@ -143,6 +163,8 @@ func (h accountPutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	l.Info("Account updated.")
+
 	resp := accountResponse{
 		Address: accWithNewIdentiies.Address,
 		Signer:  h.SigningAddress.Address(),