Commit Graph

1972 Commits

Author SHA1 Message Date
Eugene Bujak fb2d90832c Merge pull request #68 in DNS/adguard-dns from feature/357 to master
* commit '8d13770b0d4b6d8fde0a61bbfdaa7bf9817142f6':
  Remove unneeded debug prints
  API filtering/add_url -- accept JSON instead of name=value lines
  Remove unused module
  Send json for addFilter request
  Fix params
  Add name field to the filter subscription dialog
2018-10-11 18:35:30 +03:00
Eugene Bujak 8d13770b0d Remove unneeded debug prints 2018-10-11 18:33:56 +03:00
Eugene Bujak 751be05a31 API filtering/add_url -- accept JSON instead of name=value lines 2018-10-11 18:33:56 +03:00
Ildar Kamalov 33958c5a25 Remove unused module 2018-10-11 18:33:56 +03:00
Ildar Kamalov 1e18235c1d Send json for addFilter request 2018-10-11 18:33:56 +03:00
Ildar Kamalov 4b8ee9ce83 Fix params 2018-10-11 18:33:56 +03:00
Ildar Kamalov 5be66e7dc7 Add name field to the filter subscription dialog 2018-10-11 18:33:56 +03:00
Eugene Bujak 8cf898e8d9 Merge pull request #70 in DNS/adguard-dns from hotfix to master
* commit '4995c1a1a8411445390a77235f2ebfbc97b12ff3':
  Hotfix -- fix querylog verifier that got broken by 5ae2a32d6e
2018-10-11 18:12:28 +03:00
Eugene Bujak 4995c1a1a8 Hotfix -- fix querylog verifier that got broken by 5ae2a32d6e 2018-10-11 18:06:33 +03:00
Eugene Bujak 557c2268dc Merge pull request #67 in DNS/adguard-dns from feature/333 to master
* commit '383f1c2fb38437e682ec9fc6623672730dae4581':
  Hide badge if core is not running
  Add client requests for toggle protection
  API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering
2018-10-11 16:23:01 +03:00
Eugene Bujak aa7b99d78c Merge pull request #69 in DNS/adguard-dns from fix/blocked_ttl_10 to master
* commit 'e7b6ab47501cf14d3a7b5cf212c88bde0c6604d7':
  Change blocked ttl to 10 sec, we don't need it to be large in a home network
2018-10-11 15:11:43 +03:00
Andrey Meshkov e7b6ab4750 Change blocked ttl to 10 sec, we don't need it to be large in a home network 2018-10-11 13:24:06 +03:00
Ildar Kamalov 383f1c2fb3 Hide badge if core is not running 2018-10-11 11:08:07 +03:00
Ildar Kamalov 3a74dfdfa4 Add client requests for toggle protection
Closes #333
2018-10-11 10:57:36 +03:00
Eugene Bujak 413228e6ec API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering 2018-10-10 20:13:03 +03:00
Eugene Bujak c3df81bb8d Merge pull request #66 in DNS/adguard-dns from bugfix/356 to master
* commit 'e689c7d940e9a20bc13f024e18b86f3c1e5ba759':
  Do not lose filter name when saving to yaml
  coredns querylog -- since we read entire querylog json once at startup, fill querylog cache from it and then rotate it on each incoming DNS query
  Cache DNS lookups when resolving safebrowsing or parental servers, also cache replacement hostnames as well.
2018-10-10 19:50:20 +03:00
Eugene Bujak e689c7d940 Do not lose filter name when saving to yaml 2018-10-10 19:49:18 +03:00
Eugene Bujak 5ae2a32d6e coredns querylog -- since we read entire querylog json once at startup, fill querylog cache from it and then rotate it on each incoming DNS query 2018-10-10 19:44:07 +03:00
Eugene Bujak a5d1053520 Cache DNS lookups when resolving safebrowsing or parental servers, also cache replacement hostnames as well. 2018-10-10 19:10:38 +03:00
Eugene Bujak e2295c1a11 Merge pull request #65 in DNS/adguard-dns from fix/strings to master
* commit 'd591ea6264bb287a6e57f815a0bc75b7b920bb87':
  Makefile -- run npm build whenever any .js file changes inside client/
  fix strings
  Fix strings
  Fix strings
2018-10-10 17:57:36 +03:00
Eugene Bujak d591ea6264 Makefile -- run npm build whenever any .js file changes inside client/ 2018-10-10 17:56:48 +03:00
Andrey Meshkov ee8759f063 tMerge branch 'master' into fix/strings 2018-10-10 17:55:03 +03:00
Andrey Meshkov 151944bc27 fix strings 2018-10-10 17:54:21 +03:00
Andrey Meshkov a6172d1966 Fix strings 2018-10-10 17:32:36 +03:00
Andrey Meshkov 90bef94500 Fix strings 2018-10-10 17:24:12 +03:00
Eugene Bujak f5deff63ba Merge pull request #64 in DNS/adguard-dns from remove_old_stats to master
* commit '903b20dcab855f0dec7af3b305e8362fa4255b8a':
  Remove dead code
2018-10-10 16:19:30 +03:00
Eugene Bujak 903b20dcab Remove dead code 2018-10-10 15:47:08 +03:00
Eugene Bujak 945bd24f67 Merge pull request #63 in DNS/adguard-dns from hotfix to master
* commit 'ae9964c445e200d22b159a47bfc6c00af990653e':
  Makefile -- fix build failure on systems where /bin/sh is not alias to /bin/bash
2018-10-10 01:26:21 +03:00
Eugene Bujak ae9964c445 Makefile -- fix build failure on systems where /bin/sh is not alias to /bin/bash 2018-10-10 01:23:32 +03:00
Andrey Meshkov 3a5ecb9fc1 Merge pull request #62 in DNS/adguard-dns from hotfix to master
* commit 'c499c435c3c91960abd695b4919554937a3df5d1':
  Fixup of previous merge -- fix build failure.
2018-10-10 01:13:38 +03:00
Eugene Bujak c499c435c3 Fixup of previous merge -- fix build failure. 2018-10-10 01:13:00 +03:00
Andrey Meshkov 2113bb5436 Merge pull request #60 in DNS/adguard-dns from feature/342 to master
* commit '8503f76747d47160d5d8239e275a7d6d8965dacd':
  Add default disabled hosts filters.
  Change default filter URL to github-hosted version
2018-10-10 01:05:58 +03:00
Eugene Bujak 8503f76747 Add default disabled hosts filters. 2018-10-10 00:59:37 +03:00
Eugene Bujak c2be5917ef Change default filter URL to github-hosted version 2018-10-10 00:44:39 +03:00
Eugene Bujak a54984f688 Merge pull request #58 in DNS/adguard-dns from feature/348 to master
* commit '5533b434dac98ba610028ca98327992d18078da0':
  coredns plugin -- give out to browser last entries from querylog file, not first
  Update .gitignore to ignore non-gzipped querylog
  Makefile -- Fix bug introduced by 93c451cb0c
  coredns plugin -- Increase querylog given out to web UI from 1000 to 5000.
2018-10-10 00:35:58 +03:00
Eugene Bujak 5533b434da coredns plugin -- give out to browser last entries from querylog file, not first 2018-10-10 00:23:15 +03:00
Eugene Bujak 4984c55bce Update .gitignore to ignore non-gzipped querylog 2018-10-10 00:05:48 +03:00
Eugene Bujak 9b489c8ddb Makefile -- Fix bug introduced by 93c451cb0c
make would always run webpack, even if output was generated already.
2018-10-10 00:05:48 +03:00
Eugene Bujak eb5f66ad9e coredns plugin -- Increase querylog given out to web UI from 1000 to 5000. 2018-10-09 22:53:19 +03:00
Eugene Bujak 75d74a017b Merge pull request #56 in DNS/adguard-dns from feature/348 to master
* commit 'ca794aed6344cf0f5570bb359c731a96ca90739f':
  querylog file -- disable gzip compression
  Implement online stats calculation in coredns plugin instead of scraping prometheus.
2018-10-09 21:16:03 +03:00
Eugene Bujak 93c451cb0c Merge pull request #57 in DNS/adguard-dns from feature/354 to master
* commit '0545aeff3fb8368238e8c61d43589ef8b4a6d8e8':
  Fix variable
  Add hash to the static JS/CSS
  Fix tooltip width
  Fix default filtering for query log
  Fix textarea width
2018-10-09 21:15:26 +03:00
Ildar Kamalov 0545aeff3f Fix variable 2018-10-09 11:00:48 +03:00
Ildar Kamalov 814005021c Add hash to the static JS/CSS
Closes #354
2018-10-09 10:25:21 +03:00
Eugene Bujak ca794aed63 querylog file -- disable gzip compression 2018-10-09 05:02:16 +03:00
Eugene Bujak 37f6d38c49 Implement online stats calculation in coredns plugin instead of scraping prometheus. 2018-10-09 04:45:05 +03:00
Konstantin 🦄 Zamyakin 165722585f Merge pull request #55 in DNS/adguard-dns from hotfix to master
* commit '7dea729656fe60aefcd81b7c1b808866d3c334a7':
  Fix build failure of coredns plugin introduced by previous merge
2018-10-08 21:30:47 +03:00
Eugene Bujak 7dea729656 Fix build failure of coredns plugin introduced by previous merge 2018-10-08 20:35:22 +03:00
Eugene Bujak 16b1a343a0 Merge pull request #54 in DNS/adguard-dns from feature/348 to master
* commit 'a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4':
  code review -- move constants into named constants
  coredns plugin -- Cache /querylog API result
  coredns plugin -- Final fix for deadlock during coredns reload
  coredns plugin -- change rlock to lock when loading top stats to avoid doing it in parallel
  coredns plugin -- Fix deadlock during coredns reload
  stats -- Clamp number of rotations to sane value and prevent from going into (very long) loop
  querylog API -- when manually generating json, don't forget to escape strings
  coredns plugin -- don't reload from querylog on SIGUSR, we already have it in memory
  Fix some lint warnings
  coredns plugin -- Calculate top for domains, clients and blocked both from querylog and running requests.
  Fix more race conditions found by race detector
  Querylog -- Omit empty fields when writing json
  Querylog -- Read from querylog files when answering to /querylog API, it now survives restarts.
  querylog -- Add querylog files to gitignore
  if coredns unexpectedly quits, restart it
  Fix race conditions found by go's race detector
  Querylog -- Implement file writing and update /querylog handler for changed structures.
2018-10-08 20:15:06 +03:00
Eugene Bujak a15f21ca1c code review -- move constants into named constants 2018-10-08 20:04:36 +03:00
Eugene Bujak a15c59e24e coredns plugin -- Cache /querylog API result 2018-10-08 19:51:43 +03:00