mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-28 10:51:44 +01:00 
			
		
		
		
	Fix new version of hujson
This commit is contained in:
		
							parent
							
								
									204f99dd51
								
							
						
					
					
						commit
						3ad2350c79
					
				
							
								
								
									
										9
									
								
								acls.go
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								acls.go
									
									
									
									
									
								
							| @ -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 | ||||
| 	} | ||||
|  | ||||
| @ -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 | ||||
| 	} | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user