zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 09:22:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

validation now working

Browse Source
This commit is contained in:
afeiszli
2021-04-27 14:41:05 -04:00
parent 7905f09849
commit 3f84ea493f
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/netmaker.hosts Normal file
View File

@@ -0,0 +1,3 @@
10.10.10.1 netmaker.default
192.10.30.1 .default .skynet
10.70.0.1 node-0qk6r.skynet

28
controllers/dnsHttpController.go
View File

@@ -24,6 +24,7 @@ func dnsHandlers(r *mux.Router) {
r.HandleFunc("/api/dns/adm/{network}/custom", securityCheck(http.HandlerFunc(getCustomDNS))).Methods("GET") r.HandleFunc("/api/dns/adm/{network}/custom", securityCheck(http.HandlerFunc(getCustomDNS))).Methods("GET")
r.HandleFunc("/api/dns/adm/{network}", securityCheck(http.HandlerFunc(getDNS))).Methods("GET") r.HandleFunc("/api/dns/adm/{network}", securityCheck(http.HandlerFunc(getDNS))).Methods("GET")
r.HandleFunc("/api/dns/{network}", securityCheck(http.HandlerFunc(createDNS))).Methods("POST") r.HandleFunc("/api/dns/{network}", securityCheck(http.HandlerFunc(createDNS))).Methods("POST")
r.HandleFunc("/api/dns/adm/pushdns", securityCheck(http.HandlerFunc(pushDNS))).Methods("POST")
r.HandleFunc("/api/dns/{network}/{domain}", securityCheck(http.HandlerFunc(deleteDNS))).Methods("DELETE") r.HandleFunc("/api/dns/{network}/{domain}", securityCheck(http.HandlerFunc(deleteDNS))).Methods("DELETE")
r.HandleFunc("/api/dns/{network}/{domain}", securityCheck(http.HandlerFunc(updateDNS))).Methods("PUT") r.HandleFunc("/api/dns/{network}/{domain}", securityCheck(http.HandlerFunc(updateDNS))).Methods("PUT")
} }
@@ -401,11 +402,28 @@ func DeleteDNS(domain string, network string) (bool, error) {
return deleted, err return deleted, err
} }
func WriteHosts() error { func pushDNS(w http.ResponseWriter, r *http.Request) {
hostfile, err := txeh.NewHostsDefault() // Set header
w.Header().Set("Content-Type", "application/json")
err := WriteHosts()
if err != nil { if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
return
}
json.NewEncoder(w).Encode("DNS Pushed to CoreDNS")
}
func WriteHosts() error {
//hostfile, err := txeh.NewHostsDefault()
hostfile := txeh.Hosts{}
/*
if err != nil {
return err return err
} }
*/
networks, err := functions.ListNetworks() networks, err := functions.ListNetworks()
if err != nil { if err != nil {
return err return err
@@ -431,6 +449,8 @@ func ValidateDNSCreate(entry models.DNSEntry) error {
v := validator.New() v := validator.New()
fmt.Println("Validating DNS: " + entry.Name) fmt.Println("Validating DNS: " + entry.Name)
fmt.Println(" Address: " + entry.Address)
fmt.Println(" Network: " + entry.Network)
_ = v.RegisterValidation("name_unique", func(fl validator.FieldLevel) bool { _ = v.RegisterValidation("name_unique", func(fl validator.FieldLevel) bool {
num, err := GetDNSEntryNum(entry.Name, entry.Network) num, err := GetDNSEntryNum(entry.Name, entry.Network)
@@ -439,12 +459,12 @@ func ValidateDNSCreate(entry models.DNSEntry) error {
_ = v.RegisterValidation("name_valid", func(fl validator.FieldLevel) bool { _ = v.RegisterValidation("name_valid", func(fl validator.FieldLevel) bool {
isvalid := functions.NameInDNSCharSet(entry.Name) isvalid := functions.NameInDNSCharSet(entry.Name)
notEmptyCheck := entry.Name != "" notEmptyCheck := len(entry.Name) > 0
return isvalid && notEmptyCheck return isvalid && notEmptyCheck
}) })
_ = v.RegisterValidation("address_valid", func(fl validator.FieldLevel) bool { _ = v.RegisterValidation("address_valid", func(fl validator.FieldLevel) bool {
notEmptyCheck := entry.Address != "" notEmptyCheck := len(entry.Address) > 0
isIpv4 := functions.IsIpv4Net(entry.Address) isIpv4 := functions.IsIpv4Net(entry.Address)
return notEmptyCheck && isIpv4 return notEmptyCheck && isIpv4
}) })

4
models/dnsEntry.go
View File

@@ -2,7 +2,7 @@
package models package models
type DNSEntry struct { type DNSEntry struct {
Address string `json:"address" bson:"address" validate:"address_valid` Address string `json:"address" bson:"address" validate:"address_valid"`
Name string `json:"name" bson:"name" validate:"omitempty,name_valid,name_unique,max=120"` Name string `json:"name" bson:"name" validate:"name_valid,name_unique,max=120"`
Network string `json:"network" bson:"network" validate:"network_exists"` Network string `json:"network" bson:"network" validate:"network_exists"`
} }