mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 02:48:28 -07:00
0a66913b4d
Close #1212 * Server.Start(config *ServerConfig) -> Start() + Server.Prepare(config *ServerConfig) + Server.Resolve(host string) + Server.Exchange() * rDNS: use internal DNS resolver - clients: fix race in WriteDiskConfig() - fix race: move 'clients' object from 'configuration' to 'HomeContext' Go race detector didn't like our 'clients' object in 'configuration'. + add AGH startup test . Create a configuration file . Start AGH instance . Check Web server . Check DNS server . Wait until the filters are downloaded . Stop and cleanup * move module objects from config.* to Context.* * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning * ci.sh: 'make' and then run tests Squashed commit of the following: commit 86500c7f749307f37af4cc8c2a1066f679d0cfad Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:53 2019 +0300 minor commit 6e6abb9dca3cd250c458bec23aa30d2250a9eb40 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:31 2019 +0300 * ci.sh: 'make' and then run tests commit 114192eefea6800e565ba9ab238202c006516c27 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:50:04 2019 +0300 fix commit d426deea7f02cdfd4c7217a38c59e51251956a0f Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:46:33 2019 +0300 tests commit 7b350edf03027895b4e43dee908d0155a9b0ac9b Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:56:12 2019 +0300 fix test commit 2f5f116873bbbfdd4bb7f82a596f9e1f5c2bcfd8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:48:56 2019 +0300 fix tests commit 3fbdc77f9c34726e2295185279444983652d559e Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:45:00 2019 +0300 linter commit 9da0b6965a2b6863bcd552fa83a4de2866600bb8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:33:23 2019 +0300 * config.dnsctx.whois -> Context.whois commit c71ebdbdf6efd88c877b2f243c69d3bc00a997d7 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:31:08 2019 +0300 * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning commit 0f250220133cefdcb0843a50000cb932802b8324 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:28:19 2019 +0300 * rdns: refactor commit c460d8c9414940dac852e390b6c1b4d4fb38dff9 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 14:08:08 2019 +0300 Revert: * stats: serialize access to 'limit' Use 'conf *Config' and update it atomically, as in querylog module. (Note: Race detector still doesn't like it) commit 488bcb884971276de0d5629384b29e22c59ee7e6 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:50:23 2019 +0300 * config.dnsFilter -> Context.dnsFilter commit 86c0a6827a450414b50acec7ebfc5220d13b81e4 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:45:05 2019 +0300 * config.dnsServer -> Context.dnsServer commit ee35ef095ccaabc89e3de0ef52c9b5ed56b36873 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:42:10 2019 +0300 * config.dhcpServer -> Context.dhcpServer commit 1537001cd211099d5fad01696c0b806ae5d257b1 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:39:45 2019 +0300 * config.queryLog -> Context.queryLog commit e5955fe4ff1ef6f41763461b37b502ea25a3d04c Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:03:18 2019 +0300 * config.httpsServer -> Context.httpsServer commit 6153c10a9ac173e159d1f05e0db1512579b9203c Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:12:24 2019 +0300 * config.httpServer -> Context.httpServer commit abd021fb94039015cd45c97614e8b78d4694f956 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:08:05 2019 +0300 * stats: serialize access to 'limit' commit 38c2decfd87c712100edcabe62a6d4518719cb53 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:57:04 2019 +0300 * config.stats -> Context.stats commit 6caf8965ad44db9dce9a7a5103aa8fa305ad9a06 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:45:23 2019 +0300 fix Restart() ... and 6 more commits
155 lines
3.3 KiB
Go
155 lines
3.3 KiB
Go
package home
|
|
|
|
import (
|
|
"context"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
const yamlConf = `bind_host: 127.0.0.1
|
|
bind_port: 3000
|
|
users: []
|
|
language: en
|
|
rlimit_nofile: 0
|
|
web_session_ttl: 720
|
|
dns:
|
|
bind_host: 127.0.0.1
|
|
port: 5354
|
|
statistics_interval: 90
|
|
querylog_enabled: true
|
|
querylog_interval: 90
|
|
querylog_memsize: 0
|
|
protection_enabled: true
|
|
blocking_mode: null_ip
|
|
blocked_response_ttl: 0
|
|
ratelimit: 100
|
|
ratelimit_whitelist: []
|
|
refuse_any: false
|
|
bootstrap_dns:
|
|
- 1.1.1.1:53
|
|
all_servers: false
|
|
allowed_clients: []
|
|
disallowed_clients: []
|
|
blocked_hosts: []
|
|
parental_block_host: family-block.dns.adguard.com
|
|
safebrowsing_block_host: standard-block.dns.adguard.com
|
|
cache_size: 0
|
|
upstream_dns:
|
|
- https://1.1.1.1/dns-query
|
|
filtering_enabled: true
|
|
filters_update_interval: 168
|
|
parental_sensitivity: 13
|
|
parental_enabled: true
|
|
safesearch_enabled: false
|
|
safebrowsing_enabled: false
|
|
safebrowsing_cache_size: 1048576
|
|
safesearch_cache_size: 1048576
|
|
parental_cache_size: 1048576
|
|
cache_time: 30
|
|
rewrites: []
|
|
blocked_services: []
|
|
tls:
|
|
enabled: false
|
|
server_name: www.example.com
|
|
force_https: false
|
|
port_https: 443
|
|
port_dns_over_tls: 853
|
|
certificate_chain: ""
|
|
private_key: ""
|
|
certificate_path: ""
|
|
private_key_path: ""
|
|
filters:
|
|
- enabled: true
|
|
url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
|
|
name: AdGuard Simplified Domain Names filter
|
|
id: 1
|
|
- enabled: false
|
|
url: https://hosts-file.net/ad_servers.txt
|
|
name: hpHosts - Ad and Tracking servers only
|
|
id: 2
|
|
- enabled: false
|
|
url: https://adaway.org/hosts.txt
|
|
name: adaway
|
|
id: 3
|
|
user_rules:
|
|
- ""
|
|
dhcp:
|
|
enabled: false
|
|
interface_name: ""
|
|
gateway_ip: ""
|
|
subnet_mask: ""
|
|
range_start: ""
|
|
range_end: ""
|
|
lease_duration: 86400
|
|
icmp_timeout_msec: 1000
|
|
clients: []
|
|
log_file: ""
|
|
verbose: false
|
|
schema_version: 5
|
|
`
|
|
|
|
// . Create a configuration file
|
|
// . Start AGH instance
|
|
// . Check Web server
|
|
// . Check DNS server
|
|
// . Wait until the filters are downloaded
|
|
// . Stop and cleanup
|
|
func TestHome(t *testing.T) {
|
|
dir := prepareTestDir()
|
|
defer func() { _ = os.RemoveAll(dir) }()
|
|
fn := filepath.Join(dir, "AdGuardHome.yaml")
|
|
|
|
assert.True(t, ioutil.WriteFile(fn, []byte(yamlConf), 0644) == nil)
|
|
fn, _ = filepath.Abs(fn)
|
|
|
|
args := options{}
|
|
args.configFilename = fn
|
|
args.workDir = dir
|
|
go run(args)
|
|
|
|
var err error
|
|
var resp *http.Response
|
|
h := http.Client{}
|
|
for i := 0; i != 5; i++ {
|
|
resp, err = h.Get("http://127.0.0.1:3000/")
|
|
if err == nil && resp.StatusCode != 404 {
|
|
break
|
|
}
|
|
time.Sleep(1 * time.Second)
|
|
}
|
|
assert.Truef(t, err == nil, "%s", err)
|
|
assert.Equal(t, 200, resp.StatusCode)
|
|
|
|
resp, err = h.Get("http://127.0.0.1:3000/control/status")
|
|
assert.Truef(t, err == nil, "%s", err)
|
|
assert.Equal(t, 200, resp.StatusCode)
|
|
|
|
r := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
|
|
addrs, err := r.LookupIPAddr(context.TODO(), "static.adguard.com")
|
|
assert.Truef(t, err == nil, "%s", err)
|
|
haveIP := len(addrs) != 0
|
|
assert.True(t, haveIP)
|
|
|
|
for i := 1; ; i++ {
|
|
st, err := os.Stat(filepath.Join(dir, "data", "filters", "1.txt"))
|
|
if err == nil && st.Size() != 0 {
|
|
break
|
|
}
|
|
if i == 5 {
|
|
assert.True(t, false)
|
|
break
|
|
}
|
|
time.Sleep(1 * time.Second)
|
|
}
|
|
|
|
cleanup()
|
|
cleanupAlways()
|
|
}
|