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

2016 Commits

Author SHA1 Message Date
Simon Zolin 5a3de2a276 * refactor 2019-07-22 12:33:58 +03:00
Simon Zolin 4a05ab0057 * dnsforward: parental control server can be an IP address, not just host name 2019-07-22 12:33:45 +03:00
Simon Zolin 4134a8c30e + dnsforward, config: add "parental_block_host" and "safebrowsing_block_host" settings 2019-07-22 12:16:30 +03:00
Simon Zolin c2dacd32d1 Merge: * use urlfilter v0.4.1 
Close #840

* commit 'bb00a632382823d8c0a0d9f307788711ea50cb5f':
  * use urlfilter v0.4.1
 2019-07-19 15:26:52 +03:00
Simon Zolin bb00a63238 * use urlfilter v0.4.1 2019-07-19 15:20:42 +03:00
Simon Zolin bd5162ada3 Merge: Refactoring: move global variables; move initialization of periodic tasks 
Close #583

* commit 'b8444ff46aff5e45194c6cb61fdf4d3e7aa798fa':
  * minor
  * dnsforward: move initialization of periodic tasks to NewServer()
  * move "dnsctx" to "config"
  * move "dnsServer" to "config"
  * move "dhcpServer" to "config"
  * move "httpServer" to "config"
  * move "httpsServer" to "config"
  * move "pidFileName" to "config"
  * move "versionCheckJSON" to "config"
  * move "client", "transport" to "config"
  * move "controlLock" mutex to "config"
  * clients: move container object to "config"
 2019-07-19 15:18:51 +03:00
Simon Zolin b8444ff46a * minor 2019-07-19 12:18:16 +03:00
Simon Zolin 2bbd262968 * dnsforward: move initialization of periodic tasks to NewServer() 2019-07-19 12:18:16 +03:00
Simon Zolin 6701e9ce06 * move "dnsctx" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin af21a5f17b * move "dnsServer" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin 001b4b981f * move "dhcpServer" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin 5e309a7b3a * move "httpServer" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin 2780ace63e * move "httpsServer" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin f79008d9d0 * move "pidFileName" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin d3ddfc81a6 * move "versionCheckJSON" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin c426ee0108 * move "client", "transport" to "config" 2019-07-19 12:18:16 +03:00
Simon Zolin 2682adca39 * move "controlLock" mutex to "config" 2019-07-17 19:29:45 +03:00
Simon Zolin d51f43e27a * clients: move container object to "config" 
Now the functions use parameter, not a global object.
 2019-07-17 19:29:45 +03:00
Simon Zolin 1973901802 Merge: * dhcpd: check if subnet mask is correct 
Close #887

* commit '79a5c920a40180b7291d94535e50017d98eb3a63':
  * dhcpd: check if subnet mask is correct
 2019-07-17 12:45:45 +03:00
Simon Zolin 79a5c920a4 * dhcpd: check if subnet mask is correct 2019-07-17 11:55:21 +03:00
Simon Zolin 0fb42e5c71 Merge: - filters: fix crash after update 
#878

* commit '1c5b6130480b7c8796c9861c94e9635b550582bc':
  - filters: fix crash after update
 2019-07-16 15:35:54 +03:00
Simon Zolin 1c5b613048 - filters: fix crash after update 2019-07-16 15:29:36 +03:00
Simon Zolin 55a4536997 Merge: - filters: start DNS server after filters are updated 
Close #886

* commit '1b45dc45fc4e610689afc4e618e45ed946f02646':
  - filters: start DNS server after filters are updated
 2019-07-16 14:41:23 +03:00
Simon Zolin 1b45dc45fc - filters: start DNS server after filters are updated 2019-07-16 14:32:58 +03:00
Simon Zolin 87ccd192c3 Merge: - filters: windows: fix update procedure 
Close #878

* commit '2c91de73af78a032c076dbad6dcdb85e22e82536':
  * minor
  - filters: start DNS server after filter has been removed
  - filters: windows: fix update procedure
 2019-07-16 13:58:54 +03:00
Simon Zolin 2c91de73af * minor 2019-07-16 12:55:55 +03:00
Simon Zolin 94f3bf44d7 - filters: start DNS server after filter has been removed 2019-07-16 12:55:47 +03:00
Simon Zolin 27006f58c5 - filters: windows: fix update procedure 
We couldn't write filter files on Windows due to
 "file is being used" error.
 2019-07-16 12:55:18 +03:00
Simon Zolin 4326a2c945 Merge: - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped 
Close #878

* commit '375e410aa310c24ec0e95ee48ebd40675d5df1e7':
  - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped
 2019-07-15 18:36:08 +03:00
Simon Zolin 375e410aa3 - /filtering/remove_url: windows: remove filter file only after DNS server has been stopped 
Otherwise, os.Remove() will return with an error "file is being used".
 2019-07-15 18:23:58 +03:00
Simon Zolin cc8633ed7d Merge: - dnsfilter: fix crash when global setting 'SafeSearch' is off 
Close #880

* commit 'a79643f23e4bb45a912a71b4a973a027431a8720':
  + dnsfilter-test: override global safe-browsing setting with a per-client setting
  - dnsfilter: fix crash when global setting 'SafeSearch' is off
 2019-07-15 18:22:58 +03:00
Simon Zolin a79643f23e + dnsfilter-test: override global safe-browsing setting with a per-client setting 2019-07-15 14:03:22 +03:00
Simon Zolin c81c79aad7 Merge: - don't load filter rules if filter is disabled 
Close #879

* commit 'e2b518339fe6c14bb29008ad1638244e2f0fb3f8':
  - don't load filter rules if filter is disabled
 2019-07-15 13:17:44 +03:00
Simon Zolin e2b518339f - don't load filter rules if filter is disabled 2019-07-15 12:49:48 +03:00
Simon Zolin 57c510631e - dnsfilter: fix crash when global setting 'SafeSearch' is off 
but per-client setting is on
 2019-07-15 12:10:43 +03:00
Andrey Meshkov d4bbc45a39 Added beta link for FreeBSD 2019-07-12 16:22:13 +03:00
Andrey Meshkov 9eb6da05ad Bump version to 0.97.0 and fix #798 2019-07-12 15:57:20 +03:00
Simon Zolin 3f796a5d05 Merge: - fix tests 
* commit '0a1d7fd70732c306f39c777cbe60bb8bf1ab9da5':
  - fix tests
 2019-07-09 11:35:49 +03:00
Simon Zolin 0a1d7fd707 - fix tests 2019-07-09 11:35:39 +03:00
Ildar Kamalov 26db906e54 Merge: + client: add link to the DNS filterting rules article 
Closes #721

* commit '3a5f9a7ad35aa7f0f0dc5eac5dfcb9b9a3276fc0':
  + client: add link to the DNS filterting rules article
 2019-07-08 18:05:02 +03:00
Ildar Kamalov 3a5f9a7ad3 + client: add link to the DNS filterting rules article 2019-07-08 17:36:32 +03:00
Ildar Kamalov bcbfa43ea2 Merge: * client: remove /clients and /stats_top request from global requests 
* commit '2520a62e2430dac1d9bf689c567b95d419a78339':
  * client: remove /clients and /stats_top request from global requests
 2019-07-08 13:47:37 +03:00
Ildar Kamalov 2520a62e24 * client: remove /clients and /stats_top request from global requests 2019-07-08 12:49:03 +03:00
Simon Zolin fce551dcaf Merge: - client: fix version line break 
#815

* commit 'cf4616cbee3f835ed4db0875f1183c5dcac347f5':
  - client: fix version line break
 2019-07-05 18:37:46 +03:00
Ildar Kamalov cf4616cbee - client: fix version line break 2019-07-05 18:37:57 +03:00
Simon Zolin f0c9ffcbeb Merge: - client: fix update now button and notification 
#815

* commit '71c1157ef56fa456698e828b3d4ff992d62199ff':
  * client: remove version truncate for desktop
  - client: fix update now button and notification
 2019-07-05 18:26:53 +03:00
Ildar Kamalov 71c1157ef5 * client: remove version truncate for desktop 2019-07-05 18:27:15 +03:00
Ildar Kamalov 2fe9819150 - client: fix update now button and notification 2019-07-05 18:21:46 +03:00
Simon Zolin 4af635e58a Merge: - dnsfilter: fix post-install error "filter file not found" 
* commit 'b0cfd7228eaae0719f40d37f766c541c06bfb1b0':
  - dnsfilter: fix post-install error "filter file not found"
 2019-07-05 17:53:43 +03:00
Simon Zolin b0cfd7228e - dnsfilter: fix post-install error "filter file not found" 
Right after installation we don't have the filter files downloaded.
While they are being downloaded, we replace them with an empty filter.
 2019-07-05 17:35:40 +03:00