Skip to content

Commit

Permalink
Updates (#1)
Browse files Browse the repository at this point in the history 
* Updated openapi.yaml to OpenAPI 3.0
Included lint to validate yaml file

* resolve conflicts

* Update index.html

* + client: Add icons for Apple products

* *: fix AdguardTeam#1656

* *: memory usage hacks

* *: upd locales

* Merge: + client: trim DNS blocklists fields on blur
Close AdguardTeam#1634

Squashed commit of the following:

commit 5f38da50b2075a9b5967aed39b62a8ab05e57a1c
Author: ArtemBaskal <[email protected]>
Date:   Tue May 12 20:02:05 2020 +0300

    + client: Trim fields on blur

* Merge: - client: Fix npm ci fail
Close AdguardTeam#1597

Squashed commit of the following:

commit 75884d17de9acecf59b4f76a488d37ae76e52246
Author: ArtemBaskal <[email protected]>
Date:   Tue May 12 17:18:24 2020 +0300

    - client: Fix npm ci fail

* Merge: + client: Use monospace font in coding-like inputs
Close AdguardTeam#1650

Squashed commit of the following:

commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date:   Tue May 12 18:22:55 2020 +0300

    Replace css variable

commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date:   Tue May 12 18:06:31 2020 +0300

    + client: Use monospace font in coding-like inputs

* -(dnsforward): custom client per-domain upstreams

Closes: AdguardTeam#1539

* Add icons to server

* Added a unit-test for custom upstreams

* Add assets folder

* Fix go lint warning

* Add IntelliJ Project files (*.iml) to .gitignore Rename "Portuguese" to "Português" so it's localized like all other languages

* -(dnsforward): fix handling RRSIG records

* -: fix AdguardTeam#1632

* *(home): fix assets access

* *(global): update translations

* minor fix of the snap publish script

* fix

* *(home): added more logging to TLS module

* *(home): fix TLS module initialization

Continue to work even when TLS cert-key pair is invalid

Closes: AdguardTeam#1677

* - filter: fix rules count when data doesn't end with a newline

* - autohosts: support tab character

* *(documentation): removed unnecessary dependencies

* - rewrites: fix crash when handling name->cname->A chain

crash.adguard -> adguard.a.record
adguard.a.record -> 1.2.3.4

* update guide

* + client: Update packages - Merge pull request AdguardTeam#613 in DNS/adguard-home from fix/1597 to master
Close AdguardTeam#1597

Squashed commit of the following:

commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date:   Wed May 20 14:54:10 2020 +0300

    Fix translation in install options

commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date:   Wed May 20 13:11:34 2020 +0300

    Remove commented code

commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 19:02:49 2020 +0300

    Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version

commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 17:30:37 2020 +0300

    Remove all unused dependencies

commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 16:35:24 2020 +0300

    Remove unused dependencies

commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 16:14:09 2020 +0300

    Update regular dependencies

commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 15:34:10 2020 +0300

    Update all dev dependancies

commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 14:14:44 2020 +0300

    Update all postcss packages

commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 12:45:02 2020 +0300

    Prevent git from converting linebreaks in .js files

commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 12:43:01 2020 +0300

    Prevent git from converting linebreaks in .js files

commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date:   Tue May 19 12:24:47 2020 +0300

    Remove linebreak-style eslint rule

commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date:   Mon May 18 20:55:47 2020 +0300

    Add prop types

commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date:   Mon May 18 18:52:07 2020 +0300

    Update eslint and babel, fix eslint warnings

commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date:   Mon May 18 16:45:49 2020 +0300

    Update css loading webpack rules

commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 16:13:49 2020 +0300

    Suppress linebreak-style eslint error for Windows

commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 14:55:07 2020 +0300

    Suppress eslint exit code

commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 14:05:18 2020 +0300

    Edit css file warnings

commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 13:10:26 2020 +0300

    Remove uglifyjs plugin

commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 01:29:17 2020 +0300

    Fix DefinePlugin value

commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date:   Sat May 16 01:05:03 2020 +0300

    Update webpack

* * blocked-services: Update new TikTok domains

* - blocked-services: fix build

* - filter: don't reset name on update

* + client: Allow `Fastest IP address` and `Parallel requests` to toggle each other: Merge pull request AdguardTeam#619 in DNS/adguard-home from feature/1678 to master
Close AdguardTeam#1678

Squashed commit of the following:

commit 9251ed0
Author: ArtemBaskal <[email protected]>
Date:   Thu May 21 18:25:18 2020 +0300

    + client: Allow `Fastest IP address` and `Parallel requests` to toggle each other

* + rewrites: support exceptions:

*.host -> IP
my.host -> my.host
*.my.host -> *.my.host

Requests for my.host and *.my.host will be passed to upstream servers,
 while all other requests for *.host will be answered with a rewritten IP

* *(querylog): added offset/limit parameters

Actually, this is a serious refactoring of the query log module. The
rest API part is refactored, it's now more clear how the search is
conducted. Split the logic into more files and added more tests.

Closes: AdguardTeam#1559

* *(querylog): decode methods to a new file

* * clients: set reload ARP data interval to 10 minuntes

* * urlfilter v0.10.1

* * web: log error messages from HTTP server as "debug"

* - client: Don't hide version string when built-in auto-update is disabled: Merge pull request AdguardTeam#628 in DNS/adguard-home from fix/1726 to master
Close AdguardTeam#1726

Squashed commit of the following:

commit 3eac793
Merge: aebfaf6 16a6aad
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 14:14:58 2020 +0300

    Merge branch 'master' into fix/1726

commit aebfaf6
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 12:54:30 2020 +0300

    Always show version but hide update button when program is launched with "--no-check-update" flag

commit 1d4ee05
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 11:59:10 2020 +0300

    Use classnames lib

commit 7003a70
Author: ArtemBaskal <[email protected]>
Date:   Tue May 26 19:40:22 2020 +0300

    - client: Don't hide version string when built-in auto-update is disabled

* * whois: use the upstream server to resolve whois server hostname
Close AdguardTeam#1535

Squashed commit of the following:

commit 7755d7a
Merge: e24e945 5c2ca69
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 14:41:24 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1535-whois-resolve

commit e24e945
Merge: db76471 355e634
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 14:29:44 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1535-whois-resolve

commit db76471
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 12:57:00 2020 +0300

    fix

commit dc38f66
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 12:44:10 2020 +0300

    * whois: use the upstream server to resolve whois server hostname

* + config: new setting "querylog_file_enabled"
Close AdguardTeam#876

Squashed commit of the following:

commit f83f60a
Merge: cfb7286 391e619
Author: Simon Zolin <[email protected]>
Date:   Thu May 28 15:17:21 2020 +0300

    Merge remote-tracking branch 'origin/master' into 876-logs

commit cfb7286
Author: Simon Zolin <[email protected]>
Date:   Thu May 28 12:50:02 2020 +0300

    tests

commit 35376e4
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 18:15:12 2020 +0300

    fix

commit 0cfb802
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 16:49:52 2020 +0300

    tests

commit 03ca280
Author: Simon Zolin <[email protected]>
Date:   Wed May 27 15:32:27 2020 +0300

    + config: new setting "querylog_file_enabled" - query log will be written to a file

* + new query logs API

+ "upstream"
+ filteringStatusProcessed
+ ctDomainOrClient
remove ctQuestionType, ctDomain, ctClient

* * openapi

* - client: Don't unregister field 'Upstream DNS servers' on rerender and allow input text continuously
Close AdguardTeam#1752

Squashed commit of the following:

commit 2f86ade
Author: ArtemBaskal <[email protected]>
Date:   Fri May 29 10:58:42 2020 +0300

    - client: Don't unregister field 'Upstream DNS servers' on rerender and allow input text continuously

* + client_proto

* * minor

* openapi

* + "dot"

* - client: Match client IP strictly: Merge pull request AdguardTeam#620 in DNS/adguard-home from fix/1687 to master
Close AdguardTeam#1687

Squashed commit of the following:

commit 5287da0
Merge: c6b50c7 83b9b70
Author: ArtemBaskal <[email protected]>
Date:   Fri May 29 12:47:23 2020 +0300

    Merge branch 'master' into fix/1687

commit c6b50c7
Author: ArtemBaskal <[email protected]>
Date:   Fri May 29 12:42:12 2020 +0300

    minor

commit dab9fa9
Author: ArtemBaskal <[email protected]>
Date:   Thu May 28 16:56:08 2020 +0300

    Add support for exact matching of long and short ipv6 notations, add tests

commit e72e86c
Author: ArtemBaskal <[email protected]>
Date:   Thu May 28 13:57:22 2020 +0300

    Update helper, write tests

commit 92f4c34
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 18:35:05 2020 +0300

    Make variable names more expressive

commit 3d38f21
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 17:09:08 2020 +0300

    Add ipv6 cidr support

commit 7db0a2f
Author: ArtemBaskal <[email protected]>
Date:   Tue May 26 12:48:57 2020 +0300

    Minor

commit 65e87f3
Author: ArtemBaskal <[email protected]>
Date:   Tue May 26 12:46:30 2020 +0300

    Add breaks between helpers

commit 3f38bdf
Author: ArtemBaskal <[email protected]>
Date:   Thu May 21 20:17:27 2020 +0300

    - client: Match client IP strictly

* -client: Fix "DNS rewrites" adding an item error

* - client: Submit setFiltersConfig action on if the values are changed: Merge pull request AdguardTeam#637 in DNS/adguard-home from fix/1749 to master
Close AdguardTeam#1749

Squashed commit of the following:

commit aaf4ba8
Author: ArtemBaskal <[email protected]>
Date:   Fri May 29 13:29:44 2020 +0300

    - client: Submit setFiltersConfig action on if the values are changed

* - client: Fix safari icon

* * blocked-services: Added 2 entries for YouTube and Amazon AWS

* - rewrites: fix invalid question in response
AdguardTeam#1746

for a rule:

cname -> domain

with IP of 'domain' resolved by upstream

Squashed commit of the following:

commit fb3ad25
Merge: a679498 67dacdf
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 1 15:15:23 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1746-rewrites

commit a679498
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 1 10:42:16 2020 +0300

    test: check question

commit 7491e75
Author: Simon Zolin <[email protected]>
Date:   Fri May 29 18:22:32 2020 +0300

    test

commit 12cb2e1
Author: Simon Zolin <[email protected]>
Date:   Fri May 29 14:51:06 2020 +0300

    - rewrites: fix invalid question in response

    for a rule:

    cname -> domain

    with IP of 'domain' resolved by upstream

* - client: Hide version on inintial setup and login: Merge pull request AdguardTeam#642 in DNS/adguard-home from fix/1748 to master

Close AdguardTeam#1748

Squashed commit of the following:

commit 16721ed
Merge: 15e1867 eac1b80
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 2 13:37:57 2020 +0300

    Merge branch 'master' into fix/1748

commit 15e1867
Author: ArtemBaskal <[email protected]>
Date:   Mon Jun 1 13:54:15 2020 +0300

    - client: Hide version on inintial setup and login

* + config: Added in lumberjack to handle rolling logs. Added more config properties around new log feature.

Reset logger max file size config. Fix AdguardTeam#1573.

Remove verbose from default config.

* * minor

* + querylog,stats: anonymize client ip: /16

* + client: Move "Blocked services" to a separate page under "Filters" menu: Merge pull request AdguardTeam#649 in DNS/adguard-home from feature/1744 to master
Close AdguardTeam#1744

Squashed commit of the following:

commit 912a80b
Merge: bb5a77f 5ce98bd
Author: ArtemBaskal <[email protected]>
Date:   Fri Jun 5 12:47:21 2020 +0300

    Merge branch 'master' into feature/1744

commit bb5a77f
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 4 18:07:26 2020 +0300

    + client: Move "Blocked services" to a separate page under "Filters" menu

* - client: Fix beyond 24 hour time format for en locale: Merge pull request AdguardTeam#651 in DNS/adguard-home from fix/1766 to master
Close AdguardTeam#1766

Squashed commit of the following:

commit 691aa0e
Merge: 67d62fa 4a81abb
Author: ArtemBaskal <[email protected]>
Date:   Fri Jun 5 13:17:46 2020 +0300

    Merge branch 'master' into fix/1766

commit 67d62fa
Author: ArtemBaskal <[email protected]>
Date:   Fri Jun 5 11:53:47 2020 +0300

    Fix jsdocs of helpers

commit 459e3cf
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 4 20:45:17 2020 +0300

    - client: Fix beyond 24 hour time format for en locale

* * log: set default LogMaxAge = 3 days

Squashed commit of the following:

commit 80a1ce1
Merge: 4e01a5b c842a68
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 17:53:53 2020 +0300

    Merge remote-tracking branch 'origin/master' into log

commit 4e01a5b
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 13:56:39 2020 +0300

    * log: set default LogMaxAge = 3 days

* * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"

* use dnsproxy v0.29.0

Squashed commit of the following:

commit f18b723
Merge: 501a4e0 dae275e
Author: Simon Zolin <[email protected]>
Date:   Wed Jun 10 15:24:15 2020 +0300

    Merge remote-tracking branch 'origin/master' into update-dnsproxy

commit 501a4e0
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 12:47:13 2020 +0300

    openapi

commit 3930bd1
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 12:21:32 2020 +0300

    * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"

    * use dnsproxy v0.29.0

* - client: Add default mode in the DNS settings: Merge pull request AdguardTeam#650 in DNS/adguard-home from fix/1770 to master
Close AdguardTeam#1770

Squashed commit of the following:

commit c1f75ea
Merge: a5df78a a869ec4
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 10 18:56:24 2020 +0300

    Merge branch 'master' into fix/1770

commit a5df78a
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 10 12:50:50 2020 +0300

    Revert "Update locales"

    This reverts commit 4b2b449.

commit 4b2b449
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 9 19:56:34 2020 +0300

    Update locales

commit 790cff0
Author: ArtemBaskal <[email protected]>
Date:   Fri Jun 5 17:56:01 2020 +0300

    Update Upstream component with new api, extract reduxForm HOC names in constant

commit 72de3d5
Merge: 92a4a6a 501a4e0
Author: ArtemBaskal <[email protected]>
Date:   Fri Jun 5 15:55:39 2020 +0300

    Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770

commit 501a4e0
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 12:47:13 2020 +0300

    openapi

commit 3930bd1
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 5 12:21:32 2020 +0300

    * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"

    * use dnsproxy v0.29.0

commit 92a4a6a
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 4 18:53:42 2020 +0300

    - client: Add default mode in the DNS settings

* - service: "stop" didn't work correctly
Close AdguardTeam#1785

Squashed commit of the following:

commit 40eba30
Author: Simon Zolin <[email protected]>
Date:   Wed Jun 10 19:43:14 2020 +0300

    - service: "stop" didn't work correctly

* - clients: fix incorrect info for clients from /etc/hosts
Close AdguardTeam#1786

Squashed commit of the following:

commit fc66225
Author: Simon Zolin <[email protected]>
Date:   Thu Jun 11 10:57:26 2020 +0300

    - clients: fix incorrect info for clients from /etc/hosts

* - client: Refactor Setup guide component: Merge pull request AdguardTeam#633 in DNS/adguard-home from fix/1740 to master
Close AdguardTeam#1740

Squashed commit of the following:

commit 13593ad
Merge: 8cdc68d 1356ac2
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 11 12:02:02 2020 +0300

    Merge branch 'master' into fix/1740

commit 8cdc68d
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 10 19:35:51 2020 +0300

    Update locales with link

commit 320d8d2
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 3 16:40:36 2020 +0300

    Refactor Tabs

commit 98bdcdb
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 3 14:01:55 2020 +0300

    Separate content from markup of dns privacy list

commit cee5e5c
Author: ArtemBaskal <[email protected]>
Date:   Wed May 27 21:12:11 2020 +0300

    - client: Refactor Setup guide component

* fix whois test

* Update README.md

Per client configuration was added in Pi-hole 5.0,

* doc

* fix search by "whitelisted", "rewritten"

* If there are no more older entries, `"oldest":""` is returned.

* openapi

* * dns: disable cache with "cache_size: 0" setting
Close AdguardTeam#1591

Squashed commit of the following:

commit 547a971
Author: Simon Zolin <[email protected]>
Date:   Tue Jun 16 14:46:06 2020 +0300

    * dns: disable cache with "cache_size: 0" setting

* * auto-hosts: support '#' comments after ip and hosts
Close AdguardTeam#1807

Squashed commit of the following:

commit 9d3e280
Author: Simon Zolin <[email protected]>
Date:   Wed Jun 17 19:23:15 2020 +0300

    improve

commit 9b8c710
Author: Simon Zolin <[email protected]>
Date:   Wed Jun 17 11:07:56 2020 +0300

    * auto-hosts: support '#' comments after ip and hosts

* Merge: fix AdguardTeam#1421
Full rework of the query log

Squashed commit of the following:

commit e8a72eb
Author: Andrey Meshkov <[email protected]>
Date:   Thu Jun 18 00:31:53 2020 +0300

    fix race in whois test

commit 801d281
Merge: 9d9787f b1c951f
Author: Andrey Meshkov <[email protected]>
Date:   Thu Jun 18 00:28:13 2020 +0300

    Merge branch 'master' into feature/1421

commit 9d9787f
Merge: 4ce337c 08e238a
Author: Andrey Meshkov <[email protected]>
Date:   Thu Jun 18 00:27:32 2020 +0300

    Merge

commit 4ce337c
Author: Andrey Meshkov <[email protected]>
Date:   Thu Jun 18 00:22:49 2020 +0300

    -(home): fix whois test

commit 08e238a
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 18 00:13:41 2020 +0300

    Add comments

commit 5f10806
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 23:47:50 2020 +0300

    Make tooltip position absolute for touch

commit 4c30a58
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 20:39:44 2020 +0300

    Prevent scroll hide for touch devices

commit 62da979
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 20:06:24 2020 +0300

    Review changes: ipad tooltip

commit 12dddcc
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 16:59:16 2020 +0300

    Add close tooltip event for ipad

commit 62191e4
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 16:39:40 2020 +0300

    Add success toast on logs refresh

commit 2ebdd6a
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 16:01:37 2020 +0300

    Fix pagination

commit 5820c92
Author: ArtemBaskal <[email protected]>
Date:   Wed Jun 17 11:31:15 2020 +0300

    Revert "Render table in chunks"

    This reverts commit cdfcd84.

commit cdfcd84
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 18:42:18 2020 +0300

    Render table in chunks

commit cc8c5e6
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 17:35:24 2020 +0300

    Add pagination button hover effect

commit f7e1340
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 16:28:00 2020 +0300

    Make loader position absolute

commit a7b887b
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 15:42:20 2020 +0300

    Ignore clients find without params

commit ecb322f
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 15:30:48 2020 +0300

    Styles changes

commit 9323ce3
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 14:32:23 2020 +0300

    Review styles changes

commit e0faa04
Merge: 9857682 15e7143
Author: ArtemBaskal <[email protected]>
Date:   Tue Jun 16 12:08:45 2020 +0300

    Merge branch '1421-new-qlog-v2' into feature/1421

commit 9857682
Author: ArtemBaskal <[email protected]>
Date:   Mon Jun 15 18:32:02 2020 +0300

    Fix response cell

... and 88 more commits

* fix log table width

* * openapi: describe top_* array entries in /stats

Squashed commit of the following:

commit d0b640c
Author: Simon Zolin <[email protected]>
Date:   Thu Jun 18 11:53:16 2020 +0300

    * openapi: describe top_* array entries in /stats

* -client: Fix query log bugs

* Replace tooltip component

* Open tooltip on hover, show scroll on overflow y

* Fix AdguardTeam#1810
- client: Fix query log bugs

Squashed commit of the following:

commit 188bbad
Merge: 15db9e9 ec6e0be
Author: Andrey Meshkov <[email protected]>
Date:   Thu Jun 18 22:43:11 2020 +0300

    Merge branch 'master' into fix/1810

commit 15db9e9
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 18 19:01:10 2020 +0300

    Open tooltip on hover, show scroll on overflow y

commit 19c0133
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 18 17:17:46 2020 +0300

    Replace tooltip component

commit 7e7103d
Author: ArtemBaskal <[email protected]>
Date:   Thu Jun 18 14:21:54 2020 +0300

    -client: Fix query log bugs

* - autohosts: fix crash on startup if filesystem watcher couldn't be initialized
Close AdguardTeam#1814

Squashed commit of the following:

commit ba17a5b
Author: Simon Zolin <[email protected]>
Date:   Fri Jun 19 10:08:44 2020 +0300

    - autohosts: fix crash on startup if filesystem watcher couldn't be initialized

* minor

* + dns: respond to PTR requests for internal IP addresses from DHCP
Close AdguardTeam#1682

Squashed commit of the following:

commit 2fad354
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 22 17:32:45 2020 +0300

    minor

commit 7c17992
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 22 16:09:34 2020 +0300

    build

commit 16a52e1
Merge: 7b6a73c 2c47053
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 22 16:08:32 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1682-dhcp-resolve

commit 7b6a73c
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 22 16:01:34 2020 +0300

    tests

commit c2654ab
Author: Simon Zolin <[email protected]>
Date:   Mon Jun 1 15:15:13 2020 +0300

    + dnsforward: respond to PTR requests for internal IP addresses

    {[IP] => "host"} <- DNSforward <-(leases)-- DHCP

* + pass client Name and IP to dnsfilter

* use urlfilter v0.11.0

* *(home): do not require root privileges on the first run

Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.

Closes: AdguardTeam#1699

* fix function comment

Co-authored-by: Jonas Marklén <[email protected]>
Co-authored-by: ArtemBaskal <[email protected]>
Co-authored-by: Andrey Meshkov <[email protected]>
Co-authored-by: Christian Glockner <[email protected]>
Co-authored-by: Simon Zolin <[email protected]>
Co-authored-by: Archive5 <[email protected]>
Co-authored-by: Ayhan <[email protected]>
Co-authored-by: Imre Kristoffer Eilertsen <[email protected]>
Co-authored-by: DannyHinshaw <[email protected]>
Co-authored-by: gumadozucia <[email protected]>
  • Loading branch information
@eoghan2t9 @TXC
@ArtemBaskal @ameshkov @szolin @Aikatsui @c0b41 @DandelionSprout @gumadozucia
11 people authored Jun 25, 2020
1 parent 5df4237 commit 47e68fb
Show file tree
Hide file tree
Showing 259 changed files with 23,151 additions and 16,648 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
*.snap
launchpad_credentials
snapcraft_login
snapcraft.yaml.bak
snapcraft.yaml.bak

# IntelliJ IDEA project files
*.iml
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ issues:
- G108
# gosec: Subprocess launched with function call as argument or cmd arguments
- G204
# gosec: Potential DoS vulnerability via decompression bomb
- G110
# gosec: Expect WriteFile permissions to be 0600 or less
- G306
4 changes: 2 additions & 2 deletions .twosky.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"it": "Italiano",
"no": "Norsk",
"pl": "Polski",
"pt-br": "Portuguese (BR)",
"pt-pt": "Portuguese (PT)",
"pt-br": "Português (BR)",
"pt-pt": "Português (PT)",
"ro": "Română",
"sk": "Slovenčina",
"sl": "Slovenščina",
Expand Down
41 changes: 28 additions & 13 deletions AGHTechDoc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,7 @@ Response:
"edns_cs_enabled": true | false,
"dnssec_enabled": true | false
"disable_ipv6": true | false,
"fastest_addr": true | false, // use Fastest Address algorithm
"parallel_requests": true | false, // send DNS requests to all upstream servers at once
"upstream_mode": "" | "parallel" | "fastest_addr"
}


Expand All @@ -916,8 +915,7 @@ Request:
"edns_cs_enabled": true | false,
"dnssec_enabled": true | false
"disable_ipv6": true | false,
"fastest_addr": true | false, // use Fastest Address algorithm
"parallel_requests": true | false, // send DNS requests to all upstream servers at once
"upstream_mode": "" | "parallel" | "fastest_addr"
}

Response:
Expand Down Expand Up @@ -1200,8 +1198,9 @@ When a new DNS request is received and processed, we store information about thi
"QH":"...", // target host name without the last dot
"QT":"...", // question type
"QC":"...", // question class
"Answer":"...",
"OrigAnswer":"...",
"CP":"" | "doh", // client connection protocol
"Answer":"base64 data",
"OrigAnswer":"base64 data",
"Result":{
"IsFiltered":true,
"Reason":3,
Expand Down Expand Up @@ -1234,16 +1233,28 @@ Request:

GET /control/querylog
?older_than=2006-01-02T15:04:05.999999999Z07:00
&filter_domain=...
&filter_client=...
&filter_question_type=A | AAAA
&filter_response_status= | filtered
&search=...
&response_status="..."

`older_than` setting is used for paging. UI uses an empty value for `older_than` on the first request and gets the latest log entries. To get the older entries, UI sets `older_than` to the `oldest` value from the server's response.
`older_than` setting is used for paging. UI uses an empty value for `older_than` on the first request and gets the latest log entries. To get the older entries, UI sets `older_than` to the `oldest` value from the server's response.

If "filter" settings are set, server returns only entries that match the specified request.
If search settings are set, server returns only entries that match the specified request.

For `filter.domain` and `filter.client` the server matches substrings by default: `adguard.com` matches `www.adguard.com`. Strict matching can be enabled by enclosing the value in double quotes: `"adguard.com"` matches `adguard.com` but doesn't match `www.adguard.com`.
`search`:
match by domain name or client IP address.
The server matches substrings by default: e.g. `adguard.com` matches `www.adguard.com`.
Strict matching can be enabled by enclosing the value in double quotes: e.g. `"adguard.com"` matches `adguard.com` but doesn't match `www.adguard.com`.

`response_status`:
* all
* filtered - all kinds of filtering
* blocked - blocked or blocked service
* blocked_safebrowsing - blocked by safebrowsing
* blocked_parental - blocked by parental control
* whitelisted - whitelisted
* rewritten - all kinds of rewrites
* safe_search - enforced safe search
* processed - not blocked, not white-listed entries

Response:

Expand All @@ -1266,8 +1277,10 @@ Response:
}
...
],
"upstream":"...", // Upstream URL starting with tcp://, tls://, https://, or with an IP address
"answer_dnssec": true,
"client":"127.0.0.1",
"client_proto": "" (plain) | "doh" | "dot",
"elapsedMs":"0.098403",
"filterId":1,
"question":{
Expand All @@ -1287,6 +1300,8 @@ Response:

The most recent entries are at the top of list.

If there are no more older entries, `"oldest":""` is returned.


### API: Set querylog parameters

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $(TARGET): $(STATIC) *.go home/*.go dhcpd/*.go dnsfilter/*.go dnsforward/*.go
docker:
docker build -t "$(DOCKER_IMAGE_DEV_NAME)" -f "$(DOCKERFILE)" .
@echo Now you can run the docker image:
@echo docker run --name "$(DOCKER_IMAGE_DEV_NAME)" -p 53:53/tcp -p 53:53/udp -p 3000:3000/tcp $(DOCKER_IMAGE_DEV_NAME)
@echo docker run --name "$(DOCKER_IMAGE_DEV_NAME)" -p 53:53/tcp -p 53:53/udp -p 80:80/tcp -p 443:443/tcp -p 853:853/tcp -p 3000:3000/tcp $(DOCKER_IMAGE_DEV_NAME)

clean:
$(MAKE) cleanfast
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ AdGuard Home provides a lot of features out-of-the-box with no need to install a
| Encrypted DNS upstream servers (DNS-over-HTTPS, DNS-over-TLS, DNSCrypt) | ✅ | ❌ (requires additional software) |
| Cross-platform | ✅ | ❌ (not natively, only via Docker) |
| Running as a DNS-over-HTTPS or DNS-over-TLS server | ✅ | ❌ (requires additional software) |
| Blocking phishing and malware domains | ✅ | ❌ |
| Blocking phishing and malware domains | ✅ | ❌ (requires non-default blocklists) |
| Parental control (blocking adult domains) | ✅ | ❌ |
| Force Safe search on search engines | ✅ | ❌ |
| Per-client (device) configuration | ✅ | ❌ |
| Per-client (device) configuration | ✅ | ✅ |
| Access settings (choose who can use AGH DNS) | ✅ | ❌ |

<a id="comparison-adblock"></a>
Expand Down
58 changes: 34 additions & 24 deletions build_snap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ SNAP_NAME="adguard-home"
LAUNCHPAD_CREDENTIALS_DIR=".local/share/snapcraft/provider/launchpad"

if [[ -z ${VERSION} ]]; then
VERSION=`git describe --abbrev=4 --dirty --always --tags`
VERSION=$(git describe --abbrev=4 --dirty --always --tags)
echo "VERSION env variable is not set, getting it from git: ${VERSION}"
fi

# If bash is interactive, set `-it` parameter for docker run
INTERACTIVE=""
if [ -t 0 ] ; then
if [ -t 0 ]; then
INTERACTIVE="-it"
fi

Expand Down Expand Up @@ -80,14 +80,14 @@ function prepare() {
consumer_secret =
access_token = ${LAUNCHPAD_ACCESS_TOKEN}
access_secret = ${LAUNCHPAD_ACCESS_SECRET}
" > launchpad_credentials
" >launchpad_credentials

# Snapcraft login data
# It can be exported using snapcraft export-login command
echo "[login.ubuntu.com]
macaroon = ${SNAPCRAFT_MACAROON}
unbound_discharge = ${SNAPCRAFT_UBUNTU_DISCHARGE}
email = ${SNAPCRAFT_EMAIL}" > snapcraft_login
email = ${SNAPCRAFT_EMAIL}" >snapcraft_login

# Prepare the snap configuration
cp ${SNAPCRAFT_TMPL} ./snapcraft.yaml
Expand Down Expand Up @@ -121,7 +121,7 @@ build_snap_docker() {
# prepare credentials
prepare

docker run ${INTERACTIVE} --rm \
docker run ${INTERACTIVE} --rm \
-v $(pwd):/build \
-v $(pwd)/launchpad_credentials:/root/${LAUNCHPAD_CREDENTIALS_DIR}/credentials:ro \
${BUILDER_IMAGE} \
Expand All @@ -141,8 +141,8 @@ rename_snap_file() {
# Check that the snap file exists
snapFile="${SNAP_NAME}_${VERSION}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!"
exit 1
echo "Snap file ${snapFile} not found!"
exit 1
fi

mv -f ${snapFile} "${SNAP_NAME}_${ARCH}.snap"
Expand All @@ -155,8 +155,8 @@ publish_snap() {
# Check that the snap file exists
snapFile="${SNAP_NAME}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!"
exit 1
echo "Snap file ${snapFile} not found!"
exit 1
fi

# Login if necessary
Expand All @@ -176,8 +176,8 @@ publish_snap_docker() {
# Check that the snap file exists
snapFile="${SNAP_NAME}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!"
exit 1
echo "Snap file ${snapFile} not found!"
exit 1
fi

# Login and publish the snap
Expand Down Expand Up @@ -229,10 +229,15 @@ publish_docker() {
exit 1
fi

ARCH=i386 publish_snap_docker
ARCH=arm64 publish_snap_docker
ARCH=armhf publish_snap_docker
ARCH=amd64 publish_snap_docker
if [[ -n "$2" ]]; then
echo "ARCH is set to $2"
ARCH=$2 publish_snap_docker
else
ARCH=i386 publish_snap_docker
ARCH=arm64 publish_snap_docker
ARCH=armhf publish_snap_docker
ARCH=amd64 publish_snap_docker
fi
}

publish() {
Expand All @@ -246,10 +251,15 @@ publish() {
exit 1
fi

ARCH=i386 publish_snap
ARCH=arm64 publish_snap
ARCH=armhf publish_snap
ARCH=amd64 publish_snap
if [[ -n "$2" ]]; then
echo "ARCH is set to $2"
ARCH=$2 publish_snap
else
ARCH=i386 publish_snap
ARCH=arm64 publish_snap
ARCH=armhf publish_snap
ARCH=amd64 publish_snap
fi
}

cleanup() {
Expand All @@ -270,13 +280,13 @@ fi
case "$1" in
"build-docker") build_docker $2 ;;
"build") build $2 ;;
"publish-docker-beta") publish_docker beta ;;
"publish-docker-release") publish_docker stable ;;
"publish-beta") publish beta ;;
"publish-release") publish stable ;;
"publish-docker-beta") publish_docker beta $2 ;;
"publish-docker-release") publish_docker stable $2 ;;
"publish-beta") publish beta $2 ;;
"publish-release") publish stable $2 ;;
"prepare") prepare ;;
"cleanup") cleanup ;;
*) usage ;;
esac

exit 0
exit 0
4 changes: 3 additions & 1 deletion changelog.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ module.exports = {
],
"scopes": [
"",
"ui",
"global",
"dnsfilter",
"home",
"dnsforward",
"dhcpd",
"documentation"
"querylog",
"documentation",
],
"types": {
"+": {
Expand Down
0 client/.eslintrc → client/.eslintrc.json
View file
File renamed without changes.
1 change: 1 addition & 0 deletions client/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.js text eol=lf
14 changes: 14 additions & 0 deletions client/babel.config.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = (api) => {
api.cache(false);
return {
presets: [
'@babel/preset-env',
'@babel/preset-react',
],
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-runtime',
'@babel/plugin-proposal-object-rest-spread',
],
};
};
5 changes: 5 additions & 0 deletions client/jest.config.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
transform: {
'^.+\\.jsx?$': 'babel-jest',
},
};
Loading

0 comments on commit 47e68fb

Please sign in to comment.