sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-24 16:41:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[android] keep SSH endpoints out of the logs

Browse Source 
The connect path logged the target host, port and username at info level,
which the guidelines reserve for debug and below.

Drop the two connect messages entirely rather than lowering them: both sat
directly in front of a return, so the same error already reaches the caller
and the terminal, and OnConnected reports the success. Keep the detected
server type, since it decides the auth path, but log it without the
endpoint.
This commit is contained in:
Zoltán Papp
2026-08-11 15:09:31 +02:00
parent a33e981c26
commit c4c8e2fe1e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/android/ssh_client.go
View File

@@ -132,7 +132,7 @@ func (s *SSHClient) Connect(host string, port int, user, password string) error
}
serverType := detectServerType(host, port)
log.Infof("SSH server type for %s:%d: %s", host, port, serverType)
log.Debugf("SSH server type: %s", serverType)
authMethods, hostKeyCallback, err := s.buildAuth(cfg, engine, serverType, password)
if err != nil {
@@ -155,7 +155,6 @@ func (s *SSHClient) Connect(host string, port int, user, password string) error
return errPasswordRequired
}
if err != nil {
log.Infof("SSH: connect to %s:%d failed: %v", host, port, err)
return rootCause(err)
}
return nil
@@ -414,8 +413,6 @@ func (s *SSHClient) requestJWTToken(cfg *profilemanager.Config) (string, error)
func (s *SSHClient) dialAndHandshake(host string, port int, clientConfig *gossh.ClientConfig) error {
addr := net.JoinHostPort(host, strconv.Itoa(port))
log.Infof("SSH: connecting to %s as %s", addr, clientConfig.User)
ctx, cancel := context.WithTimeout(context.Background(), sshDialTimeout)
defer cancel()
@@ -438,7 +435,6 @@ func (s *SSHClient) dialAndHandshake(host string, port int, clientConfig *gossh.
listener := s.listener
s.mu.Unlock()
log.Infof("SSH: connected to %s", addr)
if listener != nil {
listener.OnConnected()
}
@@ -513,7 +509,7 @@ func detectServerType(host string, port int) detection.ServerType {
dialer := &net.Dialer{}
serverType, err := detection.DetectSSHServerType(ctx, dialer, host, port)
if err != nil {
log.Debugf("ssh: server detection for %s:%d failed: %v (assuming regular SSH)", host, port, err)
log.Debugf("ssh: server detection failed: %v (assuming regular SSH)", err)
return detection.ServerTypeRegular
}
return serverType