Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions mobile/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"
"unsafe"

errors2 "github.com/pkg/errors"
"go.uber.org/zap"

"github.com/ethereum/go-ethereum/signer/core/apitypes"
Expand Down Expand Up @@ -427,6 +428,11 @@ func createAccountAndLogin(requestJSON string) string {
return makeJSONResponse(err)
}

logutils.ZapLogger().Debug("<<< createAccountAndLogin",
zap.String("request", requestJSON),
zap.String("rootDataDir", request.RootDataDir),
)

err = request.Validate(&requests.CreateAccountValidation{
AllowEmptyDisplayName: true,
})
Expand Down Expand Up @@ -1519,7 +1525,8 @@ func inputConnectionStringForBootstrapping(cs, configJSON string) string {
err = params.FromString(cs)
if err != nil {
response := &inputConnectionStringForBootstrappingResponse{}
return response.toJSON(fmt.Errorf("could not parse connection string"))
err = errors2.Wrap(err, "error parsing connection string")
return response.toJSON(err)
}
response := &inputConnectionStringForBootstrappingResponse{
InstallationID: params.InstallationID(),
Expand All @@ -1529,21 +1536,37 @@ func inputConnectionStringForBootstrapping(cs, configJSON string) string {
err = statusBackend.LocalPairingStateManager.StartPairing(cs)
defer func() { statusBackend.LocalPairingStateManager.StopPairing(cs, err) }()
if err != nil {
err = errors2.Wrap(err, "could not start pairing")
return response.toJSON(err)
}

var conf pairing.ReceiverClientConfig
err = json.Unmarshal([]byte(configJSON), &conf)

logutils.ZapLogger().Debug("<<< inputConnectionStringForBootstrapping",
zap.String("cs", cs),
zap.String("configJSON", configJSON),
)

if err != nil {
logutils.ZapLogger().Error("error parsing config", zap.Error(err), zap.String("config", configJSON))
err = errors2.Wrap(err, "could not unmarshal config")
return response.toJSON(err)
}

err = pairing.StartUpReceivingClient(statusBackend, cs, &conf)
if err != nil {
err = errors2.Wrap(err, "could not start receiving client")
return response.toJSON(err)
}

return response.toJSON(statusBackend.Logout())
err = statusBackend.Logout()
if err != nil {
err = errors2.Wrap(err, "could not logout")
return response.toJSON(err)
}

return response.toJSON(nil)
}

func InputConnectionStringForBootstrappingV2(requestJSON string) string {
Expand Down
10 changes: 10 additions & 0 deletions mobile/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.uber.org/zap"

"github.com/brianvoe/gofakeit/v6"

Expand Down Expand Up @@ -47,3 +48,12 @@ func TestIntendedPanic(t *testing.T) {
IntendedPanic(message)
})
}

func TestEscapeString(t *testing.T) {
logger, err := zap.NewDevelopment()
require.NoError(t, err)

const string_2 = `C:\Users\anast\status-desktop\`
const string_3 = `C:\\Users\\anast\\status-desktop\\`
logger.Info("test log", zap.String("string_2", string_2), zap.String("string_3", string_3))
}
Loading