SUNET/net-ops
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix race where password was printed on screen

Browse source
This commit is contained in:
Patrik Holmqvist 2025-01-17 09:31:33 +01:00
parent 37ae0c2d7b
commit c4efcfec0a
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect
View file

@ -8,8 +8,12 @@ spawn dsmc restore /opt/backup-test/ /opt/restore-target/ -asnodename=$nodename
expect "Action \\\[1,2,3,A\\\] : " {
send -- "1\r"
expect -exact "Enter encryption key password: "
# Some times the password shows up in the output,
# we suspect this is a race condition with turning of echo for the tty, so sleep
sleep 1
send -- "$enc_password\r"
expect -exact "Confirm encryption key password: "
sleep 1
send -- "$enc_password\r"
}
expect "ANS8013I Invalid encryption key password" {

11
global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-successful-restore.expect
View file

@ -6,11 +6,14 @@ set exit_val 1
spawn dsmc restore /opt/backup-test/ /opt/restore-target/ -asnodename=$nodename -subdir=yes
expect "Action \\\[1,2,3,A\\\] : " {
send -- "1\r"
expect -exact "Enter encryption key password: " {
send -- "1\r"
expect -exact "Enter encryption key password: "
# Sometimes the password shows up in the output,
# we suspect this is a race condition with turning of echo for the tty, so sleep
sleep 1
send -- "$enc_password\r"
}
expect -exact "Confirm encryption key password: " {
expect -exact "Confirm encryption key password: "
sleep 1
send -- "$enc_password\r"
}
expect "Restore processing finished." {