torben/dyndns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Next implementation steps

Browse Source 
- Simplified UpdateRequest to the minimum required
- renamed test user to example
- removed user property from yml config, it is given by the file name.
- splitted server code analogous to command line code so that each handler has its own file.
- made viper confgi in userconfig internal
- added validation to userconfig
- added helper to combaine an IID with a v6net in userconfig
This commit is contained in:
Torben Nehmer
2021-08-23 20:41:32 +02:00
parent fbfd75bf99
commit fbf10f9d1b
5 changed files with 146 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
webapi/server.go
View File

@@ -5,19 +5,18 @@ import (
"log"
"net/http"
"gitea.nehmer.net/torben/dyndns/service"
"github.com/gorilla/mux"
)
func Server() {
r := mux.NewRouter()
r.StrictSlash(true)
var router = mux.NewRouter()
r.HandleFunc("/hello", handleHello)
r.HandleFunc("/update", handleUpdate)
func Server() {
router.StrictSlash(true)
router.HandleFunc("/hello", handleHello)
log.Printf("Listening to: %s", C.ListenAddress)
go log.Fatal(http.ListenAndServe(C.ListenAddress, r))
go log.Fatal(http.ListenAndServe(C.ListenAddress, router))
}
func handleHello(w http.ResponseWriter, r *http.Request) {
@@ -28,43 +27,3 @@ func handleHello(w http.ResponseWriter, r *http.Request) {
log.Println(r.Form)
fmt.Fprint(w, "<html><body><p>Hello World</p></body></html>")
}
func handleUpdate(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
ur, err := createUpdateRequestFromForm(r.Form)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
uc, err := service.LoadConfigForUser(ur.UserName, ur.Password)
if err != nil {
if _, ok := err.(*service.UnauthorizedError); ok {
http.Error(w, err.Error(), http.StatusUnauthorized)
} else {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
return
}
v := uc.DB
w.Header().Set("Content-Type", "text/plain")
fmt.Fprintln(w, "OK")
fmt.Fprintln(w, ur.PrettyPrint())
log.Println(ur.PrettyPrint())
log.Println(ur.IPv6Net.IP)
log.Println(ur.IPv6Net.Mask)
log.Println(v.AllSettings())
log.Printf("Request PW: %s, Config PW: %s", ur.Password, v.GetString("password"))
fmt.Fprintln(w, "Unmarshalled userconfig:")
fmt.Fprintln(w, uc.PrettyPrint())
fmt.Fprintln(w, "WebAPI Config:")
fmt.Fprintln(w, C.PrettyPrint())
fmt.Fprintln(w, "Service Config:")
fmt.Fprintln(w, service.C.PrettyPrint())
}

58
webapi/update.go Normal file
View File

@@ -0,0 +1,58 @@
package webapi
import (
"fmt"
"log"
"net/http"
"gitea.nehmer.net/torben/dyndns/service"
)
func init() {
router.HandleFunc("/update", handleUpdate)
}
func handleUpdate(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
ur, err := createUpdateRequestFromForm(r.Form)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
uc, err := service.LoadConfigForUser(ur.UserName, ur.Password)
if err != nil {
if _, ok := err.(*service.UnauthorizedError); ok {
http.Error(w, err.Error(), http.StatusUnauthorized)
} else {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
log.Printf("Authorization failed: %v", err)
return
}
w.Header().Set("Content-Type", "text/plain")
fmt.Fprintln(w, "OK")
fmt.Fprintln(w, ur.PrettyPrint())
log.Println(ur.PrettyPrint())
log.Println(ur.IPv6Net.IP)
log.Println(ur.IPv6Net.Mask)
log.Printf("Request PW: %s, Config PW: %s", ur.Password, uc.PassWord)
fmt.Fprintln(w, "Unmarshalled userconfig:")
fmt.Fprintln(w, uc.PrettyPrint())
fmt.Fprintln(w, "WebAPI Config:")
fmt.Fprintln(w, C.PrettyPrint())
fmt.Fprintln(w, "Service Config:")
fmt.Fprintln(w, service.C.PrettyPrint())
for _, other := range uc.Others {
log.Printf("Other %s, IID %v, UR V6NEt: %v, merged: %v",
other.DNS, other.V6IID, ur.IPv6Net,
other.ConvertIIDToAddress(ur.IPv6Net))
}
}

27
webapi/updaterequest.go
View File

@@ -10,18 +10,16 @@ import (
)
type UpdateRequest struct {
IPv4 net.IP
IPv6 net.IP
UserName string
Password string
Domain string
DualStack bool
IPv6Net *net.IPNet
IPv4 net.IP
IPv6 net.IP
UserName string
Password string
IPv6Net *net.IPNet
}
func (ur *UpdateRequest) String() string {
return fmt.Sprintf("IPv4: %v, IPv6: %v, UserName: %v, Password: %v, Domain: %v, DualStack: %v, IPv6Net: %v",
ur.IPv4, ur.IPv6, ur.UserName, ur.Password, ur.Domain, ur.DualStack, ur.IPv6Net)
return fmt.Sprintf("IPv4: %v, IPv6: %v, UserName: %v, Password: %v, IPv6Net: %v",
ur.IPv4, ur.IPv6, ur.UserName, ur.Password, ur.IPv6Net)
}
func (ur *UpdateRequest) PrettyPrint() string {
@@ -57,17 +55,6 @@ func createUpdateRequestFromForm(form url.Values) (*UpdateRequest, error) {
return nil, errors.New("a Password must be specified")
}
ur.Domain = form.Get("Domain")
if ur.Domain == "" {
return nil, errors.New("a Domain must be specified")
}
if form.Get("DualStack") == "1" {
ur.DualStack = true
} else {
ur.DualStack = false
}
if ip6net := form.Get("IPv6Net"); ip6net != "" {
_, ipnet, err := net.ParseCIDR(ip6net)
if err != nil {