fix(agent/agentssh): check for hushlogin via afero fs (#8358)

mafredri · web-flow · commit 34c3f919dcb3 · 2023-07-07T13:30:23.000+03:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -358,7 +358,7 @@ func (s *Server) startPTYSession(session ptySession, magicTypeLabel string, cmd
 		}
 	}
 
-	if !isQuietLogin(session.RawCommand()) {
+	if !isQuietLogin(s.fs, session.RawCommand()) {
 		manifest := s.Manifest.Load()
 		if manifest != nil {
 			err := showMOTD(s.fs, session, manifest.MOTDFile)
@@ -763,7 +763,7 @@ func isLoginShell(rawCommand string) bool {
 // isQuietLogin checks if the SSH server should perform a quiet login or not.
 //
 // https://github.com/openssh/openssh-portable/blob/25bd659cc72268f2858c5415740c442ee950049f/session.c#L816
-func isQuietLogin(rawCommand string) bool {
+func isQuietLogin(fs afero.Fs, rawCommand string) bool {
 	// We are always quiet unless this is a login shell.
 	if !isLoginShell(rawCommand) {
 		return true
@@ -776,7 +776,7 @@ func isQuietLogin(rawCommand string) bool {
 		return false
 	}
 
-	_, err = os.Stat(filepath.Join(homedir, ".hushlogin"))
+	_, err = fs.Stat(filepath.Join(homedir, ".hushlogin"))
 	return err == nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ func (s *Server) startPTYSession(session ptySession, magicTypeLabel string, cmd`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
`361`		`- if !isQuietLogin(session.RawCommand()) {`
	`361`	`+ if !isQuietLogin(s.fs, session.RawCommand()) {`
`362`	`362`	`manifest := s.Manifest.Load()`
`363`	`363`	`if manifest != nil {`
`364`	`364`	`err := showMOTD(s.fs, session, manifest.MOTDFile)`
`@@ -763,7 +763,7 @@ func isLoginShell(rawCommand string) bool {`
`763`	`763`	`// isQuietLogin checks if the SSH server should perform a quiet login or not.`
`764`	`764`	`//`
`765`	`765`	`// https://github.com/openssh/openssh-portable/blob/25bd659cc72268f2858c5415740c442ee950049f/session.c#L816`
`766`		`-func isQuietLogin(rawCommand string) bool {`
	`766`	`+func isQuietLogin(fs afero.Fs, rawCommand string) bool {`
`767`	`767`	`// We are always quiet unless this is a login shell.`
`768`	`768`	`if !isLoginShell(rawCommand) {`
`769`	`769`	`return true`
`@@ -776,7 +776,7 @@ func isQuietLogin(rawCommand string) bool {`
`776`	`776`	`return false`
`777`	`777`	`}`
`778`	`778`
`779`		`- _, err = os.Stat(filepath.Join(homedir, ".hushlogin"))`
	`779`	`+ _, err = fs.Stat(filepath.Join(homedir, ".hushlogin"))`
`780`	`780`	`return err == nil`
`781`	`781`	`}`
`782`	`782`