moul/sshportal
1
1
Fork 0
mirror of https://github.com/moul/sshportal.git synced 2025-09-11 23:24:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: host inspect causes db errors with later operations

Browse source 
The most simple case with a fresh install of sshportal using the
following commands put the shell into a unrecoverable state.

config> host create test1@test1
1
config> host inspect 1
config> host create test2@test2
error: can't preload field Groups for dbmodels.SSHKey

The issue is caused because the global db handle is replaced with the
inspect command.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
This commit is contained in:
Jason Wessel 2021-03-01 07:37:15 -08:00
parent 762736d622
commit 3c32177213
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/bastion/shell.go
View file

@ -828,12 +828,14 @@ GLOBAL OPTIONS:
} }
var hosts []*dbmodels.Host var hosts []*dbmodels.Host
db = db.Preload("Groups")
if myself.HasRole("admin") { if myself.HasRole("admin") {
db = db.Preload("SSHKey") if err := dbmodels.HostsByIdentifiers(db.Preload("Groups").Preload("SSHKey"), c.Args()).Find(&hosts).Error; err != nil {
} return err
if err := dbmodels.HostsByIdentifiers(db, c.Args()).Find(&hosts).Error; err != nil { }
return err } else {
if err := dbmodels.HostsByIdentifiers(db.Preload("Groups"), c.Args()).Find(&hosts).Error; err != nil {
return err
}
} }
if c.Bool("decrypt") { if c.Bool("decrypt") {