1 parent
d2f14ede7a
commit
cfe4401b70
32 files changed
+893
-318
No files matched your search
@@ -17,6 +17,7 @@ func Finish() error {
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
initializing := !cfg.IsInit && cfg.SetupState != config.SetupStateReady
|
||||
portsChanged := applyServicePorts(cfg)
|
||||
if cfg.IsSetupReady() {
|
||||
if portsChanged {
|
||||
@@ -29,6 +30,11 @@ func Finish() error {
|
||||
}
|
||||
cfg.SetupState = config.SetupStateReady
|
||||
cfg.IsInit = true
|
||||
if initializing {
|
||||
cfg.VerificationEnabled = true
|
||||
cfg.ExternalRecoveryEnabled = true
|
||||
cfg.LoginPolicy = "new_device"
|
||||
}
|
||||
|
||||
err = config.WriteConfig(cfg)
|
||||
if err != nil {
|
||||
|
||||
@@ -33,6 +33,33 @@ func TestFinishPersistsServicePorts(t *testing.T) {
|
||||
if loaded.SetupState != config.SetupStateReady || !loaded.IsInit {
|
||||
t.Fatalf("setup state = %q, isInit = %t", loaded.SetupState, loaded.IsInit)
|
||||
}
|
||||
if !loaded.VerificationEnabled || !loaded.ExternalRecoveryEnabled || loaded.LoginPolicy != "new_device" {
|
||||
t.Fatalf("security defaults = verification %t, recovery %t, policy %q", loaded.VerificationEnabled, loaded.ExternalRecoveryEnabled, loaded.LoginPolicy)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFinishPreservesExplicitlyDisabledSecurityOptions(t *testing.T) {
|
||||
prepareFinishConfigTest(t)
|
||||
if err := config.WriteConfig(&config.Config{
|
||||
SetupState: config.SetupStateReady,
|
||||
IsInit: true,
|
||||
VerificationEnabled: false,
|
||||
ExternalRecoveryEnabled: false,
|
||||
LoginPolicy: "off",
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := Finish(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := config.ReadConfig()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if loaded.VerificationEnabled || loaded.ExternalRecoveryEnabled || loaded.LoginPolicy != "off" {
|
||||
t.Fatalf("explicit security options changed: verification %t, recovery %t, policy %q", loaded.VerificationEnabled, loaded.ExternalRecoveryEnabled, loaded.LoginPolicy)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFinishRepairsReadyConfigWithMissingPorts(t *testing.T) {
|
||||
|
||||
Reference in new issue
Block a user