a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,416 Commits 3 Branches 0 Tags 192 MiB
Commit Graph

2416 Commits

Author SHA1 Message Date
Simon Zolin 4efc464e98 - querylog: file rotation didn't work properly; fix entry searching algorithm 
If AGH is restarted, file rotation timer is reset
which can lead to the situation when file rotation procedure is never started.

Squashed commit of the following:

commit 427ae91a512cd146ebfffad06ed24eb723cb9e7d
Merge: 067fac65 e56c746b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 18:18:46 2020 +0300

    Merge remote-tracking branch 'origin/master' into qlogs-rotate

commit 067fac65b1a87d499900f4860ffa96ed8208967c
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 15:30:48 2020 +0300

    minor

commit c2059a15700e5696cb1bb5cd49129c6020d986f4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 14:53:07 2020 +0300

    improve

commit a279438eaf1cf40b820652093fb56d56784de7d8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 18:49:14 2020 +0300

    minor

commit 26ac130f139f565de39200e484b3bd4a04afcfcc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 13:54:27 2020 +0300

    rename

commit 0fad7b88dbeadcddd4d77536a18da72f3203ea80
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 13:05:36 2020 +0300

    + TestQLogSeek

commit fa6afc6d4dc592b1fef67c4a069ea50fae600a58
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 13:05:34 2020 +0300

    minor

commit 11e6ab9131e5c37467e8530a2db95a82bbb0603b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 31 19:45:47 2020 +0300

    fix tests

commit 7cbb89948df0e69b1bae8f8cde1879b5b1c4b1d6
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 31 19:29:43 2020 +0300

    - querylog: fix entry searching algorithm

commit 745d44863d88b321bd7001f24a68620f7ef05819
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 31 18:34:14 2020 +0300

    - querylog: file rotation didn't work properly

    If AGH is restarted, file rotation timer is reset
     which can lead to the situation when file rotation procedure is never started.
 2020-09-02 19:42:26 +03:00
Artem Baskal e56c746b60 - client: Do not redirect to login page from install and login pages 
Close #2036

Squashed commit of the following:

commit 9880b80671973929b732bb45f767392627ddecc1
Merge: 55a51ea2 7b9cef3a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 2 16:34:43 2020 +0300

    Merge branch 'master' into fix/unauthorized_redirect_logic

commit 55a51ea2947a43c339c8e5111ba79e4d52b26c84
Merge: 170b7387 7931e506
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 2 15:54:38 2020 +0300

    Merge branch 'master' into fix/unauthorized_redirect_logic

commit 170b7387b06e6c9b30b50cc673f7457976007b0f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Aug 25 17:13:02 2020 +0300

    - client: Do not redirect to login page from install and login pages
 2020-09-02 17:51:38 +03:00
Artem Baskal 7b9cef3a08 - client: Fix location icon size 
Close #2061

* commit 'f363c95ef58a52c134dcca1cd7c58b4dc2358405':
  - client: Fix location icon size
 2020-09-02 16:29:20 +03:00
ArtemBaskal f363c95ef5 - client: Fix location icon size 2020-09-02 16:09:59 +03:00
Simon Zolin 729f4b1766 Merge: * install: don't show an error about static IP if an interface is not selected 
* commit '67bf027616df85911dca3caeef9b3d40d9e964ea':
  * install: don't show an error about static IP if an interface is not selected
 2020-09-02 16:07:08 +03:00
Simon Zolin 67bf027616 * install: don't show an error about static IP if an interface is not selected 2020-09-02 15:50:09 +03:00
Simon Zolin 7931e50673 + DNS: add "ipset" configuration setting 
Close #1191

Squashed commit of the following:

commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 14:03:19 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1191-ipset

commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 12:50:56 2020 +0300

    minor

commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 2 12:43:25 2020 +0300

    minor

commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 18:40:04 2020 +0300

    move code, ipset-v6

commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 1 15:53:27 2020 +0300

    comment

commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 31 17:43:23 2020 +0300

    minor

commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 31 15:30:52 2020 +0300

    + DNS: add "ipset" configuration setting
 2020-09-02 14:13:45 +03:00
Artem Baskal 6b61429572 Pull request 743: + client: Query Logs Infinite Scroll 
Merge in DNS/adguard-home from feature/infinite_scroll_query_logs to master

Squashed commit of the following:

commit 4407ef2e7c055066257da791fbd65e6b0a495729
Merge: 40b74522 0a4781be
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 16:20:23 2020 +0300

    Merge branch 'master' into feature/infinite_scroll_query_logs

commit 40b745225112cf8d664220ed8f484b0aa16e997c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 15:46:27 2020 +0300

    Remove dynamic translation of toasts

commit f08fa7b8c6a243f6b10e924aebccc183ce7814fd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 13:59:53 2020 +0300

    Remove renderLimitIdx, update isEntireLog

commit 0f1b02616faaa5759c0a3f6d8257117fa22094d9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 11:11:14 2020 +0300

    Rename variables

commit 0928570c689c1fa704af775382620d68893e7c1c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 11:06:50 2020 +0300

    Make query logs short polling function more expressive

commit 9e773cbd6c287a1c799fa2680f3462508462ea7a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 1 11:06:19 2020 +0300

    Fix Toast translation interface

commit f9c57033e5adc5788954cf086b2f114dd8938bcb
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Aug 31 17:01:36 2020 +0300

    Do not hide loader

commit b86ba48613437f5559a748ad9aa4cf79d15db082
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Aug 31 16:56:34 2020 +0300

    Add dynamic translation for all toasts

commit b9d1d9b447ca90a3c179e503fa5d4abd3516321e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Aug 31 16:39:29 2020 +0300

    Prevent getting query logs recursion if query is not changed

commit e25189749f7912648cca4503cfa8d0ad898c4bb6
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Aug 31 10:13:20 2020 +0300

    Decrease page limit to 20

commit 8b248ac5276899de838abf2dc9a69e47599cfc12
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Aug 28 18:47:12 2020 +0300

    Return checkFilteredLogs

commit bf2d65c4a3dca0da6b15f632ae11042b7c8e2045
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Aug 28 18:33:51 2020 +0300

    Review changes

commit 01b5250f9d9136a1f334086d3e2f00d1a928b37b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Aug 28 15:29:59 2020 +0300

    Remove checkFilteredLogs

commit 25b364c41e6a1489d930c8b3b39b1ab43723f29d
Merge: 1dc66034 2c666cbd
Author: Andrey Meshkov <am@adguard.com>
Date:   Fri Aug 28 14:28:47 2020 +0300

    Merge branch 'feature/infinite_scroll_query_logs' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/infinite_scroll_query_logs

commit 1dc6603421cde9847e792bfe77ff6546e53fbc2a
Author: Andrey Meshkov <am@adguard.com>
Date:   Fri Aug 28 14:28:01 2020 +0300

    disregard maxFileScanEntries only if offset is set

commit bad741ed7f1dccf6959d43d000b8c0150f526f9e
Author: Andrey Meshkov <am@adguard.com>
Date:   Fri Aug 28 11:57:45 2020 +0300

    Fix search behavior when limit is specified

commit 2c666cbdde465cf17434126830dd99ceedfc4cbc
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 27 18:50:28 2020 +0300

    Hide table ref loader during data loading

commit 8b4f7fe642ef9e87a979813dcdbd7817d64c27f9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 27 18:43:24 2020 +0300

    Repair search

commit 26fae1ae01a789999b8a2181d60b35663a20460a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 27 17:59:27 2020 +0300

    Resetting initial render index, change loader position on search

commit e2c97ae1a288438267eef9aec71b979319674a71
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 27 16:02:03 2020 +0300

    Change isScrolledIntoView

... and 32 more commits
 2020-09-01 16:30:30 +03:00
Simon Zolin 0a4781be97 * urlfilter v0.12.2 
Close #1950

* commit '268d90b5bc8f6e05633a043abb0d8a2fdc8736e5':
  * urlfilter v0.12.2
 2020-09-01 15:50:50 +03:00
Simon Zolin 268d90b5bc * urlfilter v0.12.2 2020-09-01 15:37:03 +03:00
Andrey Meshkov 7d3a72e626 Fix NoCoin list source 2020-08-31 11:40:08 +03:00
Simon Zolin c822297065 Merge: * Update URLs for default filters 
* commit 'f04acaf92e59b0249912b8e6464d1f9c2f9ccc68':
  * Makefile: run 'npm ci' for 'lint-js' target
  * Update URLs for default filters
 2020-08-28 12:48:27 +03:00
Simon Zolin f04acaf92e * Makefile: run 'npm ci' for 'lint-js' target 2020-08-28 11:59:27 +03:00
KizunaH facf72f774 * Update URLs for default filters 2020-08-28 11:06:49 +03:00
Andrey Meshkov c2ba8e4c09 Update readme 2020-08-27 23:54:48 +03:00
Simon Zolin 1531175da2 Merge: Revert "* make ci: exec linter" 
* commit 'fa252ac2ec9a82554e09f15956ccceb7f733efad':
  Revert "* make ci: exec linter"
 2020-08-27 10:07:59 +03:00
Simon Zolin fa252ac2ec Revert "* make ci: exec linter" 
This reverts commit 8cdef18358.
 2020-08-26 20:15:10 +03:00
Simon Zolin 98b6eb320f - DNS: didn't process requests while updating filters 
#2043

Squashed commit of the following:

commit cf430fed46ead2de4cd89f1adef40874b4a35536
Merge: 9fb44ef3 d23acd20
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Aug 26 18:39:23 2020 +0300

    Merge remote-tracking branch 'origin/master' into 2043-optimize

commit 9fb44ef3a50044f043620e35b65b659ca8080e1f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Aug 26 15:39:07 2020 +0300

    - DNS: didn't process requests while updating filters
 2020-08-26 18:58:21 +03:00
Simon Zolin d23acd2016 - fix linter 
* commit '8cdef183586a90a8f9067e5271f799a7284e2270':
  * make ci: exec linter
  - fix linter
 2020-08-26 18:16:41 +03:00
Simon Zolin 8cdef18358 * make ci: exec linter 2020-08-25 19:26:34 +03:00
Simon Zolin 9634ef9c03 - fix linter 2020-08-25 17:44:30 +03:00
Simon Zolin 704291e88d Merge: * DHCP fixes 
Close #2040

* commit '06af130bb7c042d8a44720cc9423b3fc76deadee':
  - DHCP: fix crash after adding static lease which replaces the dynamic one
  * DHCP: don't replace the host name from static lease
 2020-08-25 17:29:49 +03:00
Simon Zolin 9c999f98fb + dhcp custom options 
Squashed commit of the following:

commit 140ac16568383cab2270e5d5ba895959902dd943
Merge: d5ed73b5 cb6ca3b0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Aug 25 13:46:34 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1585-dhcp-options

commit d5ed73b5e4f068b823fe97ab1161753670d10387
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Aug 21 18:16:41 2020 +0300

    minor

commit f5208a0b050c2dd462b32edee0379758cc6e5003
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jun 1 14:09:39 2020 +0300

    + dhcpv4 custom options
 2020-08-25 14:07:11 +03:00
Simon Zolin 06af130bb7 - DHCP: fix crash after adding static lease which replaces the dynamic one 2020-08-25 13:38:52 +03:00
Simon Zolin 719ef16b93 * DHCP: don't replace the host name from static lease 
When a static lease contains a host name
 and client sends its own host name:

1. don't replace the host name from static lease with it
2. send option FQDN to the client in Ack response packet
 2020-08-25 13:38:28 +03:00
Simon Zolin cb6ca3b0c4 - windows: install: fix crash due to empty DHCP server pointer 
#2036

Squashed commit of the following:

commit 5c70d28b241d1a98e034f6798dade073b1b42511
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 24 18:42:21 2020 +0300

    - windows: install: fix crash due to empty DHCP server pointer

    We should not assign a Go interface value, otherwise `==nil` check doesn't work.
 2020-08-24 20:06:53 +03:00
Simon Zolin eb3999a261 * /control/dns_config: allow all valid bootstrap server notations 
Close #1843

Squashed commit of the following:

commit cc82b373816b76a803d29e4baae18384aa0f8c67
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Aug 20 14:20:35 2020 +0300

    * /control/dns_config: allow all valid bootstrap server notations

    * use dnsproxy v0.31.1
 2020-08-21 15:54:16 +03:00
Andrey Meshkov 546a02b49e fix linter issues 2020-08-20 15:41:25 +03:00
Simon Zolin f8924f0785 Merge: + dhcpv6 server; rewrite dhcpv4 server; changed API 
#779

* commit '888c9d571450ca1b934d94446b4eed462207a2d2':
  Get rid of extra toast when static IP is not set
  Fix DHCP check when there is no V6 interface
  Check interface before showing alert
  + client: Refactor DHCP settings
  * upgrade yaml schema 6->7: DHCP settings
  * copy dhcpv4/nclient4 package with minor enhancement
  * POST /control/dhcp/find_active_dhcp: add dhcpv6 server info
  - dhcp: CheckIfOtherDHCPServersPresent: fix
  * GET /control/dhcp/interfaces: remove 'mtu'; add 'gateway_ip'
  * GET /control/dhcp/interfaces: split IPv4 and IPv6 addresses
  * dhcp: fail on startup if couldn't initialize DHCP module
  + dhcpv6 server; rewrite dhcpv4 server; changed API
 2020-08-20 15:33:13 +03:00
Andrey Meshkov 888c9d5714 Get rid of extra toast when static IP is not set 2020-08-20 15:19:59 +03:00
Andrey Meshkov 1806816d9c Fix DHCP check when there is no V6 interface 2020-08-20 15:19:59 +03:00
ArtemBaskal fcc34ca80b Check interface before showing alert 2020-08-20 15:19:59 +03:00
Artem Baskal 1d35d73fc5 + client: Refactor DHCP settings 2020-08-20 15:19:59 +03:00
Simon Zolin c9f58ce4a7 * upgrade yaml schema 6->7: DHCP settings 2020-08-20 15:19:59 +03:00
Simon Zolin dd46cd5f36 * copy dhcpv4/nclient4 package with minor enhancement 
The original package can be built only on Linux.
 2020-08-20 15:19:59 +03:00
Simon Zolin e7bef3a448 * POST /control/dhcp/find_active_dhcp: add dhcpv6 server info 2020-08-20 15:19:58 +03:00
Simon Zolin 23752377b7 - dhcp: CheckIfOtherDHCPServersPresent: fix 
Sometimes request from DHCP server couldn't be received
 because we were bound to a specific IP address.
 2020-08-20 15:19:58 +03:00
Simon Zolin 6090400ea0 * GET /control/dhcp/interfaces: remove 'mtu'; add 'gateway_ip' 2020-08-19 18:32:34 +03:00
Simon Zolin ec24d18f83 * GET /control/dhcp/interfaces: split IPv4 and IPv6 addresses 2020-08-19 18:32:34 +03:00
Simon Zolin 89c3926ba5 * dhcp: fail on startup if couldn't initialize DHCP module 2020-08-19 18:32:34 +03:00
Simon Zolin a3317c08c4 + dhcpv6 server; rewrite dhcpv4 server; changed API 2020-08-19 18:32:23 +03:00
Simon Zolin c3123473cf * DNS: resolve host names from DHCP: improve 
#1956

Squashed commit of the following:

commit efeacd92b8b82a9a0a0cce8c5648f2d024b4bc9e
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Aug 18 13:54:15 2020 +0300

    * DNS: resolve host names from DHCP: improve

    . Require a valid host name from DHCP lease
    . Use lower-case names
 2020-08-18 17:40:36 +03:00
Simon Zolin 8d0c8ad438 + DNS: resolve host names to IP addresses leased by AGH DHCP server 
Close #1956

Squashed commit of the following:

commit 21f11632c871e9c17faa77f9cd6a7aa836559779
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Aug 17 19:54:24 2020 +0300

    + DNS: resolve host names to IP addresses leased by AGH DHCP server
 2020-08-18 12:36:52 +03:00
Andrey Meshkov 1e2e965ea7 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-08-14 19:30:44 +03:00
Andrey Meshkov 0b539ced92 * : different version url for edge builds 
Closes: #2023
 2020-08-14 19:30:40 +03:00
Simon Zolin 9e09dffbc3 - dns: limit the number of active goroutines for incoming requests processing 
Close #2015

Squashed commit of the following:

commit 90ba06f1fce22a452b4d61db62bd950b976debd1
Merge: 9494b29b 473d8818
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Aug 14 19:14:26 2020 +0300

    Merge remote-tracking branch 'origin/master' into max-go

commit 9494b29b65ae8fe593a487984bed051aa78e4ff9
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Aug 14 17:03:00 2020 +0300

    + max_goroutines setting

commit 87071a5e0ed43be192a7755fb25764cd4519da5a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Aug 14 15:29:00 2020 +0300

    - dns: limit the number of active goroutines for incoming requests processing
 2020-08-14 19:27:36 +03:00
Andrey Meshkov 473d881871 Merge: - client: Fix DNS settings 
Merge in DNS/adguard-home from fix/2021 to master

* commit 'a1ca7862f84b07bde441f4578b1deb025ff79660':
  Fix selector
  - client: Fix DNS settings
 2020-08-13 19:09:17 +03:00
ArtemBaskal a1ca7862f8 Fix selector 2020-08-13 18:15:14 +03:00
ArtemBaskal 8ea1e64c7b - client: Fix DNS settings 2020-08-13 18:12:27 +03:00
Artem Baskal 2f8e34e73b Pull request 734: + client: 1778 Add ip sort function, write unit tests 
Close #1778

Squashed commit of the following:

commit ba63e147311799b17deaa97d7a12c2e0ec44a2ed
Merge: 143ba427 705a9d90
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 13 12:00:10 2020 +0300

    Merge branch 'master' into feature/1778

commit 143ba42707da3d7eece9f3e137a8b245f7f7888f
Merge: 483d2ff9 97df1989
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Aug 13 11:16:46 2020 +0300

    Merge branch 'master' into feature/1778

commit 483d2ff9fa3de706d94a647701f1d26a3bcbb217
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Aug 12 13:34:21 2020 +0300

    Always put ipv4 before ipv6 in sort, add invalid input unit tests

commit 26eb41b313785fe7ffaf98a7573cc5eef0dca14f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Aug 12 11:27:46 2020 +0300

    Rewrite tests: replace ipv4-mapped adresses

commit 4ecf287fd46945effe9ff11cfc9ae49217b9c796
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Aug 11 19:05:15 2020 +0300

    Minor fix

commit 3e5e2a6bb1f2f166619da54e5ade0904fe22a20d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Aug 11 19:01:26 2020 +0300

    + client: 1778 Add ip sort function, write unit tests
 2020-08-13 12:16:52 +03:00