Refactor into an application

13 files changed, 653 insertions, 424 deletions

diff --git a/dns/cilent.go b/dns/cilent.go
index 63e3734..989bb4d 100644
--- a/dns/cilent.go
+++ b/dns/cilent.go
@@ -1,17 +1,44 @@
 package dns
 
 import (
-        "code.crute.me/mcrute/go_ddns_manager/bind"
         "github.com/miekg/dns"
+
+        "code.crute.me/mcrute/go_ddns_manager/bind"
 )
 
 type DNSClient struct {
         Server string
 }
 
+type DNSTransaction struct {
+        zone *bind.Zone
+        key  *bind.Key
+        msg  *dns.Msg
+}
+
+func (t *DNSTransaction) Upsert(rrs ...RR) *DNSTransaction {
+        t.RemoveAll(rrs...).Insert(rrs...)
+        return t
+}
+
+func (t *DNSTransaction) Insert(rrs ...RR) *DNSTransaction {
+        t.msg.Insert(toRRSet(t.zone, rrs...))
+        return t
+}
+
+func (t *DNSTransaction) Remove(rrs ...RR) *DNSTransaction {
+        t.msg.Remove(toRRSet(t.zone, rrs...))
+        return t
+}
+
+func (t *DNSTransaction) RemoveAll(rrs ...RR) *DNSTransaction {
+        t.msg.RemoveRRset(toRRSet(t.zone, rrs...))
+        return t
+}
+
 func (c *DNSClient) AXFR(zone *bind.Zone) (chan *dns.Envelope, error) {
         k := zone.Keys()[0]
-        t := &dns.Transfer{TsigSecret: k.AsMap()}
+        t := &dns.Transfer{TsigSecret: k.AsMap()} // Always uses tcp
 
         m := &dns.Msg{}
         m.SetAxfr(zone.Name)
@@ -20,48 +47,31 @@ func (c *DNSClient) AXFR(zone *bind.Zone) (chan *dns.Envelope, error) {
         return t.In(m, c.Server)
 }
 
-func (c *DNSClient) Insert(zone *bind.Zone, rrs ...RR) error {
-        k := zone.Keys()[0]
-        dc := &dns.Client{TsigSecret: k.AsMap()}
-
+func (c *DNSClient) StartUpdate(zone *bind.Zone) *DNSTransaction {
         m := &dns.Msg{}
         m.SetUpdate(zone.Name)
-        m.Insert(toRRSet(zone, rrs...))
-        k.Sign(m)
 
-        if _, _, err := dc.Exchange(m, c.Server); err != nil {
-                return err
+        return &DNSTransaction{
+                zone: zone,
+                key:  zone.Keys()[0],
+                msg:  m,
         }
-
-        return nil
 }
 
-func (c *DNSClient) Remove(zone *bind.Zone, rrs ...RR) error {
-        k := zone.Keys()[0]
-        dc := &dns.Client{TsigSecret: k.AsMap()}
+func (c *DNSClient) SendUpdate(t *DNSTransaction) error {
+        udp := &dns.Client{Net: "udp", TsigSecret: t.key.AsMap()}
+        tcp := &dns.Client{Net: "tcp", TsigSecret: t.key.AsMap()}
 
-        m := &dns.Msg{}
-        m.SetUpdate(zone.Name)
-        m.Remove(toRRSet(zone, rrs...))
-        k.Sign(m)
+        t.msg.SetEdns0(4096, false)
+        t.key.Sign(t.msg)
 
-        if _, _, err := dc.Exchange(m, c.Server); err != nil {
-                return err
+        in, _, err := udp.Exchange(t.msg, c.Server)
+        if in != nil && in.Truncated {
+                // If the TCP request succeeds, the err will reset to nil
+                in, _, err = tcp.Exchange(t.msg, c.Server)
         }
 
-        return nil
-}
-
-func (c *DNSClient) RemoveAll(zone *bind.Zone, rrs ...RR) error {
-        k := zone.Keys()[0]
-        dc := &dns.Client{TsigSecret: k.AsMap()}
-
-        m := &dns.Msg{}
-        m.SetUpdate(zone.Name)
-        m.RemoveRRset(toRRSet(zone, rrs...))
-        k.Sign(m)
-
-        if _, _, err := dc.Exchange(m, c.Server); err != nil {
+        if err != nil {
                 return err
         }
 
diff --git a/go.mod b/go.mod
index b8f5134..53f7ef2 100644
--- a/go.mod
+++ b/go.mod
@@ -5,5 +5,6 @@ go 1.13
 require (
         github.com/gin-gonic/gin v1.5.0
         github.com/miekg/dns v1.1.26
+        github.com/spf13/cobra v0.0.5
         golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 )
diff --git a/go.sum b/go.sum
index 2f5ba2a..a6a4091 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,13 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc=
@@ -12,25 +19,47 @@ github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEK
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
@@ -40,6 +69,7 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -47,12 +77,13 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPT
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1 h1:SvGtYmN60a5CVKTOzMSyfzWDeZRxRuGvRQyEAKbw1xc=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
diff --git a/main.go b/main.go
index ac9b849..367814d 100644
--- a/main.go
+++ b/main.go
@@ -1,395 +1,98 @@
 package main
 
 import (
-        "encoding/base64"
-        "encoding/json"
-        "io/ioutil"
+        "fmt"
         "log"
-        "net"
-        "net/http"
-        "regexp"
-        "strings"
+        "os"
+        "strconv"
 
-        "code.crute.me/mcrute/go_ddns_manager/bind"
-        "code.crute.me/mcrute/go_ddns_manager/dns"
         "github.com/gin-gonic/gin"
-)
-
-const (
-        ACME_AUTH_KEY     = "ACMEAuthUserID"
-        DDNS_AUTH_KEY     = "DDNSAuthZone"
-        CTX_SERVER_CONFIG = "ServerConfig"
-)
+        "github.com/spf13/cobra"
 
-var (
-        ipRegexp = regexp.MustCompile(`(?:\[([0-9a-f:]+)\]|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})):\d+`)
+        "code.crute.me/mcrute/go_ddns_manager/web"
+        "code.crute.me/mcrute/go_ddns_manager/web/controllers"
+        "code.crute.me/mcrute/go_ddns_manager/web/middleware"
 )
 
-type ServerConfig struct {
-        BindConfig  *bind.BINDConfig
-        DNSClient   *dns.DNSClient
-        ddnsSecrets map[string]string         `json:"DDNS"`
-        acmeSecrets map[string]map[string]int `json:"ACME"`
-}
-
-func LoadServerConfig(zonesFile, secretsFile string) (*ServerConfig, error) {
-        scfg := &ServerConfig{
-                // TODO: Remove
-                DNSClient: &dns.DNSClient{Server: "172.16.18.52:53"},
-        }
-
-        cfg, err := bind.ParseBINDConfig(zonesFile)
-        if err != nil {
-                return nil, err
+// TODO: use from a common package
+func MustGetString(c *cobra.Command, k string) string {
+        f := c.Flags().Lookup(k)
+        if f == nil {
+                panic(fmt.Errorf("No flag named %s", k))
         }
-        scfg.BindConfig = cfg
-
-        fd, err := ioutil.ReadFile(secretsFile)
-        if err != nil {
-                return nil, err
-        }
-
-        if err = json.Unmarshal(fd, scfg); err != nil {
-                return nil, err
-        }
-
-        return scfg, nil
-}
 
-func (s *ServerConfig) GetDDNZoneName(k string) string {
-        v, _ := s.ddnsSecrets[k]
-        return v
+        return f.Value.String()
 }
 
-func (s *ServerConfig) AcmeSecretExists(k string) bool {
-        _, ok := s.acmeSecrets[k]
-        return ok
-}
-
-func (s *ServerConfig) IsAcmeClientAllowed(key, zone string) bool {
-        u, ok := s.acmeSecrets[key]
-        if !ok {
-                return false
-        }
-
-        p, ok := u[zone]
-        if ok && p == 1 {
-                return true
+// TODO: use from a common package
+func MustGetBool(c *cobra.Command, k string) bool {
+        f := c.Flags().Lookup(k)
+        if f == nil {
+                panic(fmt.Errorf("No flag named %s", k))
         }
 
-        p, ok = u[strings.TrimRight(zone, ".")]
-        if ok && p == 1 {
-                return true
-        }
-
-        return false
-}
-
-type DDNSUpdateRequest struct {
-        Key string `form:"key" binding:"required"`
-}
-
-type AcmeChallenge struct {
-        Zone      string `json:"zone" binding:"required"`
-        Challenge string `json:"challenge" binding:"required"`
-}
-
-type AcmeChallengeID struct {
-        Zone      string
-        Prefix    string
-        Challenge string
-}
-
-func joinDomainParts(parts ...string) string {
-        p := []string{}
-        for _, i := range parts {
-                if strings.TrimSpace(i) != "" {
-                        p = append(p, i)
-                }
-        }
-        return strings.Join(p, ".")
-}
-
-func createAcmeChallenge(c *gin.Context) {
-        cfg := GetServerConfig(c)
-
-        var ch AcmeChallenge
-        if err := c.ShouldBindJSON(&ch); err != nil {
-                c.JSON(http.StatusBadRequest, gin.H{
-                        "error": err.Error(),
-                })
-                return
-        }
-
-        zone, prefix := cfg.BindConfig.FindClosestZone(ch.Zone, "external")
-        if zone == nil {
-                c.JSON(http.StatusNotFound, gin.H{
-                        "error": "Zone not found",
-                })
-                return
-        }
-
-        if v := c.GetString(ACME_AUTH_KEY); !cfg.IsAcmeClientAllowed(v, zone.Name) {
-                c.JSON(http.StatusForbidden, gin.H{
-                        "error": "Zone update not allowed",
-                })
-                return
-        }
-
-        // Do this first, in-case it fails (even though it should never fail)
-        id, err := json.Marshal(AcmeChallengeID{
-                Zone:      zone.Name,
-                Prefix:    prefix,
-                Challenge: ch.Challenge,
-        })
+        t, err := strconv.ParseBool(f.Value.String())
         if err != nil {
-                log.Printf("error: %s", err)
-                c.JSON(http.StatusInternalServerError, gin.H{
-                        "error": "error encoding ID",
-                })
-                return
-        }
-
-        url := makeURL(c.Request, "/acme/%s", base64.URLEncoding.EncodeToString(id))
-
-        t := &dns.TXT{
-                Name: joinDomainParts("_acme-challenge", prefix),
-                Ttl:  5,
-                Txt:  []string{ch.Challenge},
-        }
-
-        // Cleanup any old challenges before adding a new one
-        if err := cfg.DNSClient.RemoveAll(zone, t); err != nil {
-                log.Printf("error RemoveAll: %s", err)
-                c.JSON(http.StatusInternalServerError, gin.H{
-                        "error": err.Error(),
-                })
-                return
-        }
-
-        if err := cfg.DNSClient.Insert(zone, t); err != nil {
-                log.Printf("error Insert: %s", err)
-                c.JSON(http.StatusInternalServerError, gin.H{
-                        "error": err.Error(),
-                })
-                return
-        }
-
-        c.Writer.Header()["Location"] = []string{url.String()}
-        c.JSON(http.StatusCreated, gin.H{
-                "created": url.String(),
-        })
-}
-
-func deleteAcmeChallenge(c *gin.Context) {
-        cfg := GetServerConfig(c)
-
-        rid, err := base64.URLEncoding.DecodeString(c.Param("id"))
-        if err != nil {
-                c.JSON(http.StatusBadRequest, gin.H{
-                        "error": "unable to decode ID",
-                })
-                return
-        }
-
-        var id AcmeChallengeID
-        if err = json.Unmarshal(rid, &id); err != nil {
-                c.JSON(http.StatusBadRequest, gin.H{
-                        "error": "unable to decode ID",
-                })
-                return
-        }
-
-        zone := cfg.BindConfig.Zone("external", id.Zone)
-        if zone == nil {
-                c.JSON(http.StatusNotFound, gin.H{
-                        "error": "Zone not found",
-                })
-                return
-        }
-
-        if v := c.GetString(ACME_AUTH_KEY); !cfg.IsAcmeClientAllowed(v, zone.Name) {
-                c.JSON(http.StatusForbidden, gin.H{
-                        "error": "Zone update not allowed",
-                })
-                return
-        }
-
-        t := &dns.TXT{
-                Name: joinDomainParts("_acme-challenge", id.Prefix),
-                Ttl:  5,
-                Txt:  []string{id.Challenge},
-        }
-
-        if err := cfg.DNSClient.Remove(zone, t); err != nil {
-                log.Printf("error Remove: %s", err)
-                c.JSON(http.StatusInternalServerError, gin.H{
-                        "error": err.Error(),
-                })
-                return
-        }
-
-        c.JSON(http.StatusNoContent, gin.H{})
-}
-
-func updateDynamicDNS(c *gin.Context) {
-        cfg := GetServerConfig(c)
-
-        res := c.GetString(DDNS_AUTH_KEY)
-        if res == "" {
-                log.Println("ddns: Unable to get auth key")
-                c.AbortWithStatus(http.StatusForbidden)
-                return
-        }
-
-        zone, part := cfg.BindConfig.FindClosestZone(res, "external")
-        if zone == nil {
-                log.Println("ddns: Unable to locate zone")
-                c.AbortWithStatus(http.StatusNotFound)
-                return
-        }
-
-        inip := net.ParseIP(strings.Split(c.Request.RemoteAddr, ":")[0])
-        xff := c.Request.Header.Get("X-Forwarded-For")
-        if xff != "" {
-                inip = net.ParseIP(xff)
-        }
-
-        if inip == nil {
-                log.Println("ddns: Unable to parse IP")
-                c.AbortWithStatus(http.StatusInternalServerError)
-                return
-        }
-
-        t := &dns.A{
-                Name: part,
-                Ttl:  60,
-                A:    inip,
-        }
-
-        // Cleanup any old records before adding the new one
-        if err := cfg.DNSClient.RemoveAll(zone, t); err != nil {
-                log.Printf("ddns RemoveAll: %s", err)
-                c.AbortWithStatus(http.StatusInternalServerError)
-                return
-        }
-
-        if err := cfg.DNSClient.Insert(zone, t); err != nil {
-                log.Printf("ddns Insert: %s", err)
-                c.AbortWithStatus(http.StatusInternalServerError)
-                return
-        }
-
-        c.String(http.StatusAccepted, "")
-}
-
-func reflectIP(c *gin.Context) {
-        myIp := c.Request.RemoteAddr
-        xff := c.Request.Header.Get("X-Forwarded-For")
-        if xff != "" {
-                myIp = xff
-        }
-
-        ips := ipRegexp.FindStringSubmatch(myIp)
-        if ips == nil {
-                c.AbortWithStatus(http.StatusInternalServerError)
-                return
-        }
-
-        v6, v4 := ips[1], ips[2]
-        if v6 != "" {
-                c.String(http.StatusOK, v6)
-        } else if v4 != "" {
-                c.String(http.StatusOK, v4)
-        } else {
-                c.AbortWithStatus(http.StatusInternalServerError)
-        }
-}
-
-func acmeAuthMiddleware(c *gin.Context) {
-        cfg := GetServerConfig(c)
-
-        _, pwd, ok := c.Request.BasicAuth()
-        if !ok {
-                c.Request.Header.Set("WWW-Authenticate", `Basic realm="closed site"`)
-                c.AbortWithStatus(http.StatusUnauthorized)
-                return
-        }
-
-        if !cfg.AcmeSecretExists(pwd) {
-                c.AbortWithStatus(http.StatusForbidden)
-                return
-        } else {
-                c.Set(ACME_AUTH_KEY, pwd)
-        }
-
-        c.Next()
-}
-
-func ddnsAuthMiddleware(c *gin.Context) {
-        cfg := GetServerConfig(c)
-
-        var req DDNSUpdateRequest
-        if err := c.ShouldBind(&req); err != nil {
-                log.Println("ddnsAuthMiddleware: No key in request")
-                c.AbortWithStatus(http.StatusNotFound)
-                return
-        }
-
-        res := cfg.GetDDNZoneName(req.Key)
-        if res == "" {
-                log.Println("ddnsAuthMiddleware: Unknown secret")
-                c.AbortWithStatus(http.StatusNotFound)
-                return
-        } else {
-                c.Set(DDNS_AUTH_KEY, res)
-        }
-
-        c.Next()
-}
-
-func ConfigContextMiddleware(cfg *ServerConfig) func(*gin.Context) {
-        return func(c *gin.Context) {
-                c.Set(CTX_SERVER_CONFIG, cfg)
-                c.Next()
-        }
-}
-
-func GetServerConfig(c *gin.Context) *ServerConfig {
-        v, ok := c.Get(CTX_SERVER_CONFIG)
-        if !ok {
-                // This should never happen if the config context middlware is in place
-                panic("Unable to get config from request")
+                panic(err)
         }
 
-        return v.(*ServerConfig)
+        return t
 }
 
-func main() {
-        gin.SetMode(gin.DebugMode)
-
-        cfg, err := LoadServerConfig("cfg/zones.conf", "cfg/secrets.json")
-        if err != nil {
-                panic(err)
-        }
-
+func makeServer(cfg *web.ServerConfig) *gin.Engine {
         router := gin.Default()
-        router.Use(ConfigContextMiddleware(cfg))
+        router.Use(middleware.ConfigContextMiddleware(cfg))
 
-        router.GET("/reflect-ip", reflectIP)
+        router.GET("/reflect-ip", controllers.ReflectIP)
 
         ddns := router.Group("/dynamic-dns")
-        ddns.Use(ddnsAuthMiddleware)
+        ddns.Use(middleware.DDNSAuthMiddleware)
         {
-                ddns.POST("", updateDynamicDNS)
+                ddns.POST("", controllers.UpdateDynamicDNS)
         }
 
         acme := router.Group("/acme")
-        acme.Use(acmeAuthMiddleware)
+        acme.Use(middleware.AcmeAuthMiddleware)
         {
-                acme.POST("", createAcmeChallenge)
-                acme.DELETE("/:id", deleteAcmeChallenge)
+                acme.POST("", controllers.CreateAcmeChallenge)
+                acme.DELETE("/:id", controllers.DeleteAcmeChallenge)
         }
 
-        router.Run()
+        return router
+}
+
+func main() {
+        cmd := &cobra.Command{
+                Use:   "dns-manage-service [flags] dns-server-ip-port",
+                Short: "DNS manager service",
+                Args:  cobra.MinimumNArgs(1),
+                Run: func(cmd *cobra.Command, args []string) {
+                        cfg, err := web.LoadServerConfig(
+                                MustGetString(cmd, "zones-config"),
+                                MustGetString(cmd, "auth-config"),
+                                MustGetString(cmd, "view-name"),
+                                args[0],
+                        )
+                        if err != nil {
+                                log.Println(err)
+                                os.Exit(1)
+                        }
+
+                        web.GinRun(
+                                makeServer(cfg),
+                                MustGetBool(cmd, "debug"),
+                                MustGetString(cmd, "listen"))
+                },
+        }
+
+        cmd.Flags().StringP("zones-config", "z", "cfg/zones.conf", "Bind key and zones config file")
+        cmd.Flags().StringP("auth-config", "a", "cfg/server_auth.json", "Server auth configuration file")
+        cmd.Flags().StringP("view-name", "n", "external", "Name of view to update for ACME and DDNS")
+        cmd.Flags().StringP("listen", "l", ":9090", "Listen address and port")
+        cmd.Flags().BoolP("debug", "d", false, "Run server in debug mode with debug logs")
+
+        if err := cmd.Execute(); err != nil {
+                log.Println(err)
+                os.Exit(1)
+        }
 }
diff --git a/web.go b/web.go
deleted file mode 100644
index b64c1de..0000000
--- a/web.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package main
-
-import (
-        "fmt"
-        "net/http"
-        "net/url"
-)
-
-func makeURL(r *http.Request, path string, subs ...interface{}) *url.URL {
-        scheme := "https"
-        if r.TLS == nil {
-                scheme = "http"
-        }
-
-        // Always defer to whatever the proxy told us it was doing because this
-        // could be a mullet-VIP in either direction.
-        if fwProto := r.Header.Get("X-Forwarded-Proto"); fwProto != "" {
-                scheme = fwProto
-        }
-
-        return &url.URL{
-                Scheme: scheme,
-                Host:   r.Host,
-                Path:   fmt.Sprintf(path, subs...),
-        }
-}
diff --git a/web/config.go b/web/config.go
new file mode 100644
index 0000000..01b6f47
--- /dev/null
+++ b/web/config.go
@@ -0,0 +1,75 @@
+package web
+
+import (
+        "encoding/json"
+        "io/ioutil"
+        "log"
+        "strings"
+
+        "code.crute.me/mcrute/go_ddns_manager/bind"
+        "code.crute.me/mcrute/go_ddns_manager/dns"
+)
+
+type ServerConfig struct {
+        BindConfig     *bind.BINDConfig
+        DNSClient      *dns.DNSClient
+        AcmeView       string
+        DynamicDnsView string
+        DDNSSecrets    map[string]string         `json:"DDNS"`
+        AcmeSecrets    map[string]map[string]int `json:"ACME"`
+}
+
+func LoadServerConfig(zonesFile, secretsFile, server, view string) (*ServerConfig, error) {
+        scfg := &ServerConfig{
+                DNSClient:      &dns.DNSClient{Server: server},
+                AcmeView:       view,
+                DynamicDnsView: view,
+        }
+
+        cfg, err := bind.ParseBINDConfig(zonesFile)
+        if err != nil {
+                return nil, err
+        }
+        scfg.BindConfig = cfg
+
+        fd, err := ioutil.ReadFile(secretsFile)
+        if err != nil {
+                return nil, err
+        }
+
+        if err = json.Unmarshal(fd, scfg); err != nil {
+                return nil, err
+        }
+
+        return scfg, nil
+}
+
+func (s *ServerConfig) GetDDNSZoneName(k string) string {
+        log.Printf("%#v", s.DDNSSecrets)
+        v, _ := s.DDNSSecrets[k]
+        return v
+}
+
+func (s *ServerConfig) AcmeSecretExists(k string) bool {
+        _, ok := s.AcmeSecrets[k]
+        return ok
+}
+
+func (s *ServerConfig) IsAcmeClientAllowed(key, zone string) bool {
+        u, ok := s.AcmeSecrets[key]
+        if !ok {
+                return false
+        }
+
+        p, ok := u[zone]
+        if ok && p == 1 {
+                return true
+        }
+
+        p, ok = u[strings.TrimRight(zone, ".")]
+        if ok && p == 1 {
+                return true
+        }
+
+        return false
+}
diff --git a/web/controllers/acme.go b/web/controllers/acme.go
new file mode 100644
index 0000000..f40b2ec
--- /dev/null
+++ b/web/controllers/acme.go
@@ -0,0 +1,149 @@
+package controllers
+
+import (
+        "encoding/base64"
+        "encoding/json"
+        "log"
+        "net/http"
+        "strings"
+
+        "github.com/gin-gonic/gin"
+
+        "code.crute.me/mcrute/go_ddns_manager/dns"
+        "code.crute.me/mcrute/go_ddns_manager/web"
+        "code.crute.me/mcrute/go_ddns_manager/web/middleware"
+)
+
+type AcmeChallenge struct {
+        Zone      string `json:"zone" binding:"required"`
+        Challenge string `json:"challenge" binding:"required"`
+}
+
+type AcmeChallengeID struct {
+        Zone      string
+        Prefix    string
+        Challenge string
+}
+
+func DecodeAcmeChallengeID(v string) *AcmeChallengeID {
+        rid, err := base64.URLEncoding.DecodeString(v)
+        if err != nil {
+                return nil
+        }
+
+        var id AcmeChallengeID
+        if err = json.Unmarshal(rid, &id); err != nil {
+                return nil
+        }
+
+        return &id
+}
+
+func (i AcmeChallengeID) Encode() string {
+        id, err := json.Marshal(i)
+        if err != nil {
+                return ""
+        }
+
+        return base64.URLEncoding.EncodeToString(id)
+}
+
+func joinDomainParts(parts ...string) string {
+        p := []string{}
+        for _, i := range parts {
+                if strings.TrimSpace(i) != "" {
+                        p = append(p, i)
+                }
+        }
+        return strings.Join(p, ".")
+}
+
+func jsonError(c *gin.Context, status int, msg interface{}) {
+        var o string
+
+        switch msg := msg.(type) {
+        case string:
+                o = msg
+        case error:
+                o = msg.Error()
+        }
+
+        c.JSON(status, gin.H{"error": o})
+}
+
+func CreateAcmeChallenge(c *gin.Context) {
+        cfg := middleware.GetServerConfig(c)
+
+        var ch AcmeChallenge
+        if err := c.ShouldBindJSON(&ch); err != nil {
+                jsonError(c, http.StatusBadRequest, err)
+                return
+        }
+
+        zone, prefix := cfg.BindConfig.FindClosestZone(ch.Zone, cfg.AcmeView)
+        if zone == nil {
+                jsonError(c, http.StatusNotFound, "Zone not found")
+                return
+        }
+
+        if !cfg.IsAcmeClientAllowed(middleware.GetAcmeAuthContext(c), zone.Name) {
+                jsonError(c, http.StatusForbidden, "Zone update not allowed")
+                return
+        }
+
+        txn := cfg.DNSClient.StartUpdate(zone).Upsert(&dns.TXT{
+                Name: joinDomainParts("_acme-challenge", prefix),
+                Ttl:  5,
+                Txt:  []string{ch.Challenge},
+        })
+
+        if err := cfg.DNSClient.SendUpdate(txn); err != nil {
+                log.Printf("error Insert: %s", err)
+                jsonError(c, http.StatusInternalServerError, err)
+                return
+        }
+
+        url := web.MakeURL(c.Request, "/acme/%s", AcmeChallengeID{
+                Zone:      zone.Name,
+                Prefix:    prefix,
+                Challenge: ch.Challenge,
+        }.Encode()).String()
+
+        c.Writer.Header().Set("Location", url)
+        c.JSON(http.StatusCreated, gin.H{"created": url})
+}
+
+func DeleteAcmeChallenge(c *gin.Context) {
+        cfg := middleware.GetServerConfig(c)
+
+        id := DecodeAcmeChallengeID(c.Param("id"))
+        if id == nil {
+                jsonError(c, http.StatusBadRequest, "unable to decode ID")
+                return
+        }
+
+        zone := cfg.BindConfig.Zone(cfg.AcmeView, id.Zone)
+        if zone == nil {
+                jsonError(c, http.StatusNotFound, "Zone not found")
+                return
+        }
+
+        if !cfg.IsAcmeClientAllowed(middleware.GetAcmeAuthContext(c), zone.Name) {
+                jsonError(c, http.StatusForbidden, "Zone update not allowed")
+                return
+        }
+
+        txn := cfg.DNSClient.StartUpdate(zone).Remove(&dns.TXT{
+                Name: joinDomainParts("_acme-challenge", id.Prefix),
+                Ttl:  5,
+                Txt:  []string{id.Challenge},
+        })
+
+        if err := cfg.DNSClient.SendUpdate(txn); err != nil {
+                log.Printf("error Remove: %s", err)
+                jsonError(c, http.StatusInternalServerError, err)
+                return
+        }
+
+        c.String(http.StatusNoContent, "")
+}
diff --git a/web/controllers/ddns.go b/web/controllers/ddns.go
new file mode 100644
index 0000000..7300989
--- /dev/null
+++ b/web/controllers/ddns.go
@@ -0,0 +1,51 @@
+package controllers
+
+import (
+        "log"
+        "net/http"
+
+        "github.com/gin-gonic/gin"
+
+        "code.crute.me/mcrute/go_ddns_manager/dns"
+        "code.crute.me/mcrute/go_ddns_manager/web"
+        "code.crute.me/mcrute/go_ddns_manager/web/middleware"
+)
+
+func UpdateDynamicDNS(c *gin.Context) {
+        cfg := middleware.GetServerConfig(c)
+
+        res := middleware.GetDDNSAuthKey(c)
+        if res == "" {
+                log.Println("ddns: Unable to get auth key")
+                c.AbortWithStatus(http.StatusForbidden)
+                return
+        }
+
+        zone, part := cfg.BindConfig.FindClosestZone(res, cfg.DynamicDnsView)
+        if zone == nil {
+                log.Println("ddns: Unable to locate zone")
+                c.AbortWithStatus(http.StatusNotFound)
+                return
+        }
+
+        inip := web.GetRequestIP(c)
+        if inip == nil {
+                log.Println("ddns: Unable to parse IP")
+                c.AbortWithStatus(http.StatusInternalServerError)
+                return
+        }
+
+        txn := cfg.DNSClient.StartUpdate(zone).Upsert(&dns.A{
+                Name: part,
+                Ttl:  60,
+                A:    inip,
+        })
+
+        if err := cfg.DNSClient.SendUpdate(txn); err != nil {
+                log.Printf("ddns: %s", err)
+                c.AbortWithStatus(http.StatusInternalServerError)
+                return
+        }
+
+        c.String(http.StatusAccepted, "")
+}
diff --git a/web/controllers/reflect_ip.go b/web/controllers/reflect_ip.go
new file mode 100644
index 0000000..d04b98c
--- /dev/null
+++ b/web/controllers/reflect_ip.go
@@ -0,0 +1,19 @@
+package controllers
+
+import (
+        "net/http"
+
+        "github.com/gin-gonic/gin"
+
+        "code.crute.me/mcrute/go_ddns_manager/web"
+)
+
+func ReflectIP(c *gin.Context) {
+        ip := web.GetRequestIP(c)
+        if ip == nil {
+                c.String(http.StatusInternalServerError, "")
+                return
+        }
+
+        c.String(http.StatusOK, ip.String())
+}
diff --git a/web/middleware/acme.go b/web/middleware/acme.go
new file mode 100644
index 0000000..54a4dfc
--- /dev/null
+++ b/web/middleware/acme.go
@@ -0,0 +1,33 @@
+package middleware
+
+import (
+        "net/http"
+
+        "github.com/gin-gonic/gin"
+)
+
+const acmeUserId = "ACMEAuthUserID"
+
+func AcmeAuthMiddleware(c *gin.Context) {
+        cfg := GetServerConfig(c)
+
+        _, pwd, ok := c.Request.BasicAuth()
+        if !ok {
+                c.Request.Header.Set("WWW-Authenticate", `Basic realm="closed site"`)
+                c.AbortWithStatus(http.StatusUnauthorized)
+                return
+        }
+
+        if !cfg.AcmeSecretExists(pwd) {
+                c.AbortWithStatus(http.StatusForbidden)
+                return
+        } else {
+                c.Set(acmeUserId, pwd)
+        }
+
+        c.Next()
+}
+
+func GetAcmeAuthContext(c *gin.Context) string {
+        return c.GetString(acmeUserId)
+}
diff --git a/web/middleware/config_context.go b/web/middleware/config_context.go
new file mode 100644
index 0000000..d474022
--- /dev/null
+++ b/web/middleware/config_context.go
@@ -0,0 +1,26 @@
+package middleware
+
+import (
+        "github.com/gin-gonic/gin"
+
+        "code.crute.me/mcrute/go_ddns_manager/web"
+)
+
+const serverConfig = "ServerConfig"
+
+func ConfigContextMiddleware(cfg *web.ServerConfig) func(*gin.Context) {
+        return func(c *gin.Context) {
+                c.Set(serverConfig, cfg)
+                c.Next()
+        }
+}
+
+func GetServerConfig(c *gin.Context) *web.ServerConfig {
+        v, ok := c.Get(serverConfig)
+        if !ok {
+                // This should never happen if the config context middlware is in place
+                panic("Unable to get config from request")
+        }
+
+        return v.(*web.ServerConfig)
+}
diff --git a/web/middleware/ddns.go b/web/middleware/ddns.go
new file mode 100644
index 0000000..b213926
--- /dev/null
+++ b/web/middleware/ddns.go
@@ -0,0 +1,40 @@
+package middleware
+
+import (
+        "log"
+        "net/http"
+
+        "github.com/gin-gonic/gin"
+)
+
+const DDNS_AUTH_KEY = "DDNSAuthZone"
+
+type DDNSUpdateRequest struct {
+        Key string `form:"key" binding:"required"`
+}
+
+func DDNSAuthMiddleware(c *gin.Context) {
+        cfg := GetServerConfig(c)
+
+        var req DDNSUpdateRequest
+        if err := c.ShouldBind(&req); err != nil {
+                log.Println("ddnsAuthMiddleware: No key in request")
+                c.AbortWithStatus(http.StatusNotFound)
+                return
+        }
+
+        res := cfg.GetDDNSZoneName(req.Key)
+        if res == "" {
+                log.Println("ddnsAuthMiddleware: Unknown secret")
+                c.AbortWithStatus(http.StatusNotFound)
+                return
+        } else {
+                c.Set(DDNS_AUTH_KEY, res)
+        }
+
+        c.Next()
+}
+
+func GetDDNSAuthKey(c *gin.Context) string {
+        return c.GetString(DDNS_AUTH_KEY)
+}
diff --git a/web/utils.go b/web/utils.go
new file mode 100644
index 0000000..5467132
--- /dev/null
+++ b/web/utils.go
@@ -0,0 +1,117 @@
+package web
+
+import (
+        "context"
+        "fmt"
+        "log"
+        "net"
+        "net/http"
+        "net/url"
+        "os"
+        "os/signal"
+        "regexp"
+
+        "github.com/gin-gonic/gin"
+)
+
+// Parses an IPv4 or IPv6 address with an optional port on the end. Returns
+// match groups for the addresses. The first match is the IPv6 address and the
+// second the IPv4 address.
+var ipRegexp = regexp.MustCompile(`(?:\[([0-9a-f:]+)\]|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}))(?::\d+)?`)
+
+// TODO: use from a common package
+func ParseIP(s string) net.IP {
+        ips := ipRegexp.FindStringSubmatch(s)
+        if ips == nil {
+                return nil
+        }
+
+        if v6, v4 := ips[1], ips[2]; v6 != "" {
+                return net.ParseIP(v6)
+        } else {
+                return net.ParseIP(v4)
+        }
+}
+
+// TODO: use from a common package
+func GetRequestIP(c *gin.Context) net.IP {
+        if xff := c.Request.Header.Get("X-Forwarded-For"); xff != "" {
+                return ParseIP(xff)
+        }
+        return ParseIP(c.Request.RemoteAddr)
+}
+
+// TODO: use from a common package
+func MakeURL(r *http.Request, path string, subs ...interface{}) *url.URL {
+        scheme := "https"
+        if r.TLS == nil {
+                scheme = "http"
+        }
+
+        // Always defer to whatever the proxy told us it was doing because this
+        // could be a mullet-VIP in either direction.
+        if fwProto := r.Header.Get("X-Forwarded-Proto"); fwProto != "" {
+                scheme = fwProto
+        }
+
+        return &url.URL{
+                Scheme: scheme,
+                Host:   r.Host,
+                Path:   fmt.Sprintf(path, subs...),
+        }
+}
+
+// TODO: use from a common package
+// Copied from: https://github.com/gin-gonic/gin/blob/59ab588bf597f9f41faee4f217b5659893c2e925/utils.go#L137
+func resolveAddress(addr []string) string {
+        switch len(addr) {
+        case 0:
+                if port := os.Getenv("PORT"); port != "" {
+                        log.Printf("Environment variable PORT=\"%s\"", port)
+                        return ":" + port
+                }
+                log.Printf("Environment variable PORT is undefined. Using port :8080 by default")
+                return ":8080"
+        case 1:
+                return addr[0]
+        default:
+                panic("too many parameters")
+        }
+}
+
+// TODO: use from a common package
+// Runs a gin.Engine instance in a way that can be canceled by an SIGINT
+func GinRun(e *gin.Engine, debug bool, a ...string) {
+        if debug {
+                gin.SetMode(gin.DebugMode)
+        } else {
+                gin.SetMode(gin.ReleaseMode)
+        }
+
+        srv := &http.Server{
+                Addr:    resolveAddress(a),
+                Handler: e,
+        }
+
+        idleConnsClosed := make(chan struct{})
+
+        go func() {
+                sigint := make(chan os.Signal, 1)
+                signal.Notify(sigint, os.Interrupt)
+                <-sigint
+
+                log.Println("Caught SIGINT, shutting down")
+                if err := srv.Shutdown(context.Background()); err != nil {
+                        log.Printf("HTTP server Shutdown: %v", err)
+                }
+
+                close(idleConnsClosed)
+        }()
+
+        log.Printf("Listening and serving HTTP on %s\n", srv.Addr)
+        if err := srv.ListenAndServe(); err != http.ErrServerClosed {
+                log.Fatalf("HTTP server ListenAndServe: %v", err)
+        }
+
+        <-idleConnsClosed
+}