Github/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-30 18:41:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Leave the VNC approver nil when there is no broker to ask

Browse Source
This commit is contained in:
Viktor Liu
2026-08-29 13:49:47 +02:00
parent 9672e04ce6
commit 8d6b7b6175
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/internal/engine_vnc.go
View File

@@ -133,6 +133,16 @@ func (e *Engine) startVNCServer() error {
log.Info("VNC: running as system service, enabling service mode (per-session agent proxy)")
}
requireApproval := e.config.DisableVNCApproval == nil || !*e.config.DisableVNCApproval
// Left nil when there is no broker to ask, so the server's own
// no-approver refusal runs and the client is told which of the two it hit.
// Wrapping a nil broker still denies, because Broker.Request reports one as
// an error, but it denies as "approval denied" and hides the real reason.
var approver vncserver.Approver
if e.approvalBroker != nil {
approver = &vncApprover{broker: e.approvalBroker, statusRecorder: e.statusRecorder}
}
srv := vncserver.New(vncserver.Config{
Capturer: capturer,
Injector: injector,
@@ -141,7 +151,7 @@ func (e *Engine) startVNCServer() error {
SessionRecorder: sessionRecorder,
NetstackNet: e.wgInterface.GetNet(),
RequireApproval: requireApproval,
Approver: &vncApprover{broker: e.approvalBroker, statusRecorder: e.statusRecorder},
Approver: approver,
// Session start/stop is invisible to the peer status recorder, so push a
// snapshot ourselves; otherwise the UI's session list goes stale until an
// unrelated peer change happens to fire one.