myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge pull request #176 from cure/fix-sharing-check

Browse source 
Bugfix: the check to see if a node was already shared into a namespace
This commit is contained in:
Juan Font 2021-10-18 12:34:04 +02:00 committed by GitHub
commit b4e6a32b4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sharing.go
View file

@ -21,12 +21,15 @@ func (h *Headscale) AddSharedMachineToNamespace(m *Machine, ns *Namespace) error
return errorSameNamespace return errorSameNamespace
} }
sharedMachine := SharedMachine{} sharedMachines := []SharedMachine{}
if err := h.db.Where("machine_id = ? AND namespace_id", m.ID, ns.ID).First(&sharedMachine).Error; err == nil { if err := h.db.Where("machine_id = ? AND namespace_id = ?", m.ID, ns.ID).Find(&sharedMachines).Error; err != nil {
return err
}
if len(sharedMachines) > 0 {
return errorMachineAlreadyShared return errorMachineAlreadyShared
} }
sharedMachine = SharedMachine{ sharedMachine := SharedMachine{
MachineID: m.ID, MachineID: m.ID,
Machine: *m, Machine: *m,
NamespaceID: ns.ID, NamespaceID: ns.ID,