Merge pull request #1 from MarekWojt/feature/config-file

Read TOML configuration files

.gitignore

@@ -0,0 +1,3 @@
+gertdns
+gertdns.exe
+conf.toml

config/config.go

@@ -1,18 +1,23 @@
 package config
 
-var Config *Configuration = nil
-
 type Configuration struct {
 	Port    uint16
 	Host    string
 	Domains []string
 }
 
-func Load() error {
+var (
-	Config = &Configuration{
+	Config Configuration
+
+	defaultConfig = Configuration{
 		Port:    5353,
 		Host:    "0.0.0.0",
 		Domains: []string{},
 	}
-	return nil
+)
+
+func Load(configFilePath string) error {
+	config, err := loadConfFile(configFilePath)
+	Config = config
+	return err
 }

config/toml.go

@@ -0,0 +1,44 @@
+package config
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/gookit/color"
+	"github.com/pelletier/go-toml/v2"
+)
+
+func loadConfFile(configFilePath string) (Configuration, error) {
+	bytes, err := ioutil.ReadFile(configFilePath)
+
+	if err != nil {
+		color.Errorln(err.Error())
+		color.Warnln("Creating new configuration file")
+		return createNewConfig(configFilePath)
+	}
+
+	var cfg Configuration
+	err = toml.Unmarshal(bytes, &cfg)
+	if err != nil {
+		color.Errorln(err.Error())
+		color.Errorln("Configuration file " + configFilePath + " could not be read as TOML file")
+		return defaultConfig, err
+	}
+	color.Infoln("Loaded configuration file " + configFilePath)
+	return cfg, err
+}
+
+func createNewConfig(configFilePath string) (Configuration, error) {
+	confBytes, err := toml.Marshal(defaultConfig)
+	if err != nil {
+		color.Errorln(err.Error())
+		color.Errorln("Default config struct is not TOML conform")
+		return defaultConfig, err
+	}
+	err = os.WriteFile(configFilePath, confBytes, 0644)
+	if err != nil {
+		color.Errorln(err.Error())
+		color.Warnln("Using default config without file")
+	}
+	return defaultConfig, err
+}

go.mod

@@ -5,6 +5,9 @@ go 1.17
 require github.com/miekg/dns v1.1.43
 
 require (
+	github.com/gookit/color v1.4.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.0-beta.3 // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
-	golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 // indirect
+	golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 // indirect
 )

go.sum

@@ -1,5 +1,16 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
+github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
 github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/pelletier/go-toml/v2 v2.0.0-beta.3 h1:PNCTU4naEJ8mKal97P3A2qDU74QRQGlv4FXiL1XDqi4=
+github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8yGuWtotWf/0BpGIAL2Y=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
@@ -7,6 +18,11 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 h1:KzbpndAYEM+4oHRp9JmB2ewj0NHHxO3Z0g7Gus2O1kk=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,16 +1,23 @@
 package main
 
 import (
+	"flag"
 	"log"
 
 	"github.com/MarekWojt/gertdns/config"
 	"github.com/MarekWojt/gertdns/dns"
 )
 
+var (
+	configFile = flag.String("configFile", "conf.toml", "Path to configuration file")
+)
+
 func main() {
-	err := config.Load()
+	flag.Parse()
+
+	err := config.Load(*configFile)
 	if err != nil {
-		log.Fatalf("Failed to load config: %s\n ", err.Error())
+		log.Fatalf("Failed to load configuration: %s\n ", err.Error())
 	}
 
 	err = dns.Run()