Fix new version of hujson

This commit is contained in:
Kristoffer Dalby 2021-11-05 07:24:00 +00:00
parent 204f99dd51
commit 3ad2350c79
2 changed files with 16 additions and 2 deletions

View file

@ -38,7 +38,14 @@ func (h *Headscale) LoadACLPolicy(path string) error {
if err != nil {
return err
}
err = hujson.Unmarshal(b, &policy)
ast, err := hujson.Parse(b)
if err != nil {
return err
}
ast.Standardize()
b = ast.Pack()
err = json.Unmarshal(b, &policy)
if err != nil {
return err
}

View file

@ -1,6 +1,7 @@
package headscale
import (
"encoding/json"
"strings"
"github.com/tailscale/hujson"
@ -43,7 +44,13 @@ type ACLTest struct {
func (h *Hosts) UnmarshalJSON(data []byte) error {
hosts := Hosts{}
hs := make(map[string]string)
err := hujson.Unmarshal(data, &hs)
ast, err := hujson.Parse(data)
if err != nil {
return err
}
ast.Standardize()
data = ast.Pack()
err = json.Unmarshal(data, &hs)
if err != nil {
return err
}