ArtemBaskal
5f13d4ab4a
Add assets folder
2020-05-14 14:45:16 +03:00
ArtemBaskal
26ac9e4224
Add icons to server
2020-05-14 12:06:22 +03:00
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
Andrey Meshkov
7a3eda02ce
Fix #1069 install: check static ip
...
Squashed commit of the following:
commit 57466233cb
Merge: 2df5f281
867bf545
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Feb 13 18:39:15 2020 +0300
Merge branch 'master' into 1069-install-static-ip
commit 2df5f281c4
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Feb 13 18:35:54 2020 +0300
*: lang fix
commit b4649a6b27
Merge: c2785253
f61d5f0f
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Feb 13 16:47:30 2020 +0300
*(home): fixed issues with setting static IP on Mac
commit c27852537d
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Feb 13 14:14:30 2020 +0300
+(dhcpd): added static IP for MacOS
commit f61d5f0f85
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu Feb 13 14:13:35 2020 +0300
+ client: show confirm before setting static IP
commit 7afa16fbe7
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu Feb 13 13:51:52 2020 +0300
- client: fix text
commit 019bff0851
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu Feb 13 13:49:16 2020 +0300
- client: pass all params to the check_config request
commit 194bed72f5
Author: Andrey Meshkov <am@adguard.com>
Date: Wed Feb 12 17:12:16 2020 +0300
*: fix home_test
commit 9359f6b55f
Merge: ae299058
c5ca2a77
Author: Andrey Meshkov <am@adguard.com>
Date: Wed Feb 12 15:54:54 2020 +0300
Merge with master
commit ae2990582d
Author: Andrey Meshkov <am@adguard.com>
Date: Wed Feb 12 15:53:36 2020 +0300
*(global): refactoring - moved runtime properties to Context
commit d8d48c5386
Author: Andrey Meshkov <am@adguard.com>
Date: Wed Feb 12 15:04:25 2020 +0300
*(dhcpd): refactoring, use dhcpd/network_utils where possible
commit 8d039c572f
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Fri Feb 7 18:37:39 2020 +0300
- client: fix button position
commit 26c47e59dd
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Fri Feb 7 18:08:56 2020 +0300
- client: fix static ip description
commit cb12babc46
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Feb 7 17:08:39 2020 +0300
*: lower log level for some commands
commit d9001ff848
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Feb 7 16:17:59 2020 +0300
*(documentation): updated openapi
commit 1d213d53c8
Merge: 8406d7d2
80861860
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Feb 7 15:16:46 2020 +0300
*: merge with master
commit 8406d7d288
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Fri Jan 31 16:52:22 2020 +0300
- client: fix locales
commit fb476b0117
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 31 13:29:03 2020 +0300
linter
commit 84b5708e71
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 31 13:27:53 2020 +0300
linter
commit 143a86a28a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 31 13:26:47 2020 +0300
linter
... and 7 more commits
2020-02-13 18:42:07 +03:00
Andrey Meshkov
c5ca2a779c
*: fixed some linter warnings
2020-02-11 12:59:21 +03:00
Andrey Meshkov
808618602c
*(global): fix ARM build auto-update
...
✅ Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1391
2020-02-06 20:55:37 +03:00
Andrey Meshkov
fc88f59f61
*(global): fixed service implementation for OpenWrt
...
We now use a procd init script for OpenWrt just like it's recommended in
the documentation. The service is automatically enabled on the install
command.
✅ Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1386
2020-02-05 17:38:23 +03:00
Simon Zolin
2151563757
+ http: allow access to /__locales/ when not authenticated
2020-01-31 14:15:11 +03:00
Simon Zolin
f3b41efff3
* http: allow access to /__locales/ while installing
2020-01-31 14:09:04 +03:00
Simon Zolin
0d7c01d50f
+ GET /filtering/check_host: Check if host name is filtered
2020-01-30 12:08:46 +03:00
Simon Zolin
dcc575402b
Merge: * clients: update runtime clients of type DHCP by event from DHCP module
...
Close #1378
Squashed commit of the following:
commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients
commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 20:08:06 2020 +0300
minor
commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 19:31:08 2020 +0300
fix
commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 29 12:53:22 2020 +0300
minor
commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:55:10 2020 +0300
* clients: update runtime clients of type DHCP by event from DHCP module
commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:52:08 2020 +0300
* minor
commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 28 19:08:23 2020 +0300
* clients: remove old entries of source type /etc/hosts or ARP
2020-01-30 10:25:02 +03:00
Simon Zolin
f2591e1d8a
* minor
2020-01-28 14:33:58 +03:00
Simon Zolin
b519c3a83f
* minor
2020-01-28 14:07:11 +03:00
Simon Zolin
91c2712366
+ clients: support per-client tags
2020-01-28 14:06:52 +03:00
Simon Zolin
080e1dd74e
* auth: respond with 403 for API requests when not authenticated
2020-01-22 18:11:26 +03:00
Simon Zolin
0b8cba7384
* filtering/set_url: allow changing Name and URL parameters
2020-01-21 14:19:05 +03:00
Simon Zolin
8daca1a55a
* config: set "default" blocking mode by default
2020-01-20 19:14:14 +03:00
Simon Zolin
254cab3a23
- install: fix DNS nameserver issue after we disable DNSStubListener on Ubuntu
2020-01-16 14:28:21 +03:00
Simon Zolin
6563886b49
Merge: - install: recover from error on DNS server start
...
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice
2020-01-16 14:25:40 +03:00
Simon Zolin
e398117d25
Merge: Service: Support installation on OpenWrt
...
Close #1348
Squashed commit of the following:
commit 87cca9129631350681ec77d1dee0781f0a237387
Merge: 313beee1 9b0096dd
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 16 12:41:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1348-openwrt
commit 313beee114e1daae8319192949b4db5fd8321df1
Merge: 16225231 e2f9e298
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 16 12:01:21 2020 +0300
Merge remote-tracking branch 'origin/master' into 1348-openwrt
commit 16225231bf3836fc6785ebefe44d239591b0485e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 16 11:59:59 2020 +0300
minor
commit faca9821003334d2032ccec1010eb2acbac88743
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 16 11:54:53 2020 +0300
minor
commit 0e92ec123023cb6b81ef5cfd7e3ae454c3931980
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 15 14:03:40 2020 +0300
minor
commit 3185b1d48f31a95857a27e8ed858443f977e97af
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 14 13:18:00 2020 +0300
minor
commit 6bd6012d01ef55631215a5542630ccf92180739e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Jan 13 19:57:44 2020 +0300
- service: fix installation on OpenWrt
2020-01-16 12:44:06 +03:00
Simon Zolin
5773df6f6c
Merge: + --version: Show the version and exit
...
Close #1285
Squashed commit of the following:
commit fdc616f38651f9fcc16442003bd15adb88e2c2b1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 15 18:46:00 2020 +0300
minor
commit 6f5a22c86e5fe76c3959343a8077d3997ff0707d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 30 19:19:30 2019 +0300
+ --version: Show the version and exit
2020-01-16 10:42:03 +03:00
Simon Zolin
eb6c4eb132
+ release.sh: add armv5 build
...
Close #1239
Squashed commit of the following:
commit 707e2f8e265e294c7b1328c375648f799a5ae293
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 10 16:32:52 2020 +0300
leave "AdGuardHome_linux_arm" by default
commit cca01fd03200e70d6ee2201540570382f2b7fdf4
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 10 14:53:37 2020 +0300
fix auto-update; update readme
commit f393a4f511861ef1998c68775bb8f234c5ce1838
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 10 13:00:37 2020 +0300
+ release.sh: add armv5 build; rename armv6 build
commit 73f2d20ba6b0a94a9929882fe15175ba80b528d7
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jan 10 12:59:55 2020 +0300
* release.sh: fix indentation
2020-01-15 18:58:12 +03:00
Simon Zolin
d154502b31
Merge: * auto-update: check if executable file exists
...
Close #1307
* commit '1792fd3e0f2a7a73536e2bdb29973074be8adf57':
* auto-update: check if executable file exists
2020-01-15 18:52:23 +03:00
Simon Zolin
47631105c7
Merge: * filters: use increasing update interval
...
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval
2020-01-15 18:41:27 +03:00
Simon Zolin
b3ddae7f85
* clients: manual clients don't exclude auto-clients anymore
2020-01-10 15:52:40 +03:00
Simon Zolin
995373c74b
* clients: Upstreams cache: refactor
...
don't use a separate container
2020-01-10 15:52:38 +03:00
Simon Zolin
87bcb67f8f
* clients: remove WHOIS info for manually-added clients
2020-01-10 15:51:57 +03:00
Simon Zolin
0cd25cf598
Merge: - clients: fix rename
...
Close #1340
Squashed commit of the following:
commit 95f0291c681f98c29f4014b651c159d387301af4
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 9 18:56:23 2020 +0300
add test
commit 293be277e245ff2f430e8c1e9ee3e82dc7da0995
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Jan 9 16:04:36 2020 +0300
- clients: fix rename
2020-01-10 15:28:58 +03:00
Simon Zolin
1792fd3e0f
* auto-update: check if executable file exists
2020-01-10 12:40:16 +03:00
Simon Zolin
4386e8ddde
- settings safebrowsing_enabled and safesearch_enabled were incorrect (reversed)
2020-01-09 15:01:54 +03:00
Andrey Meshkov
3a077717ae
*(home): do not set whois-info for manually created clients
...
✅ Closes: Do not set WhoisInfo for manually created clients
2019-12-23 20:02:06 +03:00
Andrey Meshkov
cdd55139fa
*(dnsforward): cache upstream instances
...
✅ Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1296
2019-12-23 19:31:27 +03:00
Andrey Meshkov
3dd91cf179
-: add one more test
2019-12-23 17:12:50 +03:00
Andrey Meshkov
6bf512f96f
-(home): fix searching clients by mac address
2019-12-23 16:59:02 +03:00
Andrey Meshkov
9b93d43ac6
-(home): fix deadlock in clients
2019-12-23 16:27:24 +03:00
Andrey Meshkov
ec7a62e123
-(home): fix duplicate check when adding a new ClientHost
2019-12-23 16:20:12 +03:00
Andrey Meshkov
abbf8fb87b
-(global): fixing the installation flow on windows
...
There could be a bug caused by the lack of SO_REUSEPORT
2019-12-23 14:57:10 +03:00
Simon Zolin
91c3149ee2
+ allow_unencrypted_doh: add test
2019-12-20 14:50:54 +03:00
Krombel
ec8fe0b40c
+ DNS: Allow DOH queries via unencrypted HTTP (e.g. for reverse proxying)
2019-12-20 12:22:43 +03:00
Simon Zolin
04de9d0f7b
Merge: - DNS: "custom_ip" blocking mode didn't work after app restart
...
Close #1262
Squashed commit of the following:
commit bacd683ef5b52e275323a3c07b370ca08702403e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 17:00:49 2019 +0300
fix
commit 3d4f9626460de3e13a621f2b8e535e9e0939e2bb
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 16:54:23 2019 +0300
fix
commit bf924bf90e9b705883bec88f8d7af11c39c1f322
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 16:45:41 2019 +0300
add test
commit 43338ea3645a025d69dd838bc732344255960bed
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 16:07:51 2019 +0300
- DNS: "custom_ip" blocking mode didn't work after app restart
commit 220f32e713a95d2c67355c61e419dd09df9d42b2
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 15:46:01 2019 +0300
- first run: fix panic on stop in case initialization didn't complete
e.g. when Stats module can't be initialized because of incompatible file system
2019-12-16 17:04:30 +03:00
Simon Zolin
6a2430b799
Merge: - clients: IPv6 address matching didn't work
...
Close #1261
Squashed commit of the following:
commit acc39ea6c0d88cb9d2b07837e89db2c170263891
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 12:29:33 2019 +0300
minor
commit 0d2ef3d53185d5ca17797e2ac20f0efc1498a53c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 12:13:17 2019 +0300
add link to GH
commit 0da754b1751057968780b457a2f490f4148275a8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Dec 16 11:53:42 2019 +0300
- clients: IPv6 address matching didn't work
2019-12-16 12:36:52 +03:00
Simon Zolin
b00a789ca3
Revert "Merge: + DNS: TLS handshake: terminate handshake on bad SNI"
...
This reverts commit c8c76ae12b
.
2019-12-13 17:38:17 +03:00
Simon Zolin
c8c76ae12b
Merge: + DNS: TLS handshake: terminate handshake on bad SNI
...
Close #1014
Squashed commit of the following:
commit 759248efc0587ff2f288996c47739e602c557a76
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 19:26:46 2019 +0300
support empty ServerName
commit 68afecd5eca5ae66262b12dcb414b50efe88dc02
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 14:40:22 2019 +0300
+ DNS: TLS handshake: terminate handshake on bad SNI
2019-12-13 13:06:37 +03:00
Simon Zolin
aa202277fb
Merge: * update translations
...
Close #1250
Squashed commit of the following:
commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr
2019-12-12 18:42:51 +03:00
Simon Zolin
c9ccc53282
Merge: * set BlockingMode: "null_ip" by default; minor improvements
...
Squashed commit of the following:
commit 653544b98dc4d1b9a74e1509d0e6104b71bcdcb3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 17:34:41 2019 +0300
* DNS reconfigure: protect against delayed socket fd close
commit 9e650f37dee7f771bf1d9d714c35f0a81788aa16
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 15:28:33 2019 +0300
- fix race on startup
commit 878fdb8fc4ebbc6fab683a65f5e4298e64c2073e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 15:11:21 2019 +0300
* travis: don't run tests
commit 1c4ab60684ee22d55e6d2a3350c0f24d9844255c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 14:56:28 2019 +0300
* travis: 'release.sh' and then run tests
commit e1f644b8d9a1f3b46990cdfb1b75fd81b3a49d33
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Dec 11 14:52:59 2019 +0300
* set BlockingMode: "null_ip" by default
2019-12-11 17:54:34 +03:00
Simon Zolin
0a66913b4d
Merge: * use upstream servers directly for the internal DNS resolver
...
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
2019-12-11 12:38:58 +03:00
Artem Baskal
4f0975bab5
+ client: add norwegian language
2019-12-05 14:56:52 +03:00
Simon Zolin
7313c3bc53
+ use per-client DNS servers
2019-12-05 13:16:41 +03:00
Simon Zolin
b6b26c0681
Merge: - rDNS: support multiple Answer records
...
Close #1230
* commit '56a0c9684bfdb8bebbeea5eb94192a215d8d45a1':
- rDNS: support multiple Answer records
2019-12-05 13:14:57 +03:00
Simon Zolin
56a0c9684b
- rDNS: support multiple Answer records
2019-12-05 13:06:52 +03:00
Simon Zolin
8dbdf49c32
* use dnsproxy v0.22.0 and urlfilter v0.7.0
2019-12-03 20:55:45 +03:00