feat(GODT-2673): Use NoClient as UserAgent without any client connected and...

This commit is contained in:
Romain Le Jeune
2023-06-01 15:15:37 +00:00
parent c4dc829e6d
commit 802f7dbc67
9 changed files with 122 additions and 10 deletions

View File

@ -24,6 +24,7 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
"github.com/sirupsen/logrus"
)
@ -245,7 +246,7 @@ func (vault *Vault) GetLastUserAgent() string {
// Handle case where there may be no value.
if len(v) == 0 {
v = DefaultUserAgent
v = useragent.DefaultUserAgent
}
return v

View File

@ -24,6 +24,7 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gluon/async"
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
"github.com/stretchr/testify/require"
)
@ -236,7 +237,7 @@ func TestVault_Settings_LastUserAgent(t *testing.T) {
s := newVault(t)
// Check the default first start value.
require.Equal(t, vault.DefaultUserAgent, s.GetLastUserAgent())
require.Equal(t, useragent.DefaultUserAgent, s.GetLastUserAgent())
}
func Test_Settings_PasswordArchive(t *testing.T) {

View File

@ -23,6 +23,7 @@ import (
"time"
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
"github.com/ProtonMail/proton-bridge/v3/pkg/ports"
)
@ -61,7 +62,6 @@ type Settings struct {
}
const DefaultMaxSyncMemory = 2 * 1024 * uint64(1024*1024)
const DefaultUserAgent = "UnknownClient/0.0.1"
func GetDefaultSyncWorkerCount() int {
const minSyncWorkers = 16
@ -105,7 +105,7 @@ func newDefaultSettings(gluonDir string) Settings {
SyncWorkers: syncWorkers,
SyncAttPool: syncWorkers,
LastUserAgent: DefaultUserAgent,
LastUserAgent: useragent.DefaultUserAgent,
LastHeartbeatSent: time.Time{},
PasswordArchive: PasswordArchive{},