From 28f10997472f0ee4c69eddf36fb61b895249c24d Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Mon, 31 Dec 2018 11:53:17 -0800 Subject: [PATCH] fix config name --- sshpiperd/upstream/workingdir/config.go | 2 +- sshpiperd/upstream/workingdir/workingdir.go | 8 ++++---- sshpiperd/upstream/workingdir/workingdir_test.go | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sshpiperd/upstream/workingdir/config.go b/sshpiperd/upstream/workingdir/config.go index bddec46a..bb217529 100644 --- a/sshpiperd/upstream/workingdir/config.go +++ b/sshpiperd/upstream/workingdir/config.go @@ -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"` }{} ) diff --git a/sshpiperd/upstream/workingdir/workingdir.go b/sshpiperd/upstream/workingdir/workingdir.go index f251d64f..4cb34340 100644 --- a/sshpiperd/upstream/workingdir/workingdir.go +++ b/sshpiperd/upstream/workingdir/workingdir.go @@ -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 } diff --git a/sshpiperd/upstream/workingdir/workingdir_test.go b/sshpiperd/upstream/workingdir/workingdir_test.go index 804d5087..f41416c7 100644 --- a/sshpiperd/upstream/workingdir/workingdir_test.go +++ b/sshpiperd/upstream/workingdir/workingdir_test.go @@ -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")