[PR #170] [MERGED] Refactor: support multiple users under the same account #2588

New Issue

saavagebueno · 2025-11-20T07:11:45-05:00

saavagebueno commented

2025-11-20 07:11:45 -05:00

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/170
Author: @braginini
Created: 12/23/2021
Status: ✅ Merged
Merged: 12/27/2021
Merged by: @braginini

Base: main ← Head: multitenancy

📝 Commits (10+)

38a4c5c feature: add User entity to Account
7e29f26 test: new file store creation test
4a0b53c test: add FileStore persist-restore tests
ebf1cea test: add GetOrCreateAccountByUser Accountmanager test
a896c73 refactor: rename account manager users file
6518b5d refactor: use userId instead of accountId when handling Management HTTP API
cd648d1 fix: new account creation for every request
ac0f590 fix: golint
26f1bae chore: add account creator to Account Entity to identify who created the account.
935f1e9 chore: use xid ID generator for account IDs

📊 Changes

18 files changed (+699 additions, -107 deletions)

View changed files

📝 go.mod (+2 -0)
📝 go.sum (+2 -0)
📝 management/server/account.go (+43 -35)
📝 management/server/account_test.go (+32 -45)
📝 management/server/file_store.go (+22 -0)
➕ management/server/file_store_test.go (+171 -0)
📝 management/server/http/handler/peers.go (+13 -7)
📝 management/server/http/handler/setupkeys.go (+20 -14)
📝 management/server/http/handler/util.go (+2 -2)
➕ management/server/migration/README.md (+13 -0)
➕ management/server/migration/convert_accounts.go (+56 -0)
➕ management/server/migration/convert_accounts_test.go (+76 -0)
📝 management/server/network.go (+8 -0)
📝 management/server/peer.go (+2 -3)
📝 management/server/store.go (+1 -0)
📝 management/server/testdata/store.json (+11 -1)
➕ management/server/testdata/storev1.json (+154 -0)
➕ management/server/user.go (+71 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netbirdio/netbird/pull/170 **Author:** [@braginini](https://github.com/braginini) **Created:** 12/23/2021 **Status:** ✅ Merged **Merged:** 12/27/2021 **Merged by:** [@braginini](https://github.com/braginini) **Base:** `main` ← **Head:** `multitenancy` --- ### 📝 Commits (10+) - [`38a4c5c`](https://github.com/netbirdio/netbird/commit/38a4c5c10f4c9a4b54da8fae3db0087b713e7b05) feature: add User entity to Account - [`7e29f26`](https://github.com/netbirdio/netbird/commit/7e29f265418e5b006539ae8c0d8b27d260f436e5) test: new file store creation test - [`4a0b53c`](https://github.com/netbirdio/netbird/commit/4a0b53c277463c3ee80791cda05f4b12036947c2) test: add FileStore persist-restore tests - [`ebf1cea`](https://github.com/netbirdio/netbird/commit/ebf1ceac4f6a6e66fb6c14d278240ea3c7f5263f) test: add GetOrCreateAccountByUser Accountmanager test - [`a896c73`](https://github.com/netbirdio/netbird/commit/a896c7367a1b461fb0eea3dda6d5c53adfc3173a) refactor: rename account manager users file - [`6518b5d`](https://github.com/netbirdio/netbird/commit/6518b5d3effe1499884ca4619415be8e43294f88) refactor: use userId instead of accountId when handling Management HTTP API - [`cd648d1`](https://github.com/netbirdio/netbird/commit/cd648d1d9f8cb8878bf3dedd71e491f3ccfa8f13) fix: new account creation for every request - [`ac0f590`](https://github.com/netbirdio/netbird/commit/ac0f59000db32ca5893acc41c445e6a4919dce14) fix: golint - [`26f1bae`](https://github.com/netbirdio/netbird/commit/26f1baedd97dc7d2413fb2de9915b7de71c1fe04) chore: add account creator to Account Entity to identify who created the account. - [`935f1e9`](https://github.com/netbirdio/netbird/commit/935f1e9dc9fd76e56357a817060c1e1134a58079) chore: use xid ID generator for account IDs ### 📊 Changes **18 files changed** (+699 additions, -107 deletions) <details> <summary>View changed files</summary> 📝 `go.mod` (+2 -0) 📝 `go.sum` (+2 -0) 📝 `management/server/account.go` (+43 -35) 📝 `management/server/account_test.go` (+32 -45) 📝 `management/server/file_store.go` (+22 -0) ➕ `management/server/file_store_test.go` (+171 -0) 📝 `management/server/http/handler/peers.go` (+13 -7) 📝 `management/server/http/handler/setupkeys.go` (+20 -14) 📝 `management/server/http/handler/util.go` (+2 -2) ➕ `management/server/migration/README.md` (+13 -0) ➕ `management/server/migration/convert_accounts.go` (+56 -0) ➕ `management/server/migration/convert_accounts_test.go` (+76 -0) 📝 `management/server/network.go` (+8 -0) 📝 `management/server/peer.go` (+2 -3) 📝 `management/server/store.go` (+1 -0) 📝 `management/server/testdata/store.json` (+11 -1) ➕ `management/server/testdata/storev1.json` (+154 -0) ➕ `management/server/user.go` (+71 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

saavagebueno added the pull-request label 2025-11-20 07:11:45 -05:00

saavagebueno closed this issue

2025-11-20 07:11:45 -05:00

saavagebueno referenced this issue

2025-11-20 08:06:01 -05:00

[PR #2588] Update Go version to 1.23 #3434

Sign in to join this conversation.

Branches Tags

main

grpc-acl

reverse-proxy-allow-match-or

components-impl-drop-indexes-use-xids-no-resource-policy-map

fix-pgx-service-column-parity

revert/component-types

fix/nmap-relevant-groups

claude/model-cost-calculation-bug-9hic1n

agent-network-per-policy-model-allowlist

fix/ios-common-tunnel-notifier

fix/ui-windows-endsession-shutdown

force-routing-peer-dns-reverse-proxy

dependabot/go_modules/aws-sdk-8f849ebaed

dependabot/github_actions/actions-a940c7c866

dependabot/go_modules/otel-e34c790afd

dependabot/go_modules/gorm-2271c8195b

dependabot/go_modules/pion-5f703e1eca

dependabot/go_modules/testcontainers-de325c0dd6

dependabot/go_modules/wireguard-dbd6b95108

e2e-guardrail-blocks-unselected-model

fix/lazyconn-cold-start-allowed-ips

vertex-guardrails-model-access-e2e

add-atomic-cache-ops

dependabot/go_modules/github.com/aws/aws-sdk-go-v2/service/s3-1.106.0

refactor/relay-foreign-cache

ci/trigger-release-tests

claude/netbird-pr-6767-comments-c0qkci

feature/kimi-3-agent-networks-dns-warmup

feature/dns-lazy-conn-warmup

daemon-ipc-acl

feature/ui-translation-key-parity-check

refactor/relay-foreign-cache-tests

claude/kimi-3-agent-networks-3rpqnv

fix/remove-math-rand

fix/lazyconn-idle-keep-wg-peer

dmitri-propagate-auth-grant-types-on-combined

0.74.7-branch

diagnose-empty-vs-corrupt-state

windows-sleep-detector

fix/cli-up-wait-for-daemon

lazy-conn-rosenpass

lazy-conn-per-peer

rp_key_persistency

fix/routes_not_updated

feature/native-grpc

client-local-metrics

fix-ssh-authorized-users-multi-rule

0.74.6-branch

0.74.6-branch-sync

0.74.5-branch-sync

0.74.4-branch

fix/remove-stale-peers-removal

fix/remove-stale-proxy-logic

embedded-vnc

fix/nsis-preserve-autostart-on-upgrade

refactor/peer-event-bus

dependabot/go_modules/goauthentik.io/api/v3-3.2026050.3

dependabot/go_modules/github.com/pkg/sftp-1.13.10

components-impl-drop-indexes

fix-reset-aggregation-window-flake

dependabot/go_modules/github.com/pion/dtls/v3-3.1.5

peer-acl-multi-source

0.74.x

fix/relay-states-lock

update-process-pkg

update-gopsutil-v4

fix/relay_states_lock

increase-sysinfo-timeout

dependabot/npm_and_yarn/client/ui/frontend/npm_and_yarn-88714b13d0

dependabot/go_modules/github.com/Azure/go-ntlmssp-0.1.1

dependabot/go_modules/github.com/eko/gocache/store/redis/v4-4.2.6

dependabot/go_modules/github.com/eko/gocache/lib/v4-4.2.3

fix/fail-to-create-upnp-port-mapping-on-opnsense-firewall

0.74.3-branch

fix/routeselector-atomic-exit-node

netmap_progressive_alignment

nmap/components-impl

dependabot/go_modules/github.com/jackc/pgx/v5-5.9.2

dependabot/go_modules/github.com/oapi-codegen/runtime-1.4.2

dependabot/go_modules/github.com/gopacket/gopacket-1.6.1

dependabot/go_modules/github.com/coreos/go-oidc/v3-3.19.0

dependabot/go_modules/github.com/pires/go-proxyproto-0.12.0

fix/signal-watchdog-sync-stop

docs/agent-network

feature/ios-ssh

test/affected-logic

fix/revert-ice-filter

refactor/simplify-affected-peers

pascal-filter-policies-by-direction

claude/lock-contention-peer-connect-g8t6au

dmitri-filter-policies-by-direction

refactor/migrate-profiles-to-go

profile-bindings-ios

fix/skip-restart-unchanged-route

fix/mgmt-cache-async-resolve

refactor/wails-update-105

client_lifetime_serialization_refactor

fix/browser-ssh-2

fix/ipv6-and-netstack-accept-loop

fix/browser-ssh

profile-id-name-test

refactor/mgmt-bootstrap

mdm_integration

feat/getting-started-unified-wizard

socket-grpc-permissions

fix/mysql-index-migration

windows-dns-firewall

tests/enable-race-on-tests

ui-refactor-gtk3

feature/affected-peers-grpc

profile-id

lazyconn-first-packet-fix-v2

claude/focused-gates-VMTgb

ui-tray-linux-leftclick

fix/ctx-enrichment

daemon-owner

feature/android-client-ssh

worktree-accept-ra-forwarding

nmap/combined-deploy

task/align_protobuff_toolset

feature/session-extend

add-json-yaml-flags

refactor/ephemeral-cleanup

claude/webtransport-relay-wasm-mUjY9

claude/vnc-udp-feasibility-6KB1U

fix/wgport-config

e2e-windows-dns-combined

fix/login-cmd-root-flags

feat/reseller-openapi-spec

github-issue-resolver

add-steamos-support

fix-darwin-uninstaller

flutter-test

ci/freebsd-pkg-bootstrap

cached-serial-check-on-sync

fix-mgmt-cache-bypass-overlay

revert-easyjson-5938

revert-ice-5820

revert-firewalld-5928

refactor/permissions-manager

revert-dns-5935-systemd-resolved

revert-dns-5935-5945

revert-dns-5945-mgmt-cache

feature/log-most-busy-peers

prototype/ui-wails

coderabbitai/utg/8ae8f20

feature/use-peer-fqdn-on-https

release/0.68.3

add-slack-channel

claude/rdp-token-passthrough-eNcqW

transparent-proxy

fix/macos-stale-route-eexist

crowdsec-selfhosted

fix/remove-otel-units

entire/checkpoints/v1

fix/getting-started

feat/static-connectors-combined-server

feature/use-local-keys-embedded

feature/fleetdm

set-env-only-if-not-fork

feature/expose-has-channel

fix/connection-status-race

fix/filter-cgnat-cni-ice-candidates

feature/check-cert-locker-before-acme

test/proxy-fixes

test/proxy-mtu

prototype/ui-tauri

test/proxy-speed

fix-reused-ports

feat/migrate-to-embedded-idp

feature/add-serial-to-proxy-merged

deploy/proxy-serial

test/connection

feature/disable-legacy-port

feature/flag-to-disable-legacy-port

test/perftest

fix/http-redirect

poc-token-command

dn-reverse-proxy

prototype/reverse-proxy-rename

prototype/reverse-proxy-logs-pagination

feature/client-metrics

prototype/reverse-proxy-clusters

debug-dns-route

fix/win-dns-batch

add-extra-route-logs

job-stream-notify-disconnection-eof

deploy/secrets-manager

trigger-proxy-update

bug/update-ios-client-code-build-tags

sync-client-netmap-serial

log/conn-disconn

nmap/compaction-deploy

ci-win-test

feature/disk-encryption-check

wasm-debug

swap-dns-prio

fix/dex-config

feature/migrate-auto-groups-to-table

nmap/compaction

dex-nocgo-stub

feature/exclude-terraform-from-rate-limiting

test-freebsd

retries-refactor

coderabbitai/docstrings/b7e98ac

feat/integrate-zitadel

bug/ios-hanging-reconection

zitadel-idp

feat/network-map-serial

refactor/get-account-no-users

feat/auto-upgrade

feature/report-high-pat-id

feature/temporary-access-for-resource

fix/nmap-fwrules

dont-restart-dns

prototype/ui

update-gomobile

go-dns-for-ice

wasm-ldflags

test-ldflags

wasmbuild-test

feature/networks-s2s

vk/compare-nmaps

dbg/bothmaps

feature/changeset

reorder-dns-shutdown

fix/relay-reconnection-race

fix/nmap-exitnodes

vk/debug/nmap-both

move-licensed-code

feat/better-daemon-connection-lost-message

feat/auto-update-2

test/timings

refactor/getaccount-raw

tests/nmap-getaccount

refactor/nmap

refactor/nmap-limit-buffer

feature/detect-mac-wakeup

feature/extract-modules

quick-setings

feat/sync-limiter

feature/store-cache-impl

fix-install-version

feature/store-metrics

feature/metrics-on-store

feature/use-gorm-cache

loadtest-signal

unsymmetrical-squash

refactor/reducate-signaling

test/update-reduce

feature/store-cache

feature/remote-debug

cli-ws-proxy-backend-addr

feat/mgmt-map-serial

snyk-fix-d9d0081a4c7f9137bdb59d0d50a141a2

snyk-fix-7415cea5a11acd66753540ca2c598c63

job-yml-update

feature/android-allow-selecting-routes

fix/up-sequence

fix/dns-hash-update

snyk-fix-967adae9863f17f108ce8948d9117b8d

log/getaccount-by-peer

signal-suppressor

dns-exit-node

feature/auto-updates

feature/cache-srv-key

merged-fixes

fix/missed-offers-and-debug

debug-and-fixes

poc-wasm-clean-backend-s2s

test/remote-debug

debug-api

fix/remove-gpo-if-empty

fix/test-freebsd

fix/mysql-setup

fix/remove-logout-btn

handle-existing-domain-user

chore/unify-domain-validation

snyk-fix-c5fafc8a50ce1f29046e25a1fc346185

feat/profile-edit-btn

snyk-fix-a54966211e18d4cf67e5a2757cc006d1

log-short-id

feat/logout-ephemeral

log-checks

batch-wg-ops

nb-interface-default

feat/aws-integration

add/race-test

feature/relay-feature-versioning

fix/systemd-service-logs

poc/preprocessed-map

add-account-onboarding

bind-ipv6

fix/merge-main

logs/peerlogs-addpeer

feature/net-297-network-migration

feature/support-skip-auto-apply-exit-node-routes

set-cmd

set-command-with-cursor

feature/limit-update-channel

stop-using-locking-share

feature/poc-lazy-detection

feature/net-248-removal-of-sync-mutex-locks

test/multiple-peer-logging

preresolve

add-ns-punnycode-support

apply-routes-early

windows-search-domains

fix/connecting-route-filter

feature/management/rest-client/impersonate

debug-local-records

resource-fields-snake-case

test/grpc-rate-limit

traffic-correlation-policy

feature/rest-client-options

feat/events-metrics

feature/buf-cli

test/add-ratelimiter

test/remove-write-lock-on-add-peer

fix/add-peer-semaphore

feature/users-roles-endpoint

mlsmaycon-patch-1

debug-user-role

chore/primary-key-on-networks

feature/update-account-peers-buffer-startup

remove-ubuntu2004-runners

refactor/permissions-no-pat-allowed

ref/logrus-factory

use-conntrack-zone

deploy/permissions-account

feature/lazy-connection-idle

ref/improve-test-cov

restore-pr-3440

test/increase-grpc-timeouts

feat/buffer-account-peers-update

test/networkmapgeneration-changes

feature/base-manager

feature/flow-receiver

chore/benchmark-with-large-runner

refactor/handshake-initiator

client/ui-update-systray-icons

userspace-router

wgwatcher-test

output-if-key-already-exists

fix/relay-reconnection

feature/port-forwarding-client-codecleaning

detached2

test/callbacks-nil-iceconninfo

refactor/optimize-peer-expiration

enable-udp-port-for-docker-template

fix/relay-update

feature/apply-posture-netmap

fix/group-update-existing-resource

conntrack-stats

upgrade-okta-sdk

multi-price

test/conn-stat

set-min-parallel-tests-for-management

dns-interceptor

debug-dns

router-dns

add-static-system-info

debug-0.29.4

debug-0.33.0

account-refactoring

relay/2800_quic

route-get-account-refactoring

test/seed-random-routes

feature/get-account-refactoring

test/reconnect-race-condition

refactor/get-account-usage

feature/add-session-id-to-update-channel

improve-ipv4conn

fix/async-pion-event-handling

debug

add-offload

feature/validate-group-association-debug

fix/limit-conn-for-sqlite

test/engine-iface

test/transaction-for-jwt-sync

fix/engine-stop-in-foreground

feature/add-mysql-support

test-migration

refactor/header-size-values

relay/eliminate-gob

test/signal-dispatcher-with-relay

relay/debug

validate-icon

feature/ipv6-support

use-pre-expanded-peers-map

feature/use-signal-dispatcher

validate/peer-status

add-read-write-times

fix/sync-peer-race

feature/relay-status

netmap

evaluate/network-map-hash

fix/lower-dns-resolve-interval-on-fail

feature/relay

fix/go-mod-version

upgrade-nftables

synology-userspace-mode

fix/use-ip-for-default-routes-on-darwin

fix/proxy_close

enable-release-workflow-on-pr

deploy/peer-performance

feature/permanent-turn

feature/permanent-turn-proxy

deploy/posture-check-sqlite

feature/optimize_sqlite_save

debug-ios-behavior

fix/delete-route-only-after-adding

tshoot/windows-logger

remove-new-routing

refactor/eliminate-repo-dependency

add-arm-to-ci

refactor-demo-account-object

test/abc2

test/abc

send-ssh-rosenpass-config-meta

refactor-demo

ensure-schedule-never-runs-non-positive

feature/peer-validator-groupmgm

feature/peer-validator-fix

fix/include-active-dashboard-users

fix/handle-canceling-schedule

fix/geo-download

debug-google-workspace

yury/resolve-ip-to-location

feature/extend-sysinfo

sqlite-async-peer-status

yury/add-postgresql-store

fix/route

test-build

posture-checks-poc

debug-keycloak-idp

poc/netstack

for-pascal-tmp

peer-logout-management

manual-peer-logout

detached

chore/refactor-management

test/dns-bind

fix/enforce-acl-for-containers

yury/use-sync-map-in-updatechannel

fix/events-key-handling

filter-cache-on-load-account

fix/user-expiration

handle-user-context-cancellation

nb-client-k8s-statefulset

fake-addr

fix/iptables_in_docker

ebpf-debug

update-getting-started-flow-use-postgres

fix/peer_list_notification

feature/device-authentication-with-client-secret

feature/keep_alive

feat-groups-from-jwt

separate_proxy_from_wgconfig

fix/wg_conn

wg_conn_fix

wg_bind_parallel_processing

fix-rollback-get-acls

proxy_cfg_cleanup

performance-improvement-rego

update-lock-log-level

feat-client-side-acl

refactor/move_grpcserver_logic_to_account_manager

feature/event-storage

feature/update-idp-redeeming-invite

feature/api-peer-info

return-groupminimum-setupkey

feature/interface-bind

documentation_enhancement

fix-peer-registration

ssh

users_cache

pass-client-caller

client_caller_type

revert-283-feat-fix-windows-installer

periodic-peer-updates

ebpf

braginini/wasm

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: SVI/netbird#2588