1 files changed, 65 insertions, 38 deletions

diff --git a/main.go b/main.go
index 5750da1..351633b 100644
--- a/main.go
+++ b/main.go
@@ -1,21 +1,52 @@
 package main
 
 import (
-        "log"
-        "os"
+        "encoding/json"
+        "io/ioutil"
 
         "github.com/gin-gonic/gin"
-        "github.com/spf13/cobra"
-        "github.com/spf13/viper"
 
-        "code.crute.me/mcrute/go_ddns_manager/util"
+        "code.crute.me/mcrute/frame"
+        "code.crute.me/mcrute/go_ddns_manager/bind"
+        "code.crute.me/mcrute/go_ddns_manager/dns"
         "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"
 )
 
-func makeServer(cfg *web.ServerConfig) *gin.Engine {
-        router := gin.Default()
+func loadConfig(app *frame.WebApp, args []string) (interface{}, error) {
+        zonesFile := app.GetStringArgument("zones_config")
+        secretsFile := app.GetStringArgument("auth_config")
+        server := args[0]
+        view := app.GetStringArgument("view_name")
+
+        scfg := &web.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 prepareServer(c interface{}, router *gin.Engine) error {
+        cfg := c.(*web.ServerConfig)
+
         router.Use(middleware.ConfigContextMiddleware(cfg))
 
         router.GET("/reflect-ip", controllers.ReflectIP)
@@ -33,42 +64,38 @@ func makeServer(cfg *web.ServerConfig) *gin.Engine {
                 acme.DELETE("/:id", controllers.DeleteAcmeChallenge)
         }
 
-        return router
+        manage := router.Group("/manage")
+        manage.Use(middleware.ApiAuthMiddleware)
+        {
+                manage.GET("", controllers.ManageRoot)
+
+                views := manage.Group("/views")
+                {
+                        views.GET("", controllers.ListViews)
+                        views.GET("/:view", controllers.ListView)
+                        views.GET("/:view/:zone", controllers.ListZone)
+                }
+        }
+
+        return nil
 }
 
 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(
-                                viper.GetString("zones_config"),
-                                viper.GetString("auth_config"),
-                                args[0],
-                                viper.GetString("view_name"),
-                        )
-                        if err != nil {
-                                log.Println(err)
-                                os.Exit(1)
-                        }
-
-                        util.GinRun(
-                                makeServer(cfg),
-                                viper.GetBool("debug"),
-                                viper.GetString("listen"))
+        app := &frame.WebApp{
+                Name:        "dns-manage-service",
+                Usage:       "dns-manage-service [flags] dns-server-ip-port",
+                Help:        "DNS manager service",
+                MinArgCount: 1,
+                Arguments: []frame.Argument{
+                        &frame.StringArgument{"zones-config", "z", "cfg/zones.conf", "Bind key and zones config file"},
+                        &frame.StringArgument{"auth-config", "a", "cfg/server_auth.json", "Server auth configuration file"},
+                        &frame.StringArgument{"view-name", "n", "external", "Name of view to update for ACME and DDNS"},
                 },
+                LoadConfig:    loadConfig,
+                PrepareServer: prepareServer,
         }
 
-        util.WrapViper(cmd, "DNS_MANAGE").
-                BindString("zones-config", "z", "cfg/zones.conf", "Bind key and zones config file").
-                BindString("auth-config", "a", "cfg/server_auth.json", "Server auth configuration file").
-                BindString("view-name", "n", "external", "Name of view to update for ACME and DDNS").
-                BindString("listen", "l", ":9090", "Listen address and port").
-                BindBool("debug", "d", false, "Run server in debug mode with debug logs")
-
-        if err := cmd.Execute(); err != nil {
-                log.Println(err)
-                os.Exit(1)
+        if err := app.RunForever(); err != nil {
+                panic(err)
         }
 }