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

fix(namespace): checknamespace name before actions

Browse source 
I keep the check server side because it's better from a security point of view.
This commit is contained in:
Adrien Raffin-Caboisse 2022-02-23 11:13:37 +01:00
parent 45727dbb21
commit 995731a29c
No known key found for this signature in database
GPG key ID: 7FB60532DEBEAD6A
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
namespaces.go
View file

@ -41,12 +41,11 @@ type Namespace struct {
// CreateNamespace creates a new Namespace. Returns error if could not be created // CreateNamespace creates a new Namespace. Returns error if could not be created
// or another namespace already exists. // or another namespace already exists.
func (h *Headscale) CreateNamespace(name string) (*Namespace, error) { func (h *Headscale) CreateNamespace(name string) (*Namespace, error) {
var err error err := CheckNamespaceName(name)
namespace := Namespace{}
name, err = NormalizeNamespaceName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
namespace := Namespace{}
if err := h.db.Where("name = ?", name).First(&namespace).Error; err == nil { if err := h.db.Where("name = ?", name).First(&namespace).Error; err == nil {
return nil, errNamespaceExists return nil, errNamespaceExists
} }
@ -66,7 +65,7 @@ func (h *Headscale) CreateNamespace(name string) (*Namespace, error) {
// DestroyNamespace destroys a Namespace. Returns error if the Namespace does // DestroyNamespace destroys a Namespace. Returns error if the Namespace does
// not exist or if there are machines associated with it. // not exist or if there are machines associated with it.
func (h *Headscale) DestroyNamespace(name string) error { func (h *Headscale) DestroyNamespace(name string) error {
name, err := NormalizeNamespaceName(name) err := CheckNamespaceName(name)
if err != nil { if err != nil {
return err return err
} }
@ -109,7 +108,7 @@ func (h *Headscale) RenameNamespace(oldName, newName string) error {
if err != nil { if err != nil {
return err return err
} }
newName, err = NormalizeNamespaceName(newName) err = CheckNamespaceName(newName)
if err != nil { if err != nil {
return err return err
} }
@ -132,11 +131,11 @@ func (h *Headscale) RenameNamespace(oldName, newName string) error {
// GetNamespace fetches a namespace by name. // GetNamespace fetches a namespace by name.
func (h *Headscale) GetNamespace(name string) (*Namespace, error) { func (h *Headscale) GetNamespace(name string) (*Namespace, error) {
namespace := Namespace{} err := CheckNamespaceName(name)
name, err := NormalizeNamespaceName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
namespace := Namespace{}
if result := h.db.First(&namespace, "name = ?", name); errors.Is( if result := h.db.First(&namespace, "name = ?", name); errors.Is(
result.Error, result.Error,
gorm.ErrRecordNotFound, gorm.ErrRecordNotFound,
@ -159,7 +158,7 @@ func (h *Headscale) ListNamespaces() ([]Namespace, error) {
// ListMachinesInNamespace gets all the nodes in a given namespace. // ListMachinesInNamespace gets all the nodes in a given namespace.
func (h *Headscale) ListMachinesInNamespace(name string) ([]Machine, error) { func (h *Headscale) ListMachinesInNamespace(name string) ([]Machine, error) {
name, err := NormalizeNamespaceName(name) err := CheckNamespaceName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -178,7 +177,7 @@ func (h *Headscale) ListMachinesInNamespace(name string) ([]Machine, error) {
// ListSharedMachinesInNamespace returns all the machines that are shared to the specified namespace. // ListSharedMachinesInNamespace returns all the machines that are shared to the specified namespace.
func (h *Headscale) ListSharedMachinesInNamespace(name string) ([]Machine, error) { func (h *Headscale) ListSharedMachinesInNamespace(name string) ([]Machine, error) {
name, err := NormalizeNamespaceName(name) err := CheckNamespaceName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -207,7 +206,7 @@ func (h *Headscale) ListSharedMachinesInNamespace(name string) ([]Machine, error
// SetMachineNamespace assigns a Machine to a namespace. // SetMachineNamespace assigns a Machine to a namespace.
func (h *Headscale) SetMachineNamespace(machine *Machine, namespaceName string) error { func (h *Headscale) SetMachineNamespace(machine *Machine, namespaceName string) error {
namespaceName, err := NormalizeNamespaceName(namespaceName) err := CheckNamespaceName(namespaceName)
if err != nil { if err != nil {
return err return err
} }