Dns dhcpas beta feature (#17 )

* add dhcp and dns types * sync dns #12 * add test #12 * implement dhcp #12 * add beta flags
Bump github.com/onsi/gomega from 1.11.0 to 1.12.0 (#14 )
2021-05-28 20:07:32 +02:00 · 2021-05-10 11:07:57 +02:00 · 2021-04-18 22:30:25 +02:00 · 2021-04-18 22:20:08 +02:00 · 2021-04-18 22:03:57 +02:00 · 2021-04-18 19:32:03 +02:00
19 changed files with 807 additions and 57 deletions
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: enhancement
 assignees: ''

 ---
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -43,3 +43,5 @@ changelog:
    exclude:
      - '^docs:'
      - '^test:'
+release:
+  prerelease: auto
--- a/README.md
+++ b/README.md
@@ -13,6 +13,15 @@ Synchronize [AdGuardHome](https://github.com/AdguardTeam/AdGuardHome) config to
 - Rewrites
 - Services
 - Clients
+- DNS Config (BETA)
+- DHCP Config (BETA)
+
+### Setup of initial instances
+
+New AdGuardHome replica instances can be automatically installed if enabled via the config autoSetup. 
+During automatic installation, the admin interface will be listening on port 3000 in runtime.
+
+To skip automatic setup

 ## Install

@@ -22,7 +31,7 @@ go get -u github.com/bakito/adguardhome-sync

 ## Prerequisites

-Both the origin and replica mist be initially setup via the Adguard Home installation wizard.
+Both the origin instance must be initially setup via the AdguardHome installation wizard.

 ## Run

@@ -92,7 +101,9 @@ services:
      - REPLICA1_USERNAME=username
      - REPLICA1_PASSWORD=password
      - REPLICA1_APIPATH=/some/path/control
+      # - REPLICA1_AUTOSETUP=true # if true, AdGuardHome is automatically initialized. 
      - CRON=*/10 * * * * # run every 10 minutes
+      - RUNONSTART=true
    ports:
      - 8080:8080
    restart: unless-stopped
@@ -106,6 +117,9 @@ location: $HOME/.adguardhome-sync.yaml
 # cron expression to run in daemon mode. (default; "" = runs only once)
 cron: "*/10 * * * *"

+# runs the synchronisation on startup
+runOnStart: true
+
 origin:
  # url of the origin instance
  url: https://192.168.1.2:3000
@@ -130,6 +144,7 @@ replicas:
  - url: http://192.168.1.4
    username: username
    password: password
+    # autoSetup: true # if true, AdGuardHome is automatically initialized. 

 # Configure the sync API server, disabled if api port is 0
 api:
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -15,6 +15,8 @@ import (

 const (
 	configCron       = "cron"
+	configRunOnStart = "runOnStart"
+	configBeta       = "beta"

 	configAPIPort     = "api.port"
 	configAPIUsername = "api.username"
@@ -31,11 +33,13 @@ const (
 	configReplicaUsername           = "replica.username"
 	configReplicaPassword           = "replica.password"
 	configReplicaInsecureSkipVerify = "replica.insecureSkipVerify"
+	configReplicaAutoSetup          = "replica.autoSetup"

 	envReplicasUsernameFormat           = "REPLICA%s_USERNAME"
 	envReplicasPasswordFormat           = "REPLICA%s_PASSWORD"
 	envReplicasAPIPathFormat            = "REPLICA%s_APIPATH"
 	envReplicasInsecureSkipVerifyFormat = "REPLICA%s_INSECURESKIPVERIFY"
+	envReplicasAutoSetup                = "REPLICA%s_AUTOSETUP"
 )

 var (
@@ -126,6 +130,7 @@ func collectEnvReplicas() []types.AdGuardInstance {
 				Password:           os.Getenv(fmt.Sprintf(envReplicasPasswordFormat, sm[1])),
 				APIPath:            os.Getenv(fmt.Sprintf(envReplicasAPIPathFormat, sm[1])),
 				InsecureSkipVerify: strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasInsecureSkipVerifyFormat, sm[1])), "true"),
+				AutoSetup:          strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasAutoSetup, sm[1])), "true"),
 			}
 			replicas = append(replicas, re)
 		}
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -28,6 +28,8 @@ func init() {
 	rootCmd.AddCommand(doCmd)
 	doCmd.PersistentFlags().String("cron", "", "The cron expression to run in daemon mode")
 	_ = viper.BindPFlag(configCron, doCmd.PersistentFlags().Lookup("cron"))
+	doCmd.PersistentFlags().Bool("runOnStart", true, "Run the sync job on start.")
+	_ = viper.BindPFlag(configRunOnStart, doCmd.PersistentFlags().Lookup("runOnStart"))
 	doCmd.PersistentFlags().Int("api-port", 8080, "Sync API Port, the API endpoint will be started to enable remote triggering; if 0 port API is disabled.")
 	_ = viper.BindPFlag(configAPIPort, doCmd.PersistentFlags().Lookup("api-port"))
 	doCmd.PersistentFlags().String("api-username", "", "Sync API username")
@@ -35,6 +37,9 @@ func init() {
 	doCmd.PersistentFlags().String("api-password", "", "Sync API password")
 	_ = viper.BindPFlag(configAPIPassword, doCmd.PersistentFlags().Lookup("api-password"))

+	doCmd.PersistentFlags().String("beta", "", "Enable beta features (comma separated list)")
+	_ = viper.BindPFlag(configBeta, doCmd.PersistentFlags().Lookup("beta"))
+
 	doCmd.PersistentFlags().String("origin-url", "", "Origin instance url")
 	_ = viper.BindPFlag(configOriginURL, doCmd.PersistentFlags().Lookup("origin-url"))
 	doCmd.PersistentFlags().String("origin-api-path", "/control", "Origin instance API path")
@@ -54,6 +59,8 @@ func init() {
 	_ = viper.BindPFlag(configReplicaUsername, doCmd.PersistentFlags().Lookup("replica-username"))
 	doCmd.PersistentFlags().String("replica-password", "", "Replica instance password")
 	_ = viper.BindPFlag(configReplicaPassword, doCmd.PersistentFlags().Lookup("replica-password"))
-	doCmd.PersistentFlags().String("replica-insecure-skip-verify", "", "Enable Replica instance InsecureSkipVerify")
+	doCmd.PersistentFlags().Bool("replica-insecure-skip-verify", false, "Enable Replica instance InsecureSkipVerify")
 	_ = viper.BindPFlag(configReplicaInsecureSkipVerify, doCmd.PersistentFlags().Lookup("replica-insecure-skip-verify"))
+	doCmd.PersistentFlags().Bool("replica-auto-setup", false, "Enable automatic setup of new AdguardHome instances. This replaces the setup wizard.")
+	_ = viper.BindPFlag(configReplicaAutoSetup, doCmd.PersistentFlags().Lookup("replica-auto-setup"))
 }
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/golang/mock v1.5.0
 	github.com/google/uuid v1.2.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/onsi/ginkgo v1.16.1
-	github.com/onsi/gomega v1.11.0
+	github.com/onsi/ginkgo v1.16.2
+	github.com/onsi/gomega v1.12.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/viper v1.7.1
--- a/go.sum
+++ b/go.sum
@@ -68,14 +68,16 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -154,12 +156,12 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.1 h1:foqVmeWDD6yYpK+Yz3fHyNIxFYNxswxqNFjSKe+vI54=
-github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.2 h1:HFB2fbVIlhIfCfOW81bZFbiC/RvnpXSdhbF2/DJr134=
+github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug=
-github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
+github.com/onsi/gomega v1.12.0 h1:p4oGGk2M2UJc0wWN4lHFvIB71lxsh0T/UiKCCgFADY8=
+github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -278,9 +280,9 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -311,14 +313,16 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -374,8 +378,10 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -16,6 +16,7 @@ import (

 var (
 	l                = log.GetLogger("client")
+	SetupNeededError = errors.New("setup needed")
 )

 // New create a new client
@@ -41,6 +42,9 @@ func New(config types.AdGuardInstance) (Client, error) {
 		cl = cl.SetBasicAuth(config.Username, config.Password)
 	}

+	// no redirect
+	cl.SetRedirectPolicy(resty.NoRedirectPolicy())
+
 	return &client{
 		host:   u.Host,
 		client: cl,
@@ -48,7 +52,7 @@ func New(config types.AdGuardInstance) (Client, error) {
 	}, nil
 }

-// Client AdGuard Home API client interface
+// Client AdguardHome API client interface
 type Client interface {
 	Host() string

@@ -85,6 +89,18 @@ type Client interface {
 	SetQueryLogConfig(enabled bool, interval int, anonymizeClientIP bool) error
 	StatsConfig() (*types.IntervalConfig, error)
 	SetStatsConfig(interval int) error
+	Setup() error
+
+	AccessList() (*types.AccessList, error)
+	SetAccessList(*types.AccessList) error
+
+	DNSConfig() (*types.DNSConfig, error)
+	SetDNSConfig(*types.DNSConfig) error
+
+	DHCPServerConfig() (*types.DHCPServerConfig, error)
+	SetDHCPServerConfig(*types.DHCPServerConfig) error
+	AddDHCPStaticLeases(leases ...types.Lease) error
+	DeleteDHCPStaticLeases(leases ...types.Lease) error
 }

 type client struct {
@@ -105,9 +121,15 @@ func (cl *client) doGet(req *resty.Request, url string) error {
 	rl.Debug("do get")
 	resp, err := req.Get(url)
 	if err != nil {
+		if resp != nil && resp.StatusCode() == http.StatusFound {
+			loc := resp.Header().Get("Location")
+			if loc == "/install.html" {
+				return SetupNeededError
+			}
+		}
 		return err
 	}
-	rl.With("body", string(resp.Body())).Debug("got response")
+	rl.With("status", resp.StatusCode(), "body", string(resp.Body())).Debug("got response")
 	if resp.StatusCode() != http.StatusOK {
 		return errors.New(resp.Status())
 	}
@@ -124,7 +146,7 @@ func (cl *client) doPost(req *resty.Request, url string) error {
 	if err != nil {
 		return err
 	}
-	rl.With("body", string(resp.Body())).Debug("got response")
+	rl.With("status", resp.StatusCode(), "body", string(resp.Body())).Debug("got response")
 	if resp.StatusCode() != http.StatusOK {
 		return errors.New(resp.Status())
 	}
@@ -346,3 +368,84 @@ func (cl *client) SetStatsConfig(interval int) error {
 	cl.log.With("interval", interval).Info("Set stats config")
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.IntervalConfig{Interval: interval}), "/stats_config")
 }
+
+func (cl *client) Setup() error {
+	cl.log.Info("Setup new AdguardHome instance")
+	cfg := &types.InstallConfig{
+		Web: types.InstallPort{
+			IP:         "0.0.0.0",
+			Port:       3000,
+			Status:     "",
+			CanAutofix: false,
+		},
+		DNS: types.InstallPort{
+			IP:         "0.0.0.0",
+			Port:       53,
+			Status:     "",
+			CanAutofix: false,
+		},
+	}
+
+	if cl.client.UserInfo != nil {
+		cfg.Username = cl.client.UserInfo.Username
+		cfg.Password = cl.client.UserInfo.Password
+	}
+	req := cl.client.R().EnableTrace().SetBody(cfg)
+	req.UserInfo = nil
+	return cl.doPost(req, "/install/configure")
+}
+
+func (cl *client) AccessList() (*types.AccessList, error) {
+	al := &types.AccessList{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(al), "/access/list")
+	return al, err
+}
+
+func (cl *client) SetAccessList(list *types.AccessList) error {
+	cl.log.Info("Set access list")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(list), "/access/set")
+}
+
+func (cl *client) DNSConfig() (*types.DNSConfig, error) {
+	cfg := &types.DNSConfig{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(cfg), "/dns_info")
+	return cfg, err
+}
+
+func (cl *client) SetDNSConfig(config *types.DNSConfig) error {
+	cl.log.Info("Set dns config list")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(config), "/dns_config")
+}
+
+func (cl *client) DHCPServerConfig() (*types.DHCPServerConfig, error) {
+	cfg := &types.DHCPServerConfig{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(cfg), "/dhcp/status")
+	return cfg, err
+}
+
+func (cl *client) SetDHCPServerConfig(config *types.DHCPServerConfig) error {
+	cl.log.Info("Set dhcp server config")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(config), "/dhcp/set_config")
+}
+
+func (cl *client) AddDHCPStaticLeases(leases ...types.Lease) error {
+	for _, l := range leases {
+		cl.log.With("mac", l.HWAddr, "ip", l.IP, "hostname", l.Hostname).Info("Add static dhcp lease")
+		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/add_static_lease")
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (cl *client) DeleteDHCPStaticLeases(leases ...types.Lease) error {
+	for _, l := range leases {
+		cl.log.With("mac", l.HWAddr, "ip", l.IP, "hostname", l.Hostname).Info("Delete static dhcp lease")
+		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/remove_static_lease")
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -1,6 +1,7 @@
 package client_test

 import (
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -11,6 +12,12 @@ import (

 	"github.com/bakito/adguardhome-sync/pkg/client"
 	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/google/uuid"
+)
+
+var (
+	username = uuid.NewString()
+	password = uuid.NewString()
 )

 var _ = Describe("Client", func() {
@@ -100,6 +107,25 @@ bar`)
 			Ω(fs.DNSAddresses[0]).Should(Equal("192.168.1.2"))
 			Ω(fs.Version).Should(Equal("v0.105.2"))
 		})
+		It("should return SetupNeededError", func() {
+			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Location", "/install.html")
+				w.WriteHeader(http.StatusFound)
+			}))
+			cl, err := client.New(types.AdGuardInstance{URL: ts.URL})
+			Ω(err).ShouldNot(HaveOccurred())
+			_, err = cl.Status()
+			Ω(err).Should(HaveOccurred())
+			Ω(err).Should(Equal(client.SetupNeededError))
+		})
+	})
+
+	Context("Setup", func() {
+		It("should add setup the instance", func() {
+			ts, cl = ClientPost("/install/configure", fmt.Sprintf(`{"web":{"ip":"0.0.0.0","port":3000,"status":"","can_autofix":false},"dns":{"ip":"0.0.0.0","port":53,"status":"","can_autofix":false},"username":"%s","password":"%s"}`, username, password))
+			err := cl.Setup()
+			Ω(err).ShouldNot(HaveOccurred())
+		})
 	})

 	Context("RewriteList", func() {
@@ -317,7 +343,7 @@ func ClientPost(path string, content ...string) (*httptest.Server, client.Client
 		index++
 	}))

-	cl, err := client.New(types.AdGuardInstance{URL: ts.URL})
+	cl, err := client.New(types.AdGuardInstance{URL: ts.URL, Username: username, Password: password})
 	Ω(err).ShouldNot(HaveOccurred())
 	return ts, cl
 }
--- a/pkg/mocks/client/mock.go
+++ b/pkg/mocks/client/mock.go
@@ -34,6 +34,21 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder {
 	return m.recorder
 }

+// AccessList mocks base method.
+func (m *MockClient) AccessList() (*types.AccessList, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "AccessList")
+	ret0, _ := ret[0].(*types.AccessList)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// AccessList indicates an expected call of AccessList.
+func (mr *MockClientMockRecorder) AccessList() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessList", reflect.TypeOf((*MockClient)(nil).AccessList))
+}
+
 // AddClients mocks base method.
 func (m *MockClient) AddClients(arg0 ...types.Client) error {
 	m.ctrl.T.Helper()
@@ -52,6 +67,24 @@ func (mr *MockClientMockRecorder) AddClients(arg0 ...interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddClients", reflect.TypeOf((*MockClient)(nil).AddClients), arg0...)
 }

+// AddDHCPStaticLeases mocks base method.
+func (m *MockClient) AddDHCPStaticLeases(arg0 ...types.Lease) error {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{}
+	for _, a := range arg0 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "AddDHCPStaticLeases", varargs...)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// AddDHCPStaticLeases indicates an expected call of AddDHCPStaticLeases.
+func (mr *MockClientMockRecorder) AddDHCPStaticLeases(arg0 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddDHCPStaticLeases", reflect.TypeOf((*MockClient)(nil).AddDHCPStaticLeases), arg0...)
+}
+
 // AddFilters mocks base method.
 func (m *MockClient) AddFilters(arg0 bool, arg1 ...types.Filter) error {
 	m.ctrl.T.Helper()
@@ -104,6 +137,36 @@ func (mr *MockClientMockRecorder) Clients() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clients", reflect.TypeOf((*MockClient)(nil).Clients))
 }

+// DHCPServerConfig mocks base method.
+func (m *MockClient) DHCPServerConfig() (*types.DHCPServerConfig, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DHCPServerConfig")
+	ret0, _ := ret[0].(*types.DHCPServerConfig)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DHCPServerConfig indicates an expected call of DHCPServerConfig.
+func (mr *MockClientMockRecorder) DHCPServerConfig() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DHCPServerConfig", reflect.TypeOf((*MockClient)(nil).DHCPServerConfig))
+}
+
+// DNSConfig mocks base method.
+func (m *MockClient) DNSConfig() (*types.DNSConfig, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DNSConfig")
+	ret0, _ := ret[0].(*types.DNSConfig)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DNSConfig indicates an expected call of DNSConfig.
+func (mr *MockClientMockRecorder) DNSConfig() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DNSConfig", reflect.TypeOf((*MockClient)(nil).DNSConfig))
+}
+
 // DeleteClients mocks base method.
 func (m *MockClient) DeleteClients(arg0 ...types.Client) error {
 	m.ctrl.T.Helper()
@@ -122,6 +185,24 @@ func (mr *MockClientMockRecorder) DeleteClients(arg0 ...interface{}) *gomock.Cal
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteClients", reflect.TypeOf((*MockClient)(nil).DeleteClients), arg0...)
 }

+// DeleteDHCPStaticLeases mocks base method.
+func (m *MockClient) DeleteDHCPStaticLeases(arg0 ...types.Lease) error {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{}
+	for _, a := range arg0 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "DeleteDHCPStaticLeases", varargs...)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// DeleteDHCPStaticLeases indicates an expected call of DeleteDHCPStaticLeases.
+func (mr *MockClientMockRecorder) DeleteDHCPStaticLeases(arg0 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPStaticLeases", reflect.TypeOf((*MockClient)(nil).DeleteDHCPStaticLeases), arg0...)
+}
+
 // DeleteFilters mocks base method.
 func (m *MockClient) DeleteFilters(arg0 bool, arg1 ...types.Filter) error {
 	m.ctrl.T.Helper()
@@ -292,6 +373,20 @@ func (mr *MockClientMockRecorder) Services() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Services", reflect.TypeOf((*MockClient)(nil).Services))
 }

+// SetAccessList mocks base method.
+func (m *MockClient) SetAccessList(arg0 *types.AccessList) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetAccessList", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetAccessList indicates an expected call of SetAccessList.
+func (mr *MockClientMockRecorder) SetAccessList(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccessList", reflect.TypeOf((*MockClient)(nil).SetAccessList), arg0)
+}
+
 // SetCustomRules mocks base method.
 func (m *MockClient) SetCustomRules(arg0 types.UserRules) error {
 	m.ctrl.T.Helper()
@@ -306,6 +401,34 @@ func (mr *MockClientMockRecorder) SetCustomRules(arg0 interface{}) *gomock.Call
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCustomRules", reflect.TypeOf((*MockClient)(nil).SetCustomRules), arg0)
 }

+// SetDHCPServerConfig mocks base method.
+func (m *MockClient) SetDHCPServerConfig(arg0 *types.DHCPServerConfig) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetDHCPServerConfig", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetDHCPServerConfig indicates an expected call of SetDHCPServerConfig.
+func (mr *MockClientMockRecorder) SetDHCPServerConfig(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDHCPServerConfig", reflect.TypeOf((*MockClient)(nil).SetDHCPServerConfig), arg0)
+}
+
+// SetDNSConfig mocks base method.
+func (m *MockClient) SetDNSConfig(arg0 *types.DNSConfig) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetDNSConfig", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetDNSConfig indicates an expected call of SetDNSConfig.
+func (mr *MockClientMockRecorder) SetDNSConfig(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDNSConfig", reflect.TypeOf((*MockClient)(nil).SetDNSConfig), arg0)
+}
+
 // SetQueryLogConfig mocks base method.
 func (m *MockClient) SetQueryLogConfig(arg0 bool, arg1 int, arg2 bool) error {
 	m.ctrl.T.Helper()
@@ -348,6 +471,20 @@ func (mr *MockClientMockRecorder) SetStatsConfig(arg0 interface{}) *gomock.Call
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStatsConfig", reflect.TypeOf((*MockClient)(nil).SetStatsConfig), arg0)
 }

+// Setup mocks base method.
+func (m *MockClient) Setup() error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Setup")
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Setup indicates an expected call of Setup.
+func (mr *MockClientMockRecorder) Setup() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Setup", reflect.TypeOf((*MockClient)(nil).Setup))
+}
+
 // StatsConfig mocks base method.
 func (m *MockClient) StatsConfig() (*types.IntervalConfig, error) {
 	m.ctrl.T.Helper()
--- a/pkg/sync/sync.go
+++ b/pkg/sync/sync.go
@@ -1,6 +1,7 @@
 package sync

 import (
+	"errors"
 	"fmt"

 	"github.com/bakito/adguardhome-sync/pkg/client"
@@ -26,6 +27,8 @@ func Sync(cfg *types.Config) error {
 		return fmt.Errorf("no replicas configured")
 	}

+	cfg.Origin.AutoSetup = false
+
 	w := &worker{
 		cfg: cfg,
 		createClient: func(ai types.AdGuardInstance) (client.Client, error) {
@@ -48,7 +51,9 @@ func Sync(cfg *types.Config) error {
 		} else {
 			w.cron.Run()
 		}
-	} else {
+	}
+	if cfg.RunOnStart {
+		l.With("version", version.Version).Info("Run on startup")
 		w.sync()
 	}
 	if cfg.API.Port != 0 {
@@ -136,6 +141,28 @@ func (w *worker) sync() {
 		return
 	}

+	o.accessList, err = oc.AccessList()
+	if err != nil {
+		sl.With("error", err).Error("Error getting access list")
+		return
+	}
+
+	if w.cfg.WithBeta("dns") {
+		o.dnsConfig, err = oc.DNSConfig()
+		if err != nil {
+			sl.With("error", err).Error("Error getting dns config")
+			return
+		}
+	}
+
+	if w.cfg.WithBeta("dhcp") {
+		o.dhcpServerConfig, err = oc.DHCPServerConfig()
+		if err != nil {
+			sl.With("error", err).Error("Error getting dhcp server config")
+			return
+		}
+	}
+
 	replicas := w.cfg.UniqueReplicas()
 	for _, replica := range replicas {
 		w.syncTo(sl, o, replica)
@@ -153,53 +180,82 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn
 	rl := l.With("to", rc.Host())
 	rl.Info("Start sync")

-	rs, err := rc.Status()
+	rs, err := w.statusWithSetup(rl, replica, rc)
 	if err != nil {
-		l.With("error", err).Error("Error getting replica status")
+		rl.With("error", err).Error("Error getting replica status")
 		return
 	}

 	if o.status.Version != rs.Version {
-		l.With("originVersion", o.status.Version, "replicaVersion", rs.Version).Warn("Versions do not match")
+		rl.With("originVersion", o.status.Version, "replicaVersion", rs.Version).Warn("Versions do not match")
 	}

 	err = w.syncGeneralSettings(o, rs, rc)
 	if err != nil {
-		l.With("error", err).Error("Error syncing general settings")
+		rl.With("error", err).Error("Error syncing general settings")
 		return
 	}

 	err = w.syncConfigs(o, rc)
 	if err != nil {
-		l.With("error", err).Error("Error syncing configs")
+		rl.With("error", err).Error("Error syncing configs")
 		return
 	}

 	err = w.syncRewrites(o.rewrites, rc)
 	if err != nil {
-		l.With("error", err).Error("Error syncing rewrites")
+		rl.With("error", err).Error("Error syncing rewrites")
 		return
 	}
 	err = w.syncFilters(o.filters, rc)
 	if err != nil {
-		l.With("error", err).Error("Error syncing filters")
+		rl.With("error", err).Error("Error syncing filters")
 		return
 	}

 	err = w.syncServices(o.services, rc)
 	if err != nil {
-		l.With("error", err).Error("Error syncing services")
+		rl.With("error", err).Error("Error syncing services")
 		return
 	}

 	if err = w.syncClients(o.clients, rc); err != nil {
-		l.With("error", err).Error("Error syncing clients")
+		rl.With("error", err).Error("Error syncing clients")
 		return
 	}

+	if w.cfg.WithBeta("dns") {
+		if err = w.syncDNS(o.accessList, o.dnsConfig, rc); err != nil {
+			rl.With("error", err).Error("Error syncing dns")
+			return
+		}
+	}
+
+	if w.cfg.WithBeta("dhcp") {
+		if err = w.syncDHCPServer(o.dhcpServerConfig, rc); err != nil {
+			rl.With("error", err).Error("Error syncing dns")
+			return
+		}
+	}
+
 	rl.Info("Sync done")
 }

+func (w *worker) statusWithSetup(rl *zap.SugaredLogger, replica types.AdGuardInstance, rc client.Client) (*types.Status, error) {
+	rs, err := rc.Status()
+	if err != nil {
+		if replica.AutoSetup && errors.Is(err, client.SetupNeededError) {
+			if serr := rc.Setup(); serr != nil {
+				rl.With("error", serr).Error("Error setup AdGuardHome")
+				return nil, err
+			}
+			return rc.Status()
+		}
+		return nil, err
+	}
+	return rs, err
+}
+
 func (w *worker) syncServices(os types.Services, replica client.Client) error {
 	rs, err := replica.Services()
 	if err != nil {
@@ -329,23 +385,23 @@ func (w *worker) syncGeneralSettings(o *origin, rs *types.Status, replica client
 	return nil
 }

-func (w *worker) syncConfigs(o *origin, replica client.Client) error {
-	qlc, err := replica.QueryLogConfig()
+func (w *worker) syncConfigs(o *origin, rc client.Client) error {
+	qlc, err := rc.QueryLogConfig()
 	if err != nil {
 		return err
 	}
 	if !o.queryLogConfig.Equals(qlc) {
-		if err = replica.SetQueryLogConfig(o.queryLogConfig.Enabled, o.queryLogConfig.Interval, o.queryLogConfig.AnonymizeClientIP); err != nil {
+		if err = rc.SetQueryLogConfig(o.queryLogConfig.Enabled, o.queryLogConfig.Interval, o.queryLogConfig.AnonymizeClientIP); err != nil {
 			return err
 		}
 	}

-	sc, err := replica.StatsConfig()
+	sc, err := rc.StatsConfig()
 	if err != nil {
 		return err
 	}
 	if o.statsConfig.Interval != sc.Interval {
-		if err = replica.SetStatsConfig(o.statsConfig.Interval); err != nil {
+		if err = rc.SetStatsConfig(o.statsConfig.Interval); err != nil {
 			return err
 		}
 	}
@@ -353,6 +409,51 @@ func (w *worker) syncConfigs(o *origin, replica client.Client) error {
 	return nil
 }

+func (w *worker) syncDNS(oal *types.AccessList, odc *types.DNSConfig, rc client.Client) error {
+	al, err := rc.AccessList()
+	if err != nil {
+		return err
+	}
+	if !al.Equals(oal) {
+		if err = rc.SetAccessList(oal); err != nil {
+			return err
+		}
+	}
+
+	dc, err := rc.DNSConfig()
+	if err != nil {
+		return err
+	}
+	if !dc.Equals(odc) {
+		if err = rc.SetDNSConfig(odc); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (w *worker) syncDHCPServer(osc *types.DHCPServerConfig, rc client.Client) error {
+	sc, err := rc.DHCPServerConfig()
+	if err != nil {
+		return err
+	}
+	if !sc.Equals(osc) {
+		if err = rc.SetDHCPServerConfig(osc); err != nil {
+			return err
+		}
+	}
+
+	a, r := sc.StaticLeases.Merge(osc.StaticLeases)
+
+	if err = rc.AddDHCPStaticLeases(a...); err != nil {
+		return err
+	}
+	if err = rc.DeleteDHCPStaticLeases(r...); err != nil {
+		return err
+	}
+	return nil
+}
+
 type origin struct {
 	status           *types.Status
 	rewrites         *types.RewriteEntries
@@ -361,6 +462,9 @@ type origin struct {
 	clients          *types.Clients
 	queryLogConfig   *types.QueryLogConfig
 	statsConfig      *types.IntervalConfig
+	accessList       *types.AccessList
+	dnsConfig        *types.DNSConfig
+	dhcpServerConfig *types.DHCPServerConfig
 	parental         bool
 	safeSearch       bool
 	safeBrowsing     bool
--- a/pkg/sync/sync_test.go
+++ b/pkg/sync/sync_test.go
@@ -266,6 +266,39 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
+		Context("statusWithSetup", func() {
+			var (
+				status *types.Status
+				inst   types.AdGuardInstance
+			)
+			BeforeEach(func() {
+				status = &types.Status{}
+				inst = types.AdGuardInstance{
+					AutoSetup: true,
+				}
+			})
+			It("should get the replica status", func() {
+				cl.EXPECT().Status().Return(status, nil)
+				st, err := w.statusWithSetup(l, inst, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(st).Should(Equal(status))
+			})
+			It("should runs setup before getting replica status", func() {
+				cl.EXPECT().Status().Return(nil, client.SetupNeededError)
+				cl.EXPECT().Setup()
+				cl.EXPECT().Status().Return(status, nil)
+				st, err := w.statusWithSetup(l, inst, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(st).Should(Equal(status))
+			})
+			It("should fail on setup", func() {
+				cl.EXPECT().Status().Return(nil, client.SetupNeededError)
+				cl.EXPECT().Setup().Return(te)
+				st, err := w.statusWithSetup(l, inst, cl)
+				Ω(err).Should(HaveOccurred())
+				Ω(st).Should(BeNil())
+			})
+		})
 		Context("syncServices", func() {
 			var (
 				os types.Services
@@ -336,12 +369,51 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
+
+		Context("syncDNS", func() {
+			var (
+				oal *types.AccessList
+				ral *types.AccessList
+				odc *types.DNSConfig
+				rdc *types.DNSConfig
+			)
+			BeforeEach(func() {
+				oal = &types.AccessList{}
+				ral = &types.AccessList{}
+				odc = &types.DNSConfig{}
+				rdc = &types.DNSConfig{}
+			})
+			It("should have no changes", func() {
+				cl.EXPECT().AccessList().Return(ral, nil)
+				cl.EXPECT().DNSConfig().Return(rdc, nil)
+				err := w.syncDNS(oal, odc, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have access list changes", func() {
+				ral.BlockedHosts = []string{"foo"}
+				cl.EXPECT().AccessList().Return(ral, nil)
+				cl.EXPECT().DNSConfig().Return(rdc, nil)
+				cl.EXPECT().SetAccessList(oal)
+				err := w.syncDNS(oal, odc, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have dns config changes", func() {
+				rdc.Bootstraps = []string{"foo"}
+				cl.EXPECT().AccessList().Return(ral, nil)
+				cl.EXPECT().DNSConfig().Return(rdc, nil)
+				cl.EXPECT().SetDNSConfig(odc)
+				err := w.syncDNS(oal, odc, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+
 		Context("sync", func() {

 			It("should have no changes", func() {
 				w.cfg = &types.Config{
 					Origin:  types.AdGuardInstance{},
 					Replica: types.AdGuardInstance{URL: "foo"},
+					Beta:    "dhcp,dns",
 				}
 				// origin
 				cl.EXPECT().Host()
@@ -355,6 +427,9 @@ var _ = Describe("Sync", func() {
 				cl.EXPECT().Clients().Return(&types.Clients{}, nil)
 				cl.EXPECT().QueryLogConfig().Return(&types.QueryLogConfig{}, nil)
 				cl.EXPECT().StatsConfig().Return(&types.IntervalConfig{}, nil)
+				cl.EXPECT().AccessList().Return(&types.AccessList{}, nil)
+				cl.EXPECT().DNSConfig().Return(&types.DNSConfig{}, nil)
+				cl.EXPECT().DHCPServerConfig().Return(&types.DHCPServerConfig{}, nil)

 				// replica
 				cl.EXPECT().Host()
@@ -379,6 +454,11 @@ var _ = Describe("Sync", func() {
 				cl.EXPECT().AddClients()
 				cl.EXPECT().UpdateClients()
 				cl.EXPECT().DeleteClients()
+				cl.EXPECT().AccessList().Return(&types.AccessList{}, nil)
+				cl.EXPECT().DNSConfig().Return(&types.DNSConfig{}, nil)
+				cl.EXPECT().DHCPServerConfig().Return(&types.DHCPServerConfig{}, nil)
+				cl.EXPECT().AddDHCPStaticLeases().Return(nil)
+				cl.EXPECT().DeleteDHCPStaticLeases().Return(nil)
 				w.sync()
 			})
 		})
--- a/pkg/types/dhcp.go
+++ b/pkg/types/dhcp.go
@@ -0,0 +1,76 @@
+package types
+
+import (
+	"encoding/json"
+	"net"
+	"time"
+)
+
+type DHCPServerConfig struct {
+	V4            *V4ServerConfJSON `json:"v4"`
+	V6            *V6ServerConfJSON `json:"v6"`
+	InterfaceName string            `json:"interface_name"`
+	Enabled       bool              `json:"enabled"`
+
+	Leases       Leases `json:"leases,omitempty"`
+	StaticLeases Leases `json:"static_leases,omitempty"`
+}
+
+// Equals dhcp server config equal check
+func (c *DHCPServerConfig) Equals(o *DHCPServerConfig) bool {
+	a, _ := json.Marshal(c)
+	b, _ := json.Marshal(o)
+	return string(a) == string(b)
+}
+
+type V4ServerConfJSON struct {
+	GatewayIP     net.IP `json:"gateway_ip"`
+	SubnetMask    net.IP `json:"subnet_mask"`
+	RangeStart    net.IP `json:"range_start"`
+	RangeEnd      net.IP `json:"range_end"`
+	LeaseDuration uint32 `json:"lease_duration"`
+}
+
+type V6ServerConfJSON struct {
+	RangeStart    net.IP `json:"range_start"`
+	RangeEnd      net.IP `json:"range_end"`
+	LeaseDuration uint32 `json:"lease_duration"`
+}
+
+type Leases []Lease
+
+// Merge the leases
+func (l Leases) Merge(other Leases) ([]Lease, []Lease) {
+	current := make(map[string]Lease)
+
+	var adds Leases
+	var removes Leases
+	for _, le := range l {
+		current[le.HWAddr] = le
+	}
+
+	for _, le := range other {
+		if _, ok := current[le.HWAddr]; ok {
+			delete(current, le.HWAddr)
+		} else {
+			adds = append(adds, le)
+		}
+	}
+
+	for _, rr := range current {
+		removes = append(removes, rr)
+	}
+
+	return adds, removes
+}
+
+// Lease contains the necessary information about a DHCP lease
+type Lease struct {
+	HWAddr   string `json:"mac"`
+	IP       net.IP `json:"ip"`
+	Hostname string `json:"hostname"`
+
+	// Lease expiration time
+	// 1: static lease
+	Expiry time.Time `json:"expires"`
+}
--- a/pkg/types/dns.go
+++ b/pkg/types/dns.go
@@ -0,0 +1,78 @@
+package types
+
+import (
+	"encoding/json"
+	"net"
+	"sort"
+)
+
+// https://ha.bakito.net:3000/control/dns_config
+// {"bootstrap_dns":["1.1.1.1:53"],"upstream_mode":"parallel","upstream_dns":["https://dns10.quad9.net/dns-query"]}
+// {"bootstrap_dns":["1.1.1.1:53"],"upstream_mode":"","upstream_dns":["https://dns10.quad9.net/dns-query"]}
+// {"bootstrap_dns":["1.1.1.1:53"],"upstream_mode":"fastest_addr","upstream_dns":["https://dns10.quad9.net/dns-query"]}
+
+// {"ratelimit":20,"blocking_mode":"default","blocking_ipv4":"0.0.0.0","blocking_ipv6":"::","edns_cs_enabled":true,"disable_ipv6":false,"dnssec_enabled":false}
+// {"cache_size":4194304,"cache_ttl_max":0,"cache_ttl_min":0}
+
+// https://ha.bakito.net:3000/control/access/set
+// {"allowed_clients":["2.2.2.2"],"disallowed_clients":["1.1.1.1"],"blocked_hosts":["version.bind","id.server","hostname.bind"]}
+// https://ha.bakito.net:3000/control/access/list
+// {"allowed_clients":[],"disallowed_clients":[],"blocked_hosts":["version.bind","id.server","hostname.bind"]}
+
+type DNSConfig struct {
+	Upstreams     []string `json:"upstream_dns,omitempty"`
+	UpstreamsFile string   `json:"upstream_dns_file"`
+	Bootstraps    []string `json:"bootstrap_dns,omitempty"`
+
+	ProtectionEnabled bool     `json:"protection_enabled"`
+	RateLimit         uint32   `json:"ratelimit"`
+	BlockingMode      string   `json:"blocking_mode,omitempty"`
+	BlockingIPv4      net.IP   `json:"blocking_ipv4,omitempty"`
+	BlockingIPv6      net.IP   `json:"blocking_ipv6"`
+	EDNSCSEnabled     bool     `json:"edns_cs_enabled"`
+	DNSSECEnabled     bool     `json:"dnssec_enabled"`
+	DisableIPv6       bool     `json:"disable_ipv6"`
+	UpstreamMode      string   `json:"upstream_mode,omitempty"`
+	CacheSize         uint32   `json:"cache_size"`
+	CacheMinTTL       uint32   `json:"cache_ttl_min"`
+	CacheMaxTTL       uint32   `json:"cache_ttl_max"`
+	ResolveClients    bool     `json:"resolve_clients"`
+	LocalPTRUpstreams []string `json:"local_ptr_upstreams,omitempty"`
+}
+
+// Equals dns config equal check
+func (c *DNSConfig) Equals(o *DNSConfig) bool {
+	c.Sort()
+	o.Sort()
+
+	a, _ := json.Marshal(c)
+	b, _ := json.Marshal(o)
+	return string(a) == string(b)
+}
+
+// Sort sort dns config
+func (c *DNSConfig) Sort() {
+	sort.Strings(c.Upstreams)
+	sort.Strings(c.Bootstraps)
+	sort.Strings(c.LocalPTRUpstreams)
+}
+
+type AccessList struct {
+	AllowedClients    []string `json:"allowed_clients"`
+	DisallowedClients []string `json:"disallowed_clients"`
+	BlockedHosts      []string `json:"blocked_hosts"`
+}
+
+// Equals access list equal check
+func (al *AccessList) Equals(o *AccessList) bool {
+	return equals(al.AllowedClients, o.AllowedClients) &&
+		equals(al.DisallowedClients, o.DisallowedClients) &&
+		equals(al.BlockedHosts, o.BlockedHosts)
+}
+
+// Sort sort access list
+func (al *AccessList) Sort() {
+	sort.Strings(al.AllowedClients)
+	sort.Strings(al.DisallowedClients)
+	sort.Strings(al.BlockedHosts)
+}
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -5,19 +5,27 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"sync"
 )

 const (
 	DefaultAPIPath = "/control"
 )

+var (
+	doOnce sync.Once
+)
+
 // Config application configuration struct
 type Config struct {
 	Origin      AdGuardInstance   `json:"origin" yaml:"origin"`
 	Replica     AdGuardInstance   `json:"replica,omitempty" yaml:"replica,omitempty"`
 	Replicas    []AdGuardInstance `json:"replicas,omitempty" yaml:"replicas,omitempty"`
 	Cron        string            `json:"cron,omitempty" yaml:"cron,omitempty"`
+	RunOnStart  bool              `json:"runOnStart,omitempty" yaml:"runOnStart,omitempty"`
 	API         API               `json:"api,omitempty" yaml:"api,omitempty"`
+	Beta        string            `json:"beta,omitempty" yaml:"beta,omitempty"`
+	enabledBeta map[string]bool   `json:"-" yaml:"-"`
 }

 // API configuration
@@ -49,13 +57,27 @@ func (cfg *Config) UniqueReplicas() []AdGuardInstance {
 	return r
 }

-// AdGuardInstance adguard home config instance
+func (cfg *Config) WithBeta(name string) bool {
+	doOnce.Do(func() {
+		cfg.enabledBeta = make(map[string]bool)
+
+		features := strings.Split(cfg.Beta, ",")
+		for _, f := range features {
+			cfg.enabledBeta[strings.ToLower(strings.TrimSpace(f))] = true
+		}
+	})
+	return cfg.enabledBeta[name]
+
+}
+
+// AdGuardInstance AdguardHome config instance
 type AdGuardInstance struct {
 	URL                string `json:"url" yaml:"url"`
 	APIPath            string `json:"apiPath,omitempty" yaml:"apiPath,omitempty"`
 	Username           string `json:"username,omitempty" yaml:"username,omitempty"`
 	Password           string `json:"password,omitempty" yaml:"password,omitempty"`
 	InsecureSkipVerify bool   `json:"insecureSkipVerify" yaml:"insecureSkipVerify"`
+	AutoSetup          bool   `json:"autoSetup" yaml:"autoSetup"`
 }

 // Key AdGuardInstance key
@@ -276,8 +298,8 @@ func (cl *Client) Sort() {
 	sort.Strings(cl.Upstreams)
 }

-// Equal Clients equal check
-func (cl *Client) Equal(o *Client) bool {
+// Equals Clients equal check
+func (cl *Client) Equals(o *Client) bool {
 	cl.Sort()
 	o.Sort()

@@ -304,7 +326,7 @@ func (clients *Clients) Merge(other *Clients) ([]Client, []Client, []Client) {

 	for _, cl := range expected {
 		if oc, ok := current[cl.Name]; ok {
-			if !cl.Equal(&oc) {
+			if !cl.Equals(&oc) {
 				updates = append(updates, cl)
 			}
 			delete(current, cl.Name)
@@ -337,3 +359,19 @@ func equals(a []string, b []string) bool {
 	}
 	return true
 }
+
+// InstallConfig AdguardHome install config
+type InstallConfig struct {
+	Web      InstallPort `json:"web"`
+	DNS      InstallPort `json:"dns"`
+	Username string      `json:"username"`
+	Password string      `json:"password"`
+}
+
+// InstallPort AdguardHome install config port
+type InstallPort struct {
+	IP         string `json:"ip"`
+	Port       int    `json:"port"`
+	Status     string `json:"status"`
+	CanAutofix bool   `json:"can_autofix"`
+}
--- a/pkg/types/types_test.go
+++ b/pkg/types/types_test.go
@@ -305,4 +305,18 @@ var _ = Describe("Types", func() {
 			})
 		})
 	})
+	Context("DNSConfig", func() {
+		Context("Equals", func() {
+			It("should be equal", func() {
+				dc1 := &types.DNSConfig{Upstreams: []string{"a"}}
+				dc2 := &types.DNSConfig{Upstreams: []string{"a"}}
+				Ω(dc1.Equals(dc2)).Should(BeTrue())
+			})
+			It("should not be equal", func() {
+				dc1 := &types.DNSConfig{Upstreams: []string{"a"}}
+				dc2 := &types.DNSConfig{Upstreams: []string{"b"}}
+				Ω(dc1.Equals(dc2)).ShouldNot(BeTrue())
+			})
+		})
+	})
 })
--- a/testdata/dhcp-status.json
+++ b/testdata/dhcp-status.json
@@ -0,0 +1,17 @@
+{
+  "enabled": false,
+  "interface_name": "docker0",
+  "v4": {
+    "gateway_ip": "172.17.0.1",
+    "subnet_mask": "255.255.255.0",
+    "range_start": "172.17.0.100",
+    "range_end": "172.17.0.200",
+    "lease_duration": 888888
+  },
+  "v6": {
+    "range_start": "",
+    "lease_duration": 0
+  },
+  "leases": [],
+  "static_leases": []
+}
--- a/testdata/dns-info.json
+++ b/testdata/dns-info.json
@@ -0,0 +1,22 @@
+{
+  "upstream_dns": [
+    "https://dns10.quad9.net/dns-query"
+  ],
+  "upstream_dns_file": "",
+  "bootstrap_dns": [
+    "1.1.1.1:53"
+  ],
+  "protection_enabled": true,
+  "ratelimit": 20,
+  "blocking_mode": "default",
+  "blocking_ipv4": "",
+  "blocking_ipv6": "",
+  "edns_cs_enabled": false,
+  "dnssec_enabled": false,
+  "disable_ipv6": false,
+  "upstream_mode": "",
+  "cache_size": 4194304,
+  "cache_ttl_min": 0,
+  "cache_ttl_max": 0
+}
+
--- a/testdata/tls-status.json
+++ b/testdata/tls-status.json
@@ -0,0 +1,20 @@
+{
+  "enabled": false,
+  "port_https": 443,
+  "port_dns_over_tls": 853,
+  "port_dns_over_quic": 784,
+  "port_dnscrypt": 0,
+  "dnscrypt_config_file": "",
+  "allow_unencrypted_doh": false,
+  "certificate_chain": "",
+  "private_key": "",
+  "certificate_path": "",
+  "private_key_path": "",
+  "valid_cert": false,
+  "valid_chain": false,
+  "not_before": "0001-01-01T00:00:00Z",
+  "not_after": "0001-01-01T00:00:00Z",
+  "dns_names": null,
+  "valid_key": false,
+  "valid_pair": false
+}
Author	SHA1	Message	Date
Marc Brugger	00f353bac4	Dns dhcpas beta feature (#17 ) * add dhcp and dns types * sync dns #12 * add test #12 * implement dhcp #12 * add beta flags	2021-05-28 20:07:32 +02:00
dependabot[bot]	d19cca6fcf	Bump github.com/onsi/gomega from 1.11.0 to 1.12.0 (#14 ) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.11.0...v1.12.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-05-10 11:07:57 +02:00
bakito	a73f696ef6	update readme #9	2021-04-18 22:30:25 +02:00
bakito	2e93920931	run on startup #10	2021-04-18 22:20:08 +02:00
Marc Brugger	3edb5222d6	Initial setup (#11 ) automatically setup new AdGuardHome instances #9	2021-04-18 22:03:57 +02:00
bakito	d58c8f115e	log status	2021-04-18 19:32:03 +02:00
Marc Brugger	f8dd7e6136	Update issue templates	2021-04-18 18:40:43 +02:00