engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix config name

Browse source
This commit is contained in:
Boshi Lian 2018-12-31 11:53:17 -08:00
parent bc1afde4b8
commit 28f1099747
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sshpiperd/upstream/workingdir/config.go
View file

@ -5,6 +5,6 @@ var (
WorkingDir string `long:"upstream-workingdir" default:"/var/sshpiper" description:"Path to workingdir" env:"SSHPIPERD_UPSTREAM_WORKINGDIR" ini-name:"upstream-workingdir"`
AllowBadUsername bool `long:"upstream-workingdir-allowbadusername" description:"Disable username check while search the working dir" env:"SSHPIPERD_UPSTREAM_WORKINGDIR_ALLOWBADUSERNAME" ini-name:"upstream-workingdir-allowbadusername"`
NoCheckPerm bool `long:"upstream-workingdir-nocheckperm" description:"Disable 0400 checking when using files in the working dir" env:"SSHPIPERD_UPSTREAM_WORKINGDIR_NOCHECKPERM" ini-name:"upstream-workingdir-nocheckperm"`
FallbackUSername string `long:"upstream-workingdir-fallbackusername" description:"Fallback to a user when user does not exists in directory" env:"SSHPIPERD_UPSTREAM_WORKINGDIR_FALLBACKUSERNAME" ini-name:"upstream-workingdir-fallbackusername"`
FallbackUsername string `long:"upstream-workingdir-fallbackusername" description:"Fallback to a user when user does not exists in directory" env:"SSHPIPERD_UPSTREAM_WORKINGDIR_FALLBACKUSERNAME" ini-name:"upstream-workingdir-fallbackusername"`
}{}
)

8
sshpiperd/upstream/workingdir/workingdir.go
View file

@ -131,9 +131,9 @@ func findUpstreamFromUserfile(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, e
err := userUpstreamFile.checkPerm(user)
if os.IsNotExist(err) && len(config.FallbackUSername) > 0 {
if os.IsNotExist(err) && len(config.FallbackUsername) > 0 {
err = nil
user = config.FallbackUSername
user = config.FallbackUsername
} else if err != nil {
return nil, nil, err
}
@ -189,9 +189,9 @@ func mapPublicKeyFromUserfile(conn ssh.ConnMetadata, key ssh.PublicKey) (signer
err = userAuthorizedKeysFile.checkPerm(user)
if os.IsNotExist(err) && len(config.FallbackUSername) > 0 {
if os.IsNotExist(err) && len(config.FallbackUsername) > 0 {
err = nil
user = config.FallbackUSername
user = config.FallbackUsername
} else if err != nil {
return nil, err
}

8
sshpiperd/upstream/workingdir/workingdir_test.go
View file

@ -243,14 +243,14 @@ func TestFindUpstreamFromUserfile(t *testing.T) {
}
t.Logf("testing user not found")
config.FallbackUSername = ""
config.FallbackUsername = ""
_, _, err = findUpstreamFromUserfile(stubConnMetadata{"nosuchuser"})
if err == nil {
t.Fatalf("should return err when finding nosuchuser")
}
t.Logf("testing user not found fallback")
config.FallbackUSername = user
config.FallbackUsername = user
_, _, err = findUpstreamFromUserfile(stubConnMetadata{"nosuchuser"})
if err != nil {
@ -305,14 +305,14 @@ func TestMapPublicKeyFromUserfile(t *testing.T) {
}
t.Logf("testing user not found")
config.FallbackUSername = ""
config.FallbackUsername = ""
_, err = mapPublicKeyFromUserfile(stubConnMetadata{"nosuchuser"}, publicKey)
if err == nil {
t.Fatalf("should return err when mapping from nosuchuser")
}
t.Logf("testing user not found fallback")
config.FallbackUSername = user
config.FallbackUsername = user
_, err = mapPublicKeyFromUserfile(stubConnMetadata{"nosuchuser"}, publicKey)
if err != nil {
t.Fatalf("should return fallbackuser")