Commit Graph

260 Commits

Author SHA1 Message Date
Andrey Meshkov 67a39045fc -(dnsforward): custom client per-domain upstreams
Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1539
2020-05-13 20:31:43 +03:00
Andrey Meshkov 0311e53ebb *: added comment 2020-05-08 17:43:49 +03:00
DannyHinshaw b034e25b26 * filter: skip comment lines starting with '#'
Fix #771, filter skips comment lines starting with '#'.

Handle exclamation inline comments.

Refactor for correct logic flow.

Split out hashtag comment logic from exclamation.

Remove trailing whitespace.
2020-05-07 18:03:25 +03:00
Simon Zolin 14ffd1a3f5 Merge: - blocked-services: settings were reset on restart
Close #1624

Squashed commit of the following:

commit eecc91ca1f9d062c27702a9c07da74da673bef05
Merge: ec53dbeb 26f78dcc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 13:15:58 2020 +0300

    Merge remote-tracking branch 'origin/master' into fix-blocked-svcs

commit ec53dbebdc2fbd2ff94f939d2bd8fb07b9dd1bc8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 12:58:50 2020 +0300

    minor

commit 1e3c20ed02151965ebaca55ac4f25a951a772062
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 12:53:37 2020 +0300

    - blocked-services: settings were reset on restart

    broken by:
     0789e4b20d
     * refactor: move blocked-services functions to dnsfilter
2020-04-27 13:21:16 +03:00
Simon Zolin d01407c1a0 Merge: - Web: flush the bufferred response data before performing global operations
Close #1617

* commit 'e24143a1962c16763cb73f4e41b30117bcf0d80c':
  - Web: flush the bufferred response data before performing global operations
2020-04-24 16:22:16 +03:00
Simon Zolin e24143a196 - Web: flush the bufferred response data before performing global operations 2020-04-24 15:50:57 +03:00
Simon Zolin 44353821e6 * TestAuth: improve test 2020-04-24 14:04:40 +03:00
Simon Zolin e2ddc82d70 + DNS: add fastest_addr setting
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
* API: /status: removed fields

#715

Squashed commit of the following:

commit 7dd913bd336ecbaa7419b998d0bf913d89702fe6
Merge: 43706970 8170955a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 19:09:36 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit 437069702a3e91e0b066e4b22b08cdc02ff19eaf
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 19:08:55 2020 +0300

    minor

commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 16:02:03 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 15:40:49 2020 +0300

    minor

commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 17:56:24 2020 +0300

    * API changes

    . removed POST /set_upstreams_config
    . removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
    . added new fields to /dns_config and /dns_info

commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 16:43:13 2020 +0300

    * API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config

commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Mar 23 10:28:25 2020 +0300

    openapi

commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 19:18:48 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 18:13:43 2020 +0300

    + DNS: add fastest_addr setting
2020-04-22 19:14:04 +03:00
Simon Zolin 9671050e5b + config: add "debug_pprof" setting
Squashed commit of the following:

commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 15:57:50 2020 +0300

    Merge remote-tracking branch 'origin/master' into add-pprof

commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 13:52:36 2020 +0300

    * use localhost:6060 for pprof

commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 12:46:25 2020 +0300

    minor

commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 11:59:39 2020 +0300

    use separate HTTP server for pprof

commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 17:04:04 2020 +0300

    minor

commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 16:57:38 2020 +0300

    * use modified version of pprof

commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 20 16:35:21 2020 +0300

    minor

commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 20 15:57:57 2020 +0300

    + config: add "enable_pprof" setting
2020-04-22 16:00:26 +03:00
Andrey Meshkov 215e3eeaf6 Merge: Win travis build
* commit '6503bab1aaa27ff43175d069413630a420093be0':
  *: added cross-env to npm scripts
  run npm build on windows
  *: added more logging
  -: fix autohosts tests on Windows
  -: fix qlog test on Windows
  *: fix nvs script
  *: travis - use nvs on Windows
  *: travis-win -- try nvm
  *(global): travis: choco install nodejs
  +(global): windows travis build
2020-04-15 16:13:24 +03:00
Andrey Meshkov 1a34b96d03 *: added more logging 2020-04-15 15:17:57 +03:00
Andrey Meshkov e96fd6e42d -: fix qlog test on Windows 2020-04-15 14:11:31 +03:00
Andrey Meshkov 4b57776976 *(home): removed hphosts 2020-04-15 12:56:50 +03:00
Simon Zolin 81309c707a + filters: support filters from local disk 2020-04-09 11:46:52 +03:00
Simon Zolin 321b1a7e9c Merge: - web: install: couldn't apply new HTTP port until the restart
Squashed commit of the following:

commit 2480dcbe2390601ab4e423241eb306127e4b6d26
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 8 19:05:06 2020 +0300

    - web: install: couldn't apply new HTTP port until the restart
2020-04-08 19:08:35 +03:00
wikijm d2b58c81f3
Add 'device_camera' and 'device_securityalarm' values 2020-04-08 11:59:36 +02:00
Andrey Meshkov 2f9bc13ffd *(home): fix small filters update
 Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1554
2020-04-07 23:29:03 +03:00
Andrey Meshkov ea38612a1d Merge: - install: fix crash when trying to use uninitialized TLS module
* commit '6690441240f217cc5e6de93fa0803e3c15a50fef':
  - install: fix crash when trying to use uninitialized TLS module
2020-04-07 23:12:32 +03:00
Simon Zolin 6690441240 - install: fix crash when trying to use uninitialized TLS module 2020-04-07 19:24:29 +03:00
Andrey Meshkov 1376d66acb *(home): fix filters update on Windows
 Closes: #1553
2020-04-07 13:02:28 +03:00
Andrey Meshkov 7b8588afa4 *: fix golangci-lint warnings 2020-04-05 18:34:43 +03:00
Andrey Meshkov d5b826e12f *(global): upgrade dependencies, start using Go v1.14 2020-04-05 18:21:26 +03:00
Simon Zolin 06b3378fd7 Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384

Squashed commit of the following:

commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 19:17:53 2020 +0300

    minor

commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 19:17:21 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1384-tls12-ciphers

commit 72c536737e0502bb397562ade47aedb9f2ae4494
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 4 18:16:24 2020 +0300

    + DNS, Web: use only secure TLSv1.2 ciphers
2020-03-23 10:23:34 +03:00
Simon Zolin 63923fa882 Merge: + DNS: use rules from /etc/hosts
- fix filtering logic: don't do DNS response check for Rewrite rules

Close #1478

Squashed commit of the following:

commit 1206b94881289ff664b7c8998ea97c1455da1ff8
Merge: c462577a 5fe98474
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 15:00:25 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1478-auto-records

commit c462577ad84754f5b3ea4cd58339838af817fe36
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 14:33:17 2020 +0300

    minor

commit 7e824ba5f432648a976bc4b8076a645ba875ef70
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 14:29:54 2020 +0300

    more tests

commit a22b62136c5cfd84cd0450897aef9e7d2e20585a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 14:09:52 2020 +0300

    rename, move

commit 9e5ed49ad3c27c57d540edf18b78d29e56afb067
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 19 15:33:27 2020 +0300

    fix logic - don't do DNS response check for Rewrite rules

commit 6cfabc0348a41883b8bba834626a7e8760b76bf2
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 19 11:35:07 2020 +0300

    minor

commit 4540aed9327566078e5087d43c30f4e8bffab7b9
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 19 11:03:24 2020 +0300

    fix

commit 9ddddf7bded812da48613cc07084e360c15ddd0e
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 19 10:49:13 2020 +0300

    fix

commit c5f8ef745b6f2a768be8a2ab23ad80b01b0aa54f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 19 10:37:26 2020 +0300

    fix

commit f4be00947bf0528c9a7cd4f09c4090db444c4694
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Mar 16 20:13:00 2020 +0300

    + auto DNS records from /etc/hosts
2020-03-20 15:05:43 +03:00
Simon Zolin 2e845e4f4d + qlog: hide_client_ip setting 2020-03-20 14:50:43 +03:00
Simon Zolin bebd43923b - querylog: querylog_memsize setting was reset to 0
Since v0.100.0 the query logs memory buffer was not active,
 despite the default capacity of 1000 items.

Now we remove querylog_memsize setting and replace it with querylog_size_memory
2020-03-19 15:53:25 +03:00
Simon Zolin 7ff743ab32 Merge: * auto-upgrade: don't show Upgrade button on UNIX if running under non-root user
Close #1193

* commit '58f183103248d3efd7e94551ffaebc5df3689ac0':
  * auto-upgrade: don't show Upgrade button on UNIX if running under non-root user
2020-03-18 15:19:30 +03:00
Simon Zolin 3303d77dad Merge: - tls: allow_unencrypted_doh and strict_sni_check settings were reset after POST /control/tls/configure
Close #1484

Squashed commit of the following:

commit 2daae88b80d83889238eaf4808b8a4da4fd8b102
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 18 13:16:23 2020 +0300

    minor

commit 99fa4e27ad45e515c8faef14a77304c2a9687875
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Mar 17 13:46:46 2020 +0300

    - tls: allow_unencrypted_doh and strict_sni_check settings were reset after POST /control/tls/configure
2020-03-18 15:18:15 +03:00
Simon Zolin 58f1831032 * auto-upgrade: don't show Upgrade button on UNIX if running under non-root user 2020-03-17 19:22:45 +03:00
Simon Zolin dd7d9dc334 * move getDNSAddresses() and "/dns-query" handler to DNS module 2020-03-17 17:12:02 +03:00
Simon Zolin db30f27c8f * TLS is now a separate module (logically) 2020-03-17 17:11:24 +03:00
Simon Zolin 8e4bc29103 * move HTTP server code 2020-03-17 17:11:24 +03:00
Simon Zolin 0789e4b20d * refactor: move blocked-services functions to dnsfilter 2020-03-17 17:11:22 +03:00
Simon Zolin e8129f15c7 * refactor
1. Auth module was initialized inside dns.go - now it's moved to initWeb()

2. stopHTTPServer() wasn't called on server stop - now we do that

3. Don't use postInstall() HTTP filter where it's not necessary.
Now we register handlers after installation is complete.
2020-03-17 15:23:29 +03:00
Simon Zolin c77907694d + service: support "-s reload" command 2020-03-17 15:21:10 +03:00
Simon Zolin fa2f793ac7 + clients: re-read auto-clients from /etc/hosts when SIGHUP is received 2020-03-17 15:21:10 +03:00
Ildar Kamalov bc9bccc669 Merge: Add thai and romanian languages
Closes #1445

* commit '229d040ee286e656c8986e622a33f18176a3e769':
  + i18n: add thai and romanian languages
  + client: add thai and romanian languages
2020-03-17 15:06:56 +03:00
Simon Zolin 646725efb7 Merge: * DNS filters: optimize filter update
Close #1463

Squashed commit of the following:

commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Mar 16 16:39:17 2020 +0300

    minor

commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 14:39:07 2020 +0300

    minor

commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 14:30:04 2020 +0300

    minor

commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 14:24:50 2020 +0300

    minor

commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 14:02:06 2020 +0300

    minor

commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 13:35:11 2020 +0300

    logical module Filtering

commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 13:11:37 2020 +0300

    minor

commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Mar 12 12:59:28 2020 +0300

    refactor

commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 11 20:12:53 2020 +0300

    * filters: optimize update procedure
2020-03-17 15:00:40 +03:00
Simon Zolin 0e030154ee - fix tests 2020-03-16 16:29:23 +03:00
Simon Zolin 1000aef1d2 + DNS, Web: Entware: use special directory with the system root certificates
+ use custom RootsCA for HTTPS client, for server cert verify
2020-03-16 15:15:38 +03:00
Simon Zolin b345595dbf Merge: * blocked-services: remove Messenger
* commit '5dc7b848dffaa0cd3cd3ca55080af90bdda2fec0':
  * blocked-services: remove unknown service names
  * blocked-services: remove Messenger
2020-03-16 15:01:19 +03:00
Simon Zolin 88853b76d9 Merge: + config: new setting 'http_proxy'
Close #458

* commit '2e054b673264bdb563abb6478979d00e76e52c8d':
  + config: new setting 'http_proxy'
2020-03-16 14:58:21 +03:00
Simon Zolin 480c6ac753 Merge: - dhcp: crash on error on startup
Squashed commit of the following:

commit 81908b636ec91a562b3ff8634b77c71dc3f009e4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 13 17:25:36 2020 +0300

    - dhcp: crash on error on startup
2020-03-13 17:30:09 +03:00
Simon Zolin 2e054b6732 + config: new setting 'http_proxy' 2020-03-12 15:11:08 +03:00
Simon Zolin b600d7b09d Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:

commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 11 19:14:27 2020 +0300

    Merge remote-tracking branch 'origin/master' into apply-disable-filter

commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 11 18:40:38 2020 +0300

    improve logic

commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Mar 11 18:23:14 2020 +0300

    - filters: 'disable filter' didn't work
2020-03-11 19:17:46 +03:00
Ildar Kamalov 229d040ee2 + i18n: add thai and romanian languages 2020-03-11 17:06:37 +03:00
Simon Zolin 5dc7b848df * blocked-services: remove unknown service names 2020-03-02 18:51:48 +03:00
Simon Zolin 01d9078107 * blocked-services: remove Messenger 2020-03-02 15:53:01 +03:00
Simon Zolin 263a7ca6be * allow-filters: support updating
* /filtering/refresh: modify
2020-02-28 13:09:15 +03:00
Andrey Meshkov d839136fee Merge: fix #822 - Whitelist filter rules
Squashed commit of the following:

commit 350c6d5fadd77145b801df8887284bf4d64fbd19
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Wed Feb 26 15:43:29 2020 +0300

    * client: update translations

commit a884dffcd59f2259e2eee2c1e5a3270819bf8962
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Mon Feb 17 17:32:10 2020 +0300

    + client: handle whitelist filters

commit a586ec5bc614ffb0e01584a1fbdc7292b4865e68
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jan 29 18:16:59 2020 +0300

    + client: add whitelist

commit a52c3de62cf2fa34be6394771fb8bb56b4ee81e3
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Feb 20 17:50:44 2020 +0300

    * change /filtering/refresh

commit 7f8f2ecccb9f7fa65318c1717dc6a7bd61afccf4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Feb 20 16:17:07 2020 +0300

    * fix race-detector issue

commit ac4b64c4a52c5b364a4b154bf18dea0fdf45647f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jan 20 20:08:21 2020 +0300

    + whitelist filters
2020-02-26 19:58:25 +03:00