feat(GODT-2714): Set Configuration Status to Failure and send Recovery event when issue is solved.

This commit is contained in:
Romain LE JEUNE
2023-06-28 15:26:41 +02:00
parent fa4c0ec823
commit 720f662afe
9 changed files with 118 additions and 18 deletions

View File

@ -26,6 +26,10 @@ import (
)
func (user *User) SendConfigStatusSuccess() {
if user.configStatus.IsFromFailure() {
user.SendConfigStatusRecovery()
return
}
if !user.telemetryManager.IsTelemetryAvailable() {
return
}
@ -54,9 +58,6 @@ func (user *User) SendConfigStatusSuccess() {
}
func (user *User) SendConfigStatusAbort() {
if !user.telemetryManager.IsTelemetryAvailable() {
return
}
if !user.configStatus.IsPending() {
return
}
@ -79,6 +80,35 @@ func (user *User) SendConfigStatusAbort() {
}
func (user *User) SendConfigStatusRecovery() {
if !user.configStatus.IsFromFailure() {
user.SendConfigStatusSuccess()
return
}
if !user.telemetryManager.IsTelemetryAvailable() {
return
}
if !user.configStatus.IsPending() {
return
}
var builder configstatus.ConfigRecoveryBuilder
success := builder.New(user.configStatus.Data)
data, err := json.Marshal(success)
if err != nil {
if err := user.reporter.ReportMessageWithContext("Cannot parse config_recovery data.", reporter.Context{
"error": err,
}); err != nil {
user.log.WithError(err).Error("Failed to report config_recovery data parsing error.")
}
return
}
if err := user.SendTelemetry(context.Background(), data); err == nil {
user.log.Info("Configuration Status Recovery event sent.")
if err := user.configStatus.ApplySuccess(); err != nil {
user.log.WithError(err).Error("Failed to ApplySuccess on config_status.")
}
}
}
func (user *User) SendConfigStatusProgress() {
@ -112,3 +142,15 @@ func (user *User) SendConfigStatusProgress() {
}
}
}
func (user *User) ReportConfigStatusFailure(errDetails string) {
if user.configStatus.IsPending() {
return
}
if err := user.configStatus.ApplyFailure(errDetails); err != nil {
user.log.WithError(err).Error("Failed to ApplyFailure on config_status.")
} else {
user.log.Info("Configuration Status is back to Pending due to Failure.")
}
}

View File

@ -514,7 +514,9 @@ func (user *User) CheckAuth(email string, password []byte) (string, error) {
}
if subtle.ConstantTimeCompare(user.vault.BridgePass(), dec) != 1 {
return "", fmt.Errorf("invalid password")
err := fmt.Errorf("invalid password")
user.ReportConfigStatusFailure(err.Error())
return "", err
}
return safe.RLockRetErr(func() (string, error) {

View File

@ -148,6 +148,7 @@ func withUser(tb testing.TB, ctx context.Context, _ *server.Server, m *proton.Ma
ctl := gomock.NewController(tb)
defer ctl.Finish()
manager := mocks.NewMockHeartbeatManager(ctl)
manager.EXPECT().IsTelemetryAvailable().AnyTimes()
user, err := New(ctx, vaultUser, client, nil, apiUser, nil, true, vault.DefaultMaxSyncMemory, tb.TempDir(), manager)
require.NoError(tb, err)
defer user.Close()