sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-25 16:19:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add per-connection user-approval prompts for VNC

Browse Source
This commit is contained in:
Viktor Liu
2026-05-23 18:33:55 +02:00
parent c29ef638f4
commit 8e72967bbe
38 changed files with 2183 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/http/handlers/peers/peers_handler.go
+29
View File
@@ -22,6 +22,7 @@ import (
"github.com/netbirdio/netbird/management/server/permissions/modules"
"github.com/netbirdio/netbird/management/server/permissions/operations"
"github.com/netbirdio/netbird/management/server/types"
"github.com/netbirdio/netbird/shared/auth"
"github.com/netbirdio/netbird/shared/management/http/api"
"github.com/netbirdio/netbird/shared/management/http/util"
"github.com/netbirdio/netbird/shared/management/status"
@@ -525,6 +526,7 @@ func (h *Handler) CreateTemporaryAccess(w http.ResponseWriter, r *http.Request)
return
}
policy.Rules[0].SessionPubKey = pubKey
policy.Rules[0].SessionDisplayName = h.displayNameForUser(r.Context(), userAuth)
}
_, err = h.accountManager.SavePolicy(r.Context(), userAuth.AccountId, userAuth.UserId, policy, true)
@@ -744,3 +746,30 @@ func peerIPv6String(peer *nbpeer.Peer) *string {
s := peer.IPv6.String()
return &s
}
// displayNameForUser returns a human-readable label for the requesting
// user suitable for a VNC approval prompt. Tries the IdP-resolved
// UserInfo first (carries name / email management caches from the
// identity provider) and falls through to JWT claims, then user id.
// Errors from the lookup don't fail the request; we just degrade.
func (h *Handler) displayNameForUser(ctx context.Context, u auth.UserAuth) string {
if info, err := h.accountManager.GetCurrentUserInfo(ctx, u); err == nil && info != nil {
switch {
case info.UserInfo != nil && info.UserInfo.Name != "":
return info.UserInfo.Name
case info.UserInfo != nil && info.UserInfo.Email != "":
return info.UserInfo.Email
}
} else if err != nil {
log.WithContext(ctx).Debugf("display name: GetCurrentUserInfo: %v", err)
}
switch {
case u.PreferredName != "":
return u.PreferredName
case u.Name != "":
return u.Name
case u.Email != "":
return u.Email
}
return u.UserId
}