Fix deleting users

NHAS · Oct 17, 2024 · 09c3408 · 09c3408
1 parent 539e9b2
commit 09c3408
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/internal/router/firewall.go b/internal/router/firewall.go
@@ -370,9 +370,8 @@ func (f *Firewall) RemoveUser(username string) error {
 	delete(f.userPolicies, username)
 
 	for _, d := range f.userToDevices[username] {
-		delete(f.addressToPolicies, d.address)
-		delete(f.addressToDevice, d.address)
-		delete(f.deviceToUser, d.address)
+
+		f._removePeer(d.public.String(), d.address.String())
 	}
 	delete(f.userToDevices, username)
 

diff --git a/internal/router/wireguard.go b/internal/router/wireguard.go
@@ -551,7 +551,9 @@ func (f *Firewall) _removePeer(publickey, address string) error {
 
 	deviceToRemove, ok := f.addressToDevice[addressNetAddr]
 	if !ok {
-		return fmt.Errorf("device with address %q not found", address)
+		// If the device has already been removed, ignore this
+		// Happens if we delete a user, then etcd registers the device key has been deleted
+		return nil
 	}
 
 	delete(f.addressToPolicies, deviceToRemove.address)