mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-26 00:29:06 +02:00
Surface VNC initiator in status, clarify proxy logs, dampen capture noise
This commit is contained in:
@@ -68,7 +68,7 @@ func (s *Server) handleServiceConnection(conn net.Conn, sa sessionAgent) {
|
||||
return
|
||||
}
|
||||
|
||||
authedLog, _, ok := s.authorizeSession(conn, header, connLog)
|
||||
authedLog, sessionUserID, ok := s.authorizeSession(conn, header, connLog)
|
||||
if !ok {
|
||||
authedLog.Info("VNC connection rejected: auth failed")
|
||||
return
|
||||
@@ -101,6 +101,19 @@ func (s *Server) handleServiceConnection(conn net.Conn, sa sessionAgent) {
|
||||
return
|
||||
}
|
||||
|
||||
var initiator string
|
||||
if s.authorizer != nil {
|
||||
initiator = s.authorizer.LookupSessionDisplayName(header.clientStatic)
|
||||
}
|
||||
sessionID := s.addSession(ActiveSessionInfo{
|
||||
RemoteAddress: conn.RemoteAddr().String(),
|
||||
Mode: modeString(header.mode),
|
||||
Username: header.username,
|
||||
UserID: sessionUserID,
|
||||
Initiator: initiator,
|
||||
}, conn)
|
||||
defer s.removeSession(sessionID)
|
||||
|
||||
replayConn := &prefixConn{
|
||||
Reader: io.MultiReader(&headerBuf, conn),
|
||||
Conn: conn,
|
||||
@@ -198,8 +211,8 @@ func proxyToAgent(ctx context.Context, client net.Conn, socketPath, authToken st
|
||||
log.Debugf("proxy %s: %d bytes, err=%v", label, n, err)
|
||||
done <- struct{}{}
|
||||
}
|
||||
go cp("client→agent", agentConn, client)
|
||||
go cp("agent→client", client, agentConn)
|
||||
go cp("client->agent", agentConn, client)
|
||||
go cp("agent->client", client, agentConn)
|
||||
<-done
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -445,6 +445,14 @@ type captureWorker struct {
|
||||
lastDesktop string
|
||||
nextInitRetry time.Time
|
||||
cursor cursorSampler
|
||||
// lastBackend records the last capturer kind that came out of
|
||||
// createCapturer ("dxgi" or "gdi"); used to demote repeat "using X"
|
||||
// and DXGI-unavailable logs to debug when nothing changed.
|
||||
lastBackend string
|
||||
// lastDXGIErr is the textual DXGI failure printed in the most recent
|
||||
// fallback warning; suppresses repeat warns when DXGI keeps failing
|
||||
// the same way across desktop changes (login -> lock -> login).
|
||||
lastDXGIErr string
|
||||
}
|
||||
|
||||
// handleNextRequest waits for either shutdown or a capture request and runs
|
||||
@@ -503,9 +511,14 @@ func (w *captureWorker) prepCapturer() (frameCapturer, error) {
|
||||
w.cap = fc
|
||||
sw, sh := screenSize()
|
||||
w.c.mu.Lock()
|
||||
sizeChanged := w.c.w != sw || w.c.h != sh
|
||||
w.c.w, w.c.h = sw, sh
|
||||
w.c.mu.Unlock()
|
||||
log.Infof("screen capturer ready: %dx%d", sw, sh)
|
||||
if sizeChanged {
|
||||
log.Infof("screen capturer ready: %dx%d", sw, sh)
|
||||
} else {
|
||||
log.Debugf("screen capturer ready: %dx%d", sw, sh)
|
||||
}
|
||||
return w.cap, nil
|
||||
}
|
||||
|
||||
@@ -536,15 +549,32 @@ func (w *captureWorker) refreshDesktop() error {
|
||||
func (w *captureWorker) createCapturer() (frameCapturer, error) {
|
||||
dc, err := newDXGICapturer()
|
||||
if err == nil {
|
||||
log.Info("using DXGI Desktop Duplication for capture")
|
||||
if w.lastBackend != "dxgi" {
|
||||
log.Info("using DXGI Desktop Duplication for capture")
|
||||
} else {
|
||||
log.Debug("using DXGI Desktop Duplication for capture")
|
||||
}
|
||||
w.lastBackend = "dxgi"
|
||||
w.lastDXGIErr = ""
|
||||
return dc, nil
|
||||
}
|
||||
log.Warnf("DXGI Desktop Duplication unavailable, falling back to slower GDI BitBlt: %v", err)
|
||||
errStr := err.Error()
|
||||
if errStr != w.lastDXGIErr {
|
||||
log.Warnf("DXGI Desktop Duplication unavailable, falling back to slower GDI BitBlt: %v", err)
|
||||
w.lastDXGIErr = errStr
|
||||
} else {
|
||||
log.Debugf("DXGI Desktop Duplication still unavailable, falling back to slower GDI BitBlt: %v", err)
|
||||
}
|
||||
gc, err := newGDICapturer()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
log.Info("using GDI BitBlt for capture")
|
||||
if w.lastBackend != "gdi" {
|
||||
log.Info("using GDI BitBlt for capture")
|
||||
} else {
|
||||
log.Debug("using GDI BitBlt for capture")
|
||||
}
|
||||
w.lastBackend = "gdi"
|
||||
return gc, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -246,6 +246,10 @@ type ActiveSessionInfo struct {
|
||||
// UserID is the authenticated session identity (hashed user ID from
|
||||
// the Noise_IK static-key registration), empty when auth is disabled.
|
||||
UserID string
|
||||
// Initiator is the dashboard-supplied display name of the user who
|
||||
// minted the SessionPubKey, when known. Empty when auth is disabled
|
||||
// or the authorizer has no display-name mapping.
|
||||
Initiator string
|
||||
}
|
||||
|
||||
// vncSession provides capturer and injector for a virtual display session.
|
||||
@@ -852,11 +856,16 @@ func (s *Server) handleConnection(conn net.Conn) {
|
||||
return
|
||||
}
|
||||
|
||||
var initiator string
|
||||
if s.authorizer != nil {
|
||||
initiator = s.authorizer.LookupSessionDisplayName(header.clientStatic)
|
||||
}
|
||||
sessionID := s.addSession(ActiveSessionInfo{
|
||||
RemoteAddress: conn.RemoteAddr().String(),
|
||||
Mode: modeString(header.mode),
|
||||
Username: header.username,
|
||||
UserID: sessionUserID,
|
||||
Initiator: initiator,
|
||||
}, conn)
|
||||
defer s.removeSession(sessionID)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user