Update urlfilter to v0.11.2

* openapi: update changelog
Squashed commit of the following: commit a42d1762c2ffbfe65d728a5e76a3d0c5cc03a9c5 Author: Simon Zolin <s.zolin@adguard.com> Date: Thu Jul 23 19:17:05 2020 +0300 * openapi: update changelog
2020-07-23 20:48:50 +03:00 · 2020-07-23 19:25:42 +03:00 · 2020-07-23 18:09:39 +03:00 · 2020-07-23 13:21:12 +03:00 · 2020-07-23 12:27:14 +03:00 · 2020-07-23 12:17:20 +03:00
39 changed files with 953 additions and 601 deletions
--- a/43
+++ b/43
@@ -55,7 +55,11 @@ SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
 # Set proper version
 VERSION=
 ifeq ($(TAG_NAME),$(shell git describe --abbrev=4))
-	VERSION=$(RELEASE_VERSION)
+	ifeq ($(CHANNEL),edge)
+		VERSION=$(SNAPSHOT_VERSION)
+	else
+		VERSION=$(RELEASE_VERSION)
+	endif
 else
 	VERSION=$(SNAPSHOT_VERSION)
 endif
@@ -173,6 +177,7 @@ docker-multi-arch:
 release: dependencies client
 	@echo Starting release build: version $(VERSION), channel $(CHANNEL)
 	CHANNEL=$(CHANNEL) $(GORELEASER_COMMAND)
+	$(call repack_dist)
 	$(call write_version_file,$(VERSION))
 	PATH=$(GOPATH)/bin:$(PATH) packr clean

@@ -191,7 +196,7 @@ define write_version_file
 	echo "  \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json
 	echo "  \"announcement\": \"AdGuard Home $(version) is now available!\"," >> $(DIST_DIR)/version.json
 	echo "  \"announcement_url\": \"https://github.com/AdguardTeam/AdGuardHome/releases\"," >> $(DIST_DIR)/version.json
-	echo "  \"selfupdate_min_version\": \"v0.0\"," >> $(DIST_DIR)/version.json
+	echo "  \"selfupdate_min_version\": \"0.0\"," >> $(DIST_DIR)/version.json

 	# Windows builds
 	echo "  \"download_windows_amd64\": \"$(BASE_URL)/AdGuardHome_windows_amd64.zip\"," >> $(DIST_DIR)/version.json
@@ -232,3 +237,37 @@ define write_version_file
 	# Finish
 	echo "}" >> $(DIST_DIR)/version.json
 endef
+
+define repack_dist
+	# Repack archive files
+	# A temporary solution for our auto-update code to be able to unpack these archive files
+	# The problem is that goreleaser doesn't add directory AdGuardHome/ to the archive file
+	#  and we can't create it
+	rm -rf $(DIST_DIR)/AdGuardHome
+
+	# Linux
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+
+	# Linux, all kinds of ARM
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+
+	# Linux, MIPS
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+
+	# FreeBSD
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+
+	# FreeBSD, all kinds of ARM
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+	cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
+endef
--- a/changelog.config.js
+++ b/changelog.config.js
@@ -1,9 +1,9 @@
 module.exports = {
    "disableEmoji": true,
    "list": [
-        "+",
-        "*",
-        "-",
+        "+ ",
+        "* ",
+        "- ",
    ],
    "maxMessageLength": 64,
    "minMessageLength": 3,
@@ -12,7 +12,7 @@ module.exports = {
        "scope",
        "subject",
        "body",
-        "issues"
+        "issues",
    ],
    "scopes": [
        "",
@@ -26,20 +26,20 @@ module.exports = {
        "documentation",
    ],
    "types": {
-        "+": {
+        "+ ": {
            "description": "A new feature",
            "emoji": "",
-            "value": "+"
+            "value": "+ "
        },
-        "*": {
+        "* ": {
            "description": "A code change that neither fixes a bug or adds a feature",
            "emoji": "",
-            "value": "*"
+            "value": "* "
        },
-        "-": {
+        "- ": {
            "description": "A bug fix",
            "emoji": "",
-            "value": "-"
+            "value": "- "
        }
    }
 };
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -236,5 +236,6 @@
    "reset_settings": "Изтрий всички настройки",
    "update_announcement": "Има нова AdGuard Home {{version}}! <0>Цъкни тук</0> за повече информация.",
    "disable_ipv6": "Изключете IPv6 протокола",
-    "show_blocked_responses": "Блокирано"
+    "show_blocked_responses": "Блокирано",
+    "port_53_faq_link": "Порт 53 често е зает от \"DNSStubListener\" или \"systemd-resolved\" услуги. Моля, прочетете <0>тази инструкция</0> как да решите това."
 }
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Seznamy, které jsou zaměřené na regionální reklamy a sledovací servery",
    "filter_category_other_desc": "Další seznamy zakázaných",
    "original_response": "Původní odezva",
-    "click_to_view_queries": "Klikněte pro zobrazení dotazů"
+    "click_to_view_queries": "Klikněte pro zobrazení dotazů",
+    "port_53_faq_link": "Port 53 je často obsazen službami \"DNSStubListener\" nebo \"systemd-resolved\". Přečtěte si <0>tento návod</0> o tom, jak to vyřešit."
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Lister, der fokuserer på regionale annoncer og tracking-servere",
    "filter_category_other_desc": "Andre blokeringslister",
    "original_response": "Oprindeligt svar",
-    "click_to_view_queries": "Klik for at se forespørgsler"
+    "click_to_view_queries": "Klik for at se forespørgsler",
+    "port_53_faq_link": "Port 53 optages ofte af \"DNSStubListener\" eller \"systemd-resolved\" tjenester. Læs <0>denne instruktion</0> om, hvordan du løser dette."
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Listen, die sich auf regionale Werbeanzeigen und Tracking-Server konzentrieren",
    "filter_category_other_desc": "Weitere Sperrlisten",
    "original_response": "Ursprüngliche Antwort",
-    "click_to_view_queries": "Anklicken, um Abfragen anzuzeigen"
+    "click_to_view_queries": "Anklicken, um Abfragen anzuzeigen",
+    "port_53_faq_link": "Port 53 wird oft von Diensten wie „DNSStubListener” oder „systemresolved” belegt. Bitte lesen Sie <0>diese Anweisung</0>, wie dies behoben werden kann."
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -542,7 +542,6 @@
    "safe_search": "Safe search",
    "blocklist": "Blocklist",
    "milliseconds_abbreviation": "ms",
-    "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
    "cache_size": "Cache size",
    "cache_size_desc": "DNS cache size (in bytes)",
    "cache_ttl_min_override": "Override minimum TTL",
@@ -565,4 +564,4 @@
    "original_response": "Original response",
    "click_to_view_queries": "Click to view queries",
    "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this."
-}
+}
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -354,8 +354,8 @@
    "fix": "Corregir",
    "dns_providers": "Aquí hay una <0>lista de proveedores DNS</0> conocidos para elegir.",
    "update_now": "Actualizar ahora",
-    "update_failed": "Error en la actualización automática. Por favor <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>siga los pasos</a> para actualizar manualmente.",
-    "processing_update": "Por favor espere, AdGuard Home se está actualizando",
+    "update_failed": "Error en la actualización automática. Por favor <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>sigue los pasos</a> para actualizar manualmente.",
+    "processing_update": "Por favor espera, AdGuard Home se está actualizando",
    "clients_title": "Clientes",
    "clients_desc": "Configurar dispositivos conectados con AdGuard Home",
    "settings_global": "Global",
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Listas que se centran en anuncios regionales y servidores de rastreo",
    "filter_category_other_desc": "Otras listas de bloqueo",
    "original_response": "Respuesta original",
-    "click_to_view_queries": "Clic para ver las consultas"
+    "click_to_view_queries": "Clic para ver las consultas",
+    "port_53_faq_link": "El puerto 53 suele estar ocupado por los servicios \"DNSStubListener\" o \"systemd-resolved\". Por favor lee <0>esta instrucción</0> sobre cómo resolver esto."
 }
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -559,5 +559,6 @@
    "filter_category_security_desc": "Listes spécialisées dans le blocage de logiciels malveillants, d’hameçonnage ou de domaines frauduleux",
    "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de pistage",
    "filter_category_other_desc": "Autres listes noires",
-    "click_to_view_queries": "Cliquez pour voir les requêtes"
+    "click_to_view_queries": "Cliquez pour voir les requêtes",
+    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème."
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Popisi koji se fokusiraju na regionalne oglase i poslužitelje za praćenje",
    "filter_category_other_desc": "Ostali popisi blokiranih",
    "original_response": "Originalni odgovor",
-    "click_to_view_queries": "Kliknite za pregled upita"
+    "click_to_view_queries": "Kliknite za pregled upita",
+    "port_53_faq_link": "Port 53 često zauzimaju usluge \"DNSStubListener\" ili \"systemd-resolved\". Molimo pročitajte <0>ove upute</0> o tome kako to riješiti."
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Lijsten die focussen op regionale ads en tracking servers",
    "filter_category_other_desc": "Overige blokkeerlijsten",
    "original_response": "Oorspronkelijke reactie",
-    "click_to_view_queries": "Klik om queries te bekijken"
+    "click_to_view_queries": "Klik om queries te bekijken",
+    "port_53_faq_link": "Poort 53 wordt vaak gebruikt door services als DNSStubListener- of de systeem DNS-resolver. Lees a.u.b. <0>deze instructie</0> hoe dit is op te lossen."
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Listy, które koncentrują się na reklamach regionalnych i serwerach ze skryptami śledzącymi",
    "filter_category_other_desc": "Inne listy zablokowanych",
    "original_response": "Oryginalna odpowiedź",
-    "click_to_view_queries": "Kliknij, aby wyświetlić zapytania"
+    "click_to_view_queries": "Kliknij, aby wyświetlić zapytania",
+    "port_53_faq_link": "Port 53 jest często zajęty przez usługi \"DNSStubListener\" lub \"systemd-resolved\". Przeczytaj <0>tę instrukcję</0> jak to rozwiązać."
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Liste focalizate pe reclame regionale și servere de urmărire",
    "filter_category_other_desc": "Alte liste de blocări",
    "original_response": "Răspuns original",
-    "click_to_view_queries": "Clicați pentru a vizualiza interogări"
+    "click_to_view_queries": "Clicați pentru a vizualiza interogări",
+    "port_53_faq_link": "Portul 53 este adesea ocupat de serviciile \"DNSStubListener\" sau \"systemd-resolved\". Vă rugăm să citiți <0>această instrucțiune</0> despre cum să rezolvați aceasta."
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Списки, которые фокусируются на региональной рекламе и серверах отслеживания",
    "filter_category_other_desc": "Другие списки блокировки",
    "original_response": "Первоначальный ответ",
-    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы"
+    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
+    "port_53_faq_link": "Порт 53 часто занят службами \"DNSStubListener\" или \"systemd-resolved\". Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить."
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "Seznami, ki so osredotočeni na področne oglase in strežnike za sledenje",
    "filter_category_other_desc": "Drugi seznami za zaviranje",
    "original_response": "Izviren odgovor",
-    "click_to_view_queries": "Kliknite za prikaz poizvedb"
+    "click_to_view_queries": "Kliknite za prikaz poizvedb",
+    "port_53_faq_link": "Vrata 53 pogosto zasedajo storitve 'DNSStubListener' ali 'Sistemsko razrešene storitve'. Preberite <0>to navodilo</0> o tem, kako to rešiti."
 }
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -505,5 +505,6 @@
    "blocked_adult_websites": "Yetişkin içerikli site engellendi",
    "blocked_threats": "Engellenen Tehditler",
    "allowed": "İzin verildi",
-    "blocklist": "Engellenen listesi"
+    "blocklist": "Engellenen listesi",
+    "port_53_faq_link": "Port 53 genellikle \"DNSStubListener\" veya \"sistemd-resolved\" hizmetler tarafından kullanılır. Lütfen problemin nasıl çözüleceğine ilişkin <0>bu talimatı</0> okuyun."
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "专注于区域广告和跟踪服务器的列表",
    "filter_category_other_desc": "其他阻止列表",
    "original_response": "原始响应",
-    "click_to_view_queries": "点击查看查询"
+    "click_to_view_queries": "点击查看查询",
+    "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -562,5 +562,6 @@
    "filter_category_regional_desc": "專注於區域性的廣告和追蹤伺服器之清單",
    "filter_category_other_desc": "其它的封鎖清單",
    "original_response": "原始的回應",
-    "click_to_view_queries": "點擊以檢視查詢"
+    "click_to_view_queries": "點擊以檢視查詢",
+    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。"
 }
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -2,8 +2,9 @@ import { createAction } from 'redux-actions';
 import i18next from 'i18next';
 import axios from 'axios';

-import { isVersionGreater, splitByNewLine, sortClients } from '../helpers/helpers';
+import { splitByNewLine, sortClients } from '../helpers/helpers';
 import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants';
+import { areEqualVersions } from '../helpers/version';
 import { getTlsStatus } from './encryption';
 import apiClient from '../api/Api';
 import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts';
@@ -121,7 +122,7 @@ export const getVersion = (recheck = false) => async (dispatch, getState) => {
            const { dnsVersion } = getState().dashboard;
            const currentVersion = dnsVersion === 'undefined' ? 0 : dnsVersion;

-            if (data && isVersionGreater(currentVersion, data.new_version)) {
+            if (data && !areEqualVersions(currentVersion, data.new_version)) {
                dispatch(addSuccessToast('updates_checked'));
            } else {
                dispatch(addSuccessToast('updates_version_equal'));
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -62,7 +62,7 @@ const clientCell = (t, toggleClientStatus, processing, disallowedClients) => fun
    return (
        <>
            <div className="logs__row logs__row--overflow logs__row--column">
-                {formatClientCell(row, true)}
+                {formatClientCell(row, true, false)}
            </div>
            {ipMatchListStatus !== IP_MATCH_LIST_STATUS.CIDR
            && renderBlockingButton(ipMatchListStatus, value, toggleClientStatus, processing)}
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -147,8 +147,8 @@
        "CHN-anti-ad" : {
            "name": "CHN: anti-AD",
            "categoryId": "regional",
-            "homepage": "https://github.com/privacy-protection-tools/anti-AD",
-            "source": "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/easylist.txt"
+            "homepage": "https://anti-ad.net/",
+            "source": "https://anti-ad.net/easylist.txt"
        },
        "BarbBlock": {
            "name": "BarbBlock",
--- a/client/src/helpers/formatClientCell.js
+++ b/client/src/helpers/formatClientCell.js
@@ -24,7 +24,7 @@ const getFormattedWhois = (whois) => {
    );
 };

-export const formatClientCell = (row, isDetailed = false) => {
+export const formatClientCell = (row, isDetailed = false, isLogs = true) => {
    const { value, original: { info } } = row;
    let whoisContainer = '';
    let nameContainer = value;
@@ -33,13 +33,25 @@ export const formatClientCell = (row, isDetailed = false) => {
        const { name, whois_info } = info;

        if (name) {
-            nameContainer = !whois_info && isDetailed
-                ? <small title={value}>{value}</small>
-                : <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
-                    {name}
-                    {' '}
-                    <small>{`(${value})`}</small>
-                </div>;
+            if (isLogs) {
+                nameContainer = !whois_info && isDetailed
+                    ? (
+                        <small title={value}>{value}</small>
+                    ) : (
+                        <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
+                            {name}&nbsp;<small>{`(${value})`}</small>
+                        </div>
+                    );
+            } else {
+                nameContainer = (
+                    <div
+                        className="logs__text logs__text--nowrap"
+                        title={`${name} (${value})`}
+                    >
+                        {name}&nbsp;<small>{`(${value})`}</small>
+                    </div>
+                );
+            }
        }

        if (whois_info && isDetailed) {
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -12,7 +12,6 @@ import i18n from 'i18next';
 import uniqBy from 'lodash/uniqBy';
 import ipaddr from 'ipaddr.js';
 import queryString from 'query-string';
-import versionCompare from './versionCompare';
 import { getTrackerData } from './trackers/trackers';

 import {
@@ -418,10 +417,6 @@ export const secondsToMilliseconds = (seconds) => {
 export const normalizeRulesTextarea = (text) => text?.replace(/^\n/g, '')
    .replace(/\n\s*\n/g, '\n');

-export const isVersionGreater = (currentVersion, previousVersion) => (
-    versionCompare(currentVersion, previousVersion) === -1
-);
-
 export const normalizeWhois = (whois) => {
    if (Object.keys(whois).length > 0) {
        const {
--- a/client/src/helpers/version.js
+++ b/client/src/helpers/version.js
@@ -0,0 +1,17 @@
+/**
+ * Checks if versions are equal.
+ * Please note, that this method strips the "v" prefix.
+ *
+ * @param left {string} - left version
+ * @param right {string} - right version
+ * @return {boolean} true if versions are equal
+ */
+export const areEqualVersions = (left, right) => {
+    if (!left || !right) {
+        return false;
+    }
+
+    const leftVersion = left.replace(/^v/, '');
+    const rightVersion = right.replace(/^v/, '');
+    return leftVersion === rightVersion;
+};
--- a/client/src/helpers/versionCompare.js
+++ b/client/src/helpers/versionCompare.js
@@ -1,63 +0,0 @@
-/*
-* Project: tiny-version-compare https://github.com/bfred-it/tiny-version-compare
-* License (MIT) https://github.com/bfred-it/tiny-version-compare/blob/master/LICENSE
-*/
-const split = (v) => String(v).replace(/^[vr]/, '') // Drop initial 'v' or 'r'
-    .replace(/([a-z]+)/gi, '.$1.') // Sort each word separately
-    .replace(/[-.]+/g, '.') // Consider dashes as separators (+ trim multiple separators)
-    .split('.');
-
-// Development versions are considered "negative",
-// but localeCompare doesn't handle negative numbers.
-// This offset is applied to reset the lowest development version to 0
-const offset = (part) => {
-    // Not numeric, return as is
-    if (Number.isNaN(part)) {
-        return part;
-    }
-    return 5 + Number(part);
-};
-
-const parsePart = (part) => {
-    // Missing, consider it zero
-    if (typeof part === 'undefined') {
-        return 0;
-    }
-    // Sort development versions
-    switch (part.toLowerCase()) {
-        case 'dev':
-            return -5;
-        case 'alpha':
-            return -4;
-        case 'beta':
-            return -3;
-        case 'rc':
-            return -2;
-        case 'pre':
-            return -1;
-        default:
-    }
-    // Return as is, it’s either a plain number or text that will be sorted alphabetically
-    return part;
-};
-
-const versionCompare = (prev, next) => {
-    const a = split(prev);
-    const b = split(next);
-    for (let i = 0; i < a.length || i < b.length; i += 1) {
-        const ai = offset(parsePart(a[i]));
-        const bi = offset(parsePart(b[i]));
-        const sort = String(ai).localeCompare(bi, 'en', {
-            numeric: true,
-        });
-        // Once the difference is found,
-        // stop comparing the rest of the parts
-        if (sort !== 0) {
-            return sort;
-        }
-    }
-    // No difference found
-    return 0;
-};
-
-export default versionCompare;
--- a/client/src/reducers/index.js
+++ b/client/src/reducers/index.js
@@ -2,7 +2,6 @@ import { combineReducers } from 'redux';
 import { handleActions } from 'redux-actions';
 import { loadingBarReducer } from 'react-redux-loading-bar';
 import { reducer as formReducer } from 'redux-form';
-import { isVersionGreater } from '../helpers/helpers';

 import * as actions from '../actions';
 import toasts from './toasts';
@@ -15,6 +14,7 @@ import stats from './stats';
 import queryLogs from './queryLogs';
 import dnsConfig from './dnsConfig';
 import filtering from './filtering';
+import { areEqualVersions } from '../helpers/version';

 const settings = handleActions(
    {
@@ -82,7 +82,7 @@ const dashboard = handleActions(
        [actions.getVersionSuccess]: (state, { payload }) => {
            const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;

-            if (!payload.disabled && isVersionGreater(currentVersion, payload.new_version)) {
+            if (!payload.disabled && !areEqualVersions(currentVersion, payload.new_version)) {
                const {
                    announcement_url: announcementUrl,
                    new_version: newVersion,
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/AdguardTeam/dnsproxy v0.29.1
 	github.com/AdguardTeam/golibs v0.4.2
-	github.com/AdguardTeam/urlfilter v0.11.0
+	github.com/AdguardTeam/urlfilter v0.11.2
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/gobuffalo/packr v1.30.1
--- a/go.sum
+++ b/go.sum
@@ -4,8 +4,8 @@ github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKU
 github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
 github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
-github.com/AdguardTeam/urlfilter v0.11.0 h1:tgZss6uZs1UZAaxpovD/QuX+VVIQLDOlKc7rdF8dwNw=
-github.com/AdguardTeam/urlfilter v0.11.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY=
+github.com/AdguardTeam/urlfilter v0.11.2 h1:gCrWGh63Yqw3z4yi9pgikfsbshIEyvAu/KYV3MvTBlc=
+github.com/AdguardTeam/urlfilter v0.11.2/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
--- a/home/config.go
+++ b/home/config.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
-	"time"

 	"github.com/AdguardTeam/AdGuardHome/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/dnsfilter"
@@ -40,10 +39,6 @@ type configuration struct {
 	// It's reset after config is parsed
 	fileData []byte

-	// cached version.json to avoid hammering github.io for each page reload
-	versionCheckJSON     []byte
-	versionCheckLastTime time.Time
-
 	BindHost     string `yaml:"bind_host"`     // BindHost is the IP address of the HTTP server to bind to
 	BindPort     int    `yaml:"bind_port"`     // BindPort is the port the HTTP server
 	Users        []User `yaml:"users"`         // Users that can access HTTP server
--- a/home/control_update.go
+++ b/home/control_update.go
@@ -1,13 +1,7 @@
 package home

 import (
-	"archive/tar"
-	"archive/zip"
-	"compress/gzip"
 	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -15,25 +9,12 @@ import (
 	"runtime"
 	"strings"
 	"syscall"
-	"time"

+	"github.com/AdguardTeam/AdGuardHome/update"
 	"github.com/AdguardTeam/AdGuardHome/util"
 	"github.com/AdguardTeam/golibs/log"
 )

-type updateInfo struct {
-	pkgURL           string // URL for the new package
-	pkgName          string // Full path to package file
-	newVer           string // New version string
-	updateDir        string // Full path to the directory containing unpacked files from the new package
-	backupDir        string // Full path to backup directory
-	configName       string // Full path to the current configuration file
-	updateConfigName string // Full path to the configuration file to check by the new binary
-	curBinName       string // Full path to the current executable file
-	bkpBinName       string // Full path to the current executable file in backup directory
-	newBinName       string // Full path to the new executable file
-}
-
 type getVersionJSONRequest struct {
 	RecheckNow bool `json:"recheck_now"`
 }
@@ -58,28 +39,11 @@ func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	now := time.Now()
-	if !req.RecheckNow {
-		Context.controlLock.Lock()
-		cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0
-		data := config.versionCheckJSON
-		Context.controlLock.Unlock()
-
-		if cached {
-			log.Tracef("Returning cached data")
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write(getVersionResp(data))
-			return
-		}
-	}
-
-	var resp *http.Response
+	var info update.VersionInfo
 	for i := 0; i != 3; i++ {
-		log.Tracef("Downloading data from %s", versionCheckURL)
-		resp, err = Context.client.Get(versionCheckURL)
-		if resp != nil && resp.Body != nil {
-			defer resp.Body.Close()
-		}
+		Context.controlLock.Lock()
+		info, err = Context.updater.GetVersionResponse(req.RecheckNow)
+		Context.controlLock.Unlock()
 		if err != nil && strings.HasSuffix(err.Error(), "i/o timeout") {
 			// This case may happen while we're restarting DNS server
 			// https://github.com/AdguardTeam/AdGuardHome/issues/934
@@ -92,39 +56,21 @@ func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	// read the body entirely
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		httpError(w, http.StatusBadGateway, "Couldn't read response body from %s: %s", versionCheckURL, err)
-		return
-	}
-
-	Context.controlLock.Lock()
-	config.versionCheckLastTime = now
-	config.versionCheckJSON = body
-	Context.controlLock.Unlock()
-
 	w.Header().Set("Content-Type", "application/json")
-	_, err = w.Write(getVersionResp(body))
+	_, err = w.Write(getVersionResp(info))
 	if err != nil {
 		httpError(w, http.StatusInternalServerError, "Couldn't write body: %s", err)
 	}
 }

 // Perform an update procedure to the latest available version
-func handleUpdate(w http.ResponseWriter, r *http.Request) {
-	if len(config.versionCheckJSON) == 0 {
+func handleUpdate(w http.ResponseWriter, _ *http.Request) {
+	if len(Context.updater.NewVersion) == 0 {
 		httpError(w, http.StatusBadRequest, "/update request isn't allowed now")
 		return
 	}

-	u, err := getUpdateInfo(config.versionCheckJSON)
-	if err != nil {
-		httpError(w, http.StatusInternalServerError, "%s", err)
-		return
-	}
-
-	err = doUpdate(u)
+	err := Context.updater.DoUpdate()
 	if err != nil {
 		httpError(w, http.StatusInternalServerError, "%s", err)
 		return
@@ -135,33 +81,18 @@ func handleUpdate(w http.ResponseWriter, r *http.Request) {
 		f.Flush()
 	}

-	go finishUpdate(u)
+	go finishUpdate()
 }

 // Convert version.json data to our JSON response
-func getVersionResp(data []byte) []byte {
-	versionJSON := make(map[string]interface{})
-	err := json.Unmarshal(data, &versionJSON)
-	if err != nil {
-		log.Error("version.json: %s", err)
-		return []byte{}
-	}
-
+func getVersionResp(info update.VersionInfo) []byte {
 	ret := make(map[string]interface{})
 	ret["can_autoupdate"] = false
+	ret["new_version"] = info.NewVersion
+	ret["announcement"] = info.Announcement
+	ret["announcement_url"] = info.AnnouncementURL

-	var ok1, ok2, ok3 bool
-	ret["new_version"], ok1 = versionJSON["version"].(string)
-	ret["announcement"], ok2 = versionJSON["announcement"].(string)
-	ret["announcement_url"], ok3 = versionJSON["announcement_url"].(string)
-	selfUpdateMinVersion, ok4 := versionJSON["selfupdate_min_version"].(string)
-	if !ok1 || !ok2 || !ok3 || !ok4 {
-		log.Error("version.json: invalid data")
-		return []byte{}
-	}
-
-	_, ok := getDownloadURL(versionJSON)
-	if ok && ret["new_version"] != versionString && versionString >= selfUpdateMinVersion {
+	if info.CanAutoUpdate {
 		canUpdate := true

 		tlsConf := tlsConfigSettings{}
@@ -185,373 +116,18 @@ func getVersionResp(data []byte) []byte {
 	return d
 }

-// Copy file on disk
-func copyFile(src, dst string) error {
-	d, e := ioutil.ReadFile(src)
-	if e != nil {
-		return e
-	}
-	e = ioutil.WriteFile(dst, d, 0644)
-	if e != nil {
-		return e
-	}
-	return nil
-}
-
-// Fill in updateInfo object
-func getUpdateInfo(jsonData []byte) (*updateInfo, error) {
-	var u updateInfo
-
-	workDir := Context.workDir
-
-	versionJSON := make(map[string]interface{})
-	err := json.Unmarshal(jsonData, &versionJSON)
-	if err != nil {
-		return nil, fmt.Errorf("JSON parse: %s", err)
-	}
-
-	pkgURL, ok := getDownloadURL(versionJSON)
-	if !ok {
-		return nil, fmt.Errorf("failed to get download URL")
-	}
-
-	u.pkgURL = pkgURL
-	u.newVer = versionJSON["version"].(string)
-	if len(u.pkgURL) == 0 || len(u.newVer) == 0 {
-		return nil, fmt.Errorf("invalid JSON")
-	}
-
-	if u.newVer == versionString {
-		return nil, fmt.Errorf("no need to update")
-	}
-
-	u.updateDir = filepath.Join(workDir, fmt.Sprintf("agh-update-%s", u.newVer))
-	u.backupDir = filepath.Join(workDir, "agh-backup")
-
-	_, pkgFileName := filepath.Split(u.pkgURL)
-	if len(pkgFileName) == 0 {
-		return nil, fmt.Errorf("invalid JSON")
-	}
-	u.pkgName = filepath.Join(u.updateDir, pkgFileName)
-
-	u.configName = config.getConfigFilename()
-	u.updateConfigName = filepath.Join(u.updateDir, "AdGuardHome", "AdGuardHome.yaml")
-	if strings.HasSuffix(pkgFileName, ".zip") {
-		u.updateConfigName = filepath.Join(u.updateDir, "AdGuardHome.yaml")
-	}
-
-	binName := "AdGuardHome"
-	if runtime.GOOS == "windows" {
-		binName = "AdGuardHome.exe"
-	}
-	u.curBinName = filepath.Join(workDir, binName)
-	if !util.FileExists(u.curBinName) {
-		return nil, fmt.Errorf("executable file %s doesn't exist", u.curBinName)
-	}
-	u.bkpBinName = filepath.Join(u.backupDir, binName)
-	u.newBinName = filepath.Join(u.updateDir, "AdGuardHome", binName)
-	if strings.HasSuffix(pkgFileName, ".zip") {
-		u.newBinName = filepath.Join(u.updateDir, binName)
-	}
-
-	return &u, nil
-}
-
-// getDownloadURL - gets download URL for the current GOOS/GOARCH
-// returns
-func getDownloadURL(json map[string]interface{}) (string, bool) {
-	var key string
-
-	if runtime.GOARCH == "arm" && ARMVersion != "" {
-		// the key is:
-		// download_linux_armv5 for ARMv5
-		// download_linux_armv6 for ARMv6
-		// download_linux_armv7 for ARMv7
-		key = fmt.Sprintf("download_%s_%sv%s", runtime.GOOS, runtime.GOARCH, ARMVersion)
-	}
-
-	u, ok := json[key]
-	if !ok {
-		// the key is download_linux_arm or download_linux_arm64 for regular ARM versions
-		key = fmt.Sprintf("download_%s_%s", runtime.GOOS, runtime.GOARCH)
-		u, ok = json[key]
-	}
-
-	if !ok {
-		return "", false
-	}
-
-	return u.(string), true
-}
-
-// Unpack all files from .zip file to the specified directory
-// Existing files are overwritten
-// Return the list of files (not directories) written
-func zipFileUnpack(zipfile, outdir string) ([]string, error) {
-
-	r, err := zip.OpenReader(zipfile)
-	if err != nil {
-		return nil, fmt.Errorf("zip.OpenReader(): %s", err)
-	}
-	defer r.Close()
-
-	var files []string
-	var err2 error
-	var zr io.ReadCloser
-	for _, zf := range r.File {
-		zr, err = zf.Open()
-		if err != nil {
-			err2 = fmt.Errorf("zip file Open(): %s", err)
-			break
-		}
-
-		fi := zf.FileInfo()
-		if len(fi.Name()) == 0 {
-			continue
-		}
-
-		fn := filepath.Join(outdir, fi.Name())
-
-		if fi.IsDir() {
-			err = os.Mkdir(fn, fi.Mode())
-			if err != nil && !os.IsExist(err) {
-				err2 = fmt.Errorf("os.Mkdir(): %s", err)
-				break
-			}
-			log.Tracef("created directory %s", fn)
-			continue
-		}
-
-		f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
-		if err != nil {
-			err2 = fmt.Errorf("os.OpenFile(): %s", err)
-			break
-		}
-		_, err = io.Copy(f, zr)
-		if err != nil {
-			f.Close()
-			err2 = fmt.Errorf("io.Copy(): %s", err)
-			break
-		}
-		f.Close()
-
-		log.Tracef("created file %s", fn)
-		files = append(files, fi.Name())
-	}
-
-	zr.Close()
-	return files, err2
-}
-
-// Unpack all files from .tar.gz file to the specified directory
-// Existing files are overwritten
-// Return the list of files (not directories) written
-func targzFileUnpack(tarfile, outdir string) ([]string, error) {
-
-	f, err := os.Open(tarfile)
-	if err != nil {
-		return nil, fmt.Errorf("os.Open(): %s", err)
-	}
-	defer f.Close()
-
-	gzReader, err := gzip.NewReader(f)
-	if err != nil {
-		return nil, fmt.Errorf("gzip.NewReader(): %s", err)
-	}
-
-	var files []string
-	var err2 error
-	tarReader := tar.NewReader(gzReader)
-	for {
-		header, err := tarReader.Next()
-		if err == io.EOF {
-			err2 = nil
-			break
-		}
-		if err != nil {
-			err2 = fmt.Errorf("tarReader.Next(): %s", err)
-			break
-		}
-		if len(header.Name) == 0 {
-			continue
-		}
-
-		fn := filepath.Join(outdir, header.Name)
-
-		if header.Typeflag == tar.TypeDir {
-			err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
-			if err != nil && !os.IsExist(err) {
-				err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
-				break
-			}
-			log.Tracef("created directory %s", fn)
-			continue
-		} else if header.Typeflag != tar.TypeReg {
-			log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
-			continue
-		}
-
-		f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
-		if err != nil {
-			err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
-			break
-		}
-		_, err = io.Copy(f, tarReader)
-		if err != nil {
-			f.Close()
-			err2 = fmt.Errorf("io.Copy(): %s", err)
-			break
-		}
-		f.Close()
-
-		log.Tracef("created file %s", fn)
-		files = append(files, header.Name)
-	}
-
-	gzReader.Close()
-	return files, err2
-}
-
-func copySupportingFiles(files []string, srcdir, dstdir string, useSrcNameOnly, useDstNameOnly bool) error {
-	for _, f := range files {
-		_, name := filepath.Split(f)
-		if name == "AdGuardHome" || name == "AdGuardHome.exe" || name == "AdGuardHome.yaml" {
-			continue
-		}
-
-		src := filepath.Join(srcdir, f)
-		if useSrcNameOnly {
-			src = filepath.Join(srcdir, name)
-		}
-
-		dst := filepath.Join(dstdir, f)
-		if useDstNameOnly {
-			dst = filepath.Join(dstdir, name)
-		}
-
-		err := copyFile(src, dst)
-		if err != nil && !os.IsNotExist(err) {
-			return err
-		}
-
-		log.Tracef("Copied: %s -> %s", src, dst)
-	}
-	return nil
-}
-
-// Download package file and save it to disk
-func getPackageFile(u *updateInfo) error {
-	resp, err := Context.client.Get(u.pkgURL)
-	if err != nil {
-		return fmt.Errorf("HTTP request failed: %s", err)
-	}
-	if resp != nil && resp.Body != nil {
-		defer resp.Body.Close()
-	}
-
-	log.Tracef("Reading HTTP body")
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
-	}
-
-	log.Tracef("Saving package to file")
-	err = ioutil.WriteFile(u.pkgName, body, 0644)
-	if err != nil {
-		return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
-	}
-	return nil
-}
-
-// Perform an update procedure
-func doUpdate(u *updateInfo) error {
-	log.Info("Updating from %s to %s.  URL:%s  Package:%s",
-		versionString, u.newVer, u.pkgURL, u.pkgName)
-
-	_ = os.Mkdir(u.updateDir, 0755)
-
-	var err error
-	err = getPackageFile(u)
-	if err != nil {
-		return err
-	}
-
-	log.Tracef("Unpacking the package")
-	_, file := filepath.Split(u.pkgName)
-	var files []string
-	if strings.HasSuffix(file, ".zip") {
-		files, err = zipFileUnpack(u.pkgName, u.updateDir)
-		if err != nil {
-			return fmt.Errorf("zipFileUnpack() failed: %s", err)
-		}
-	} else if strings.HasSuffix(file, ".tar.gz") {
-		files, err = targzFileUnpack(u.pkgName, u.updateDir)
-		if err != nil {
-			return fmt.Errorf("targzFileUnpack() failed: %s", err)
-		}
-	} else {
-		return fmt.Errorf("unknown package extension")
-	}
-
-	log.Tracef("Checking configuration")
-	err = copyFile(u.configName, u.updateConfigName)
-	if err != nil {
-		return fmt.Errorf("copyFile() failed: %s", err)
-	}
-	cmd := exec.Command(u.newBinName, "--check-config")
-	err = cmd.Run()
-	if err != nil || cmd.ProcessState.ExitCode() != 0 {
-		return fmt.Errorf("exec.Command(): %s %d", err, cmd.ProcessState.ExitCode())
-	}
-
-	log.Tracef("Backing up the current configuration")
-	_ = os.Mkdir(u.backupDir, 0755)
-	err = copyFile(u.configName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
-	if err != nil {
-		return fmt.Errorf("copyFile() failed: %s", err)
-	}
-
-	// ./README.md -> backup/README.md
-	err = copySupportingFiles(files, Context.workDir, u.backupDir, true, true)
-	if err != nil {
-		return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s",
-			Context.workDir, u.backupDir, err)
-	}
-
-	// update/[AdGuardHome/]README.md -> ./README.md
-	err = copySupportingFiles(files, u.updateDir, Context.workDir, false, true)
-	if err != nil {
-		return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s",
-			u.updateDir, Context.workDir, err)
-	}
-
-	log.Tracef("Renaming: %s -> %s", u.curBinName, u.bkpBinName)
-	err = os.Rename(u.curBinName, u.bkpBinName)
-	if err != nil {
-		return err
-	}
-	if runtime.GOOS == "windows" {
-		// rename fails with "File in use" error
-		err = copyFile(u.newBinName, u.curBinName)
-	} else {
-		err = os.Rename(u.newBinName, u.curBinName)
-	}
-	if err != nil {
-		return err
-	}
-	log.Tracef("Renamed: %s -> %s", u.newBinName, u.curBinName)
-
-	_ = os.Remove(u.pkgName)
-	_ = os.RemoveAll(u.updateDir)
-	return nil
-}
-
 // Complete an update procedure
-func finishUpdate(u *updateInfo) {
+func finishUpdate() {
 	log.Info("Stopping all tasks")
 	cleanup()
 	cleanupAlways()

+	exeName := "AdGuardHome"
+	if runtime.GOOS == "windows" {
+		exeName = "AdGuardHome.exe"
+	}
+	curBinName := filepath.Join(Context.workDir, exeName)
+
 	if runtime.GOOS == "windows" {
 		if Context.runningAsService {
 			// Note:
@@ -565,7 +141,7 @@ func finishUpdate(u *updateInfo) {
 			os.Exit(0)
 		}

-		cmd := exec.Command(u.curBinName, os.Args[1:]...)
+		cmd := exec.Command(curBinName, os.Args[1:]...)
 		log.Info("Restarting: %v", cmd.Args)
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
@@ -577,7 +153,7 @@ func finishUpdate(u *updateInfo) {
 		os.Exit(0)
 	} else {
 		log.Info("Restarting: %v", os.Args)
-		err := syscall.Exec(u.curBinName, os.Args, os.Environ())
+		err := syscall.Exec(curBinName, os.Args, os.Environ())
 		if err != nil {
 			log.Fatalf("syscall.Exec() failed: %s", err)
 		}
--- a/home/control_update_test.go
+++ b/home/control_update_test.go
@@ -5,6 +5,8 @@ package home
 import (
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )

 func TestDoUpdate(t *testing.T) {
@@ -16,16 +18,28 @@ func TestDoUpdate(t *testing.T) {
 		"version": "v0.96",
 		"announcement": "AdGuard Home v0.96 is now available!",
 		"announcement_url": "",
-		"download_windows_amd64": "",
-		"download_windows_386": "",
-		"download_darwin_amd64": "",
-		"download_linux_amd64": "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.96/AdGuardHome_linux_amd64.tar.gz",
-		"download_linux_386": "",
-		"download_linux_arm": "",
-		"download_linux_arm64": "",
-		"download_linux_mips": "",
-		"download_linux_mipsle": "",
-		"selfupdate_min_version": "v0.0"
+		"download_windows_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip",
+		"download_windows_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip",
+		"download_darwin_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip",
+		"download_darwin_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip",
+		"download_linux_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz",
+		"download_linux_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz",
+		"download_linux_arm": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz",
+		"download_linux_armv5": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz",
+		"download_linux_armv6": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz",
+		"download_linux_armv7": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz",
+		"download_linux_arm64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz",
+		"download_linux_mips": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz",
+		"download_linux_mipsle": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz",
+		"download_linux_mips64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz",
+		"download_linux_mips64le": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz",
+		"download_freebsd_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_386.tar.gz",
+		"download_freebsd_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_amd64.tar.gz",
+		"download_freebsd_arm": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz",
+		"download_freebsd_armv5": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv5.tar.gz",
+		"download_freebsd_armv6": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz",
+		"download_freebsd_armv7": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv7.tar.gz",
+		"download_freebsd_arm64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_arm64.tar.gz"
 	}`
 	uu, err := getUpdateInfo([]byte(data))
 	if err != nil {
@@ -33,7 +47,7 @@ func TestDoUpdate(t *testing.T) {
 	}

 	u := updateInfo{
-		pkgURL:           "https://github.com/AdguardTeam/AdGuardHome/releases/download/" + newver + "/AdGuardHome_linux_amd64.tar.gz",
+		pkgURL:           "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz",
 		pkgName:          Context.workDir + "/agh-update-" + newver + "/AdGuardHome_linux_amd64.tar.gz",
 		newVer:           newver,
 		updateDir:        Context.workDir + "/agh-update-" + newver,
@@ -45,18 +59,16 @@ func TestDoUpdate(t *testing.T) {
 		newBinName:       Context.workDir + "/agh-update-" + newver + "/AdGuardHome/AdGuardHome",
 	}

-	if uu.pkgURL != u.pkgURL ||
-		uu.pkgName != u.pkgName ||
-		uu.newVer != u.newVer ||
-		uu.updateDir != u.updateDir ||
-		uu.backupDir != u.backupDir ||
-		uu.configName != u.configName ||
-		uu.updateConfigName != u.updateConfigName ||
-		uu.curBinName != u.curBinName ||
-		uu.bkpBinName != u.bkpBinName ||
-		uu.newBinName != u.newBinName {
-		t.Fatalf("getUpdateInfo: %v != %v", uu, u)
-	}
+	assert.Equal(t, uu.pkgURL, u.pkgURL)
+	assert.Equal(t, uu.pkgName, u.pkgName)
+	assert.Equal(t, uu.newVer, u.newVer)
+	assert.Equal(t, uu.updateDir, u.updateDir)
+	assert.Equal(t, uu.backupDir, u.backupDir)
+	assert.Equal(t, uu.configName, u.configName)
+	assert.Equal(t, uu.updateConfigName, u.updateConfigName)
+	assert.Equal(t, uu.curBinName, u.curBinName)
+	assert.Equal(t, uu.bkpBinName, u.bkpBinName)
+	assert.Equal(t, uu.newBinName, u.newBinName)

 	e := doUpdate(&u)
 	if e != nil {
@@ -66,20 +78,20 @@ func TestDoUpdate(t *testing.T) {
 }

 func TestTargzFileUnpack(t *testing.T) {
-	fn := "./dist/AdGuardHome_v0.95_linux_amd64.tar.gz"
-	outdir := "./test-unpack"
+	fn := "../dist/AdGuardHome_linux_amd64.tar.gz"
+	outdir := "../test-unpack"
+	defer os.RemoveAll(outdir)
 	_ = os.Mkdir(outdir, 0755)
 	files, e := targzFileUnpack(fn, outdir)
 	if e != nil {
 		t.Fatalf("FAILED: %s", e)
 	}
 	t.Logf("%v", files)
-	os.RemoveAll(outdir)
 }

 func TestZipFileUnpack(t *testing.T) {
-	fn := "./dist/AdGuardHome_v0.95_Windows_amd64.zip"
-	outdir := "./test-unpack"
+	fn := "../dist/AdGuardHome_windows_amd64.zip"
+	outdir := "../test-unpack"
 	_ = os.Mkdir(outdir, 0755)
 	files, e := zipFileUnpack(fn, outdir)
 	if e != nil {
--- a/home/dns.go
+++ b/home/dns.go
@@ -242,7 +242,7 @@ func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteri
 		return
 	}

-	log.Debug("Using settings for client with IP %s", clientAddr)
+	log.Debug("Using settings for client %s with IP %s", c.Name, clientAddr)

 	if c.UseOwnBlockedServices {
 		Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)
--- a/home/home.go
+++ b/home/home.go
@@ -20,6 +20,7 @@ import (

 	"gopkg.in/natefinch/lumberjack.v2"

+	"github.com/AdguardTeam/AdGuardHome/update"
 	"github.com/AdguardTeam/AdGuardHome/util"

 	"github.com/joomcode/errorx"
@@ -47,8 +48,6 @@ var (
 	ARMVersion      = ""
 )

-const versionCheckPeriod = time.Hour * 8
-
 // Global context
 type homeContext struct {
 	// Modules
@@ -67,6 +66,7 @@ type homeContext struct {
 	web        *Web                 // Web (HTTP, HTTPS) module
 	tls        *TLSMod              // TLS module
 	autoHosts  util.AutoHosts       // IP-hostname pairs taken from system configuration (e.g. /etc/hosts) files
+	updater    *update.Updater

 	// Runtime properties
 	// --
@@ -225,6 +225,18 @@ func run(args options) {
 		os.Exit(1)
 	}
 	Context.autoHosts.Init("")
+
+	Context.updater = update.NewUpdater(update.Config{
+		Client:        Context.client,
+		WorkDir:       Context.workDir,
+		VersionURL:    versionCheckURL,
+		VersionString: versionString,
+		OS:            runtime.GOOS,
+		Arch:          runtime.GOARCH,
+		ARMVersion:    ARMVersion,
+		ConfigName:    config.getConfigFilename(),
+	})
+
 	Context.clients.Init(config.Clients, Context.dhcpServer, &Context.autoHosts)
 	config.Clients = nil

--- a/openapi/CHANGELOG.md
+++ b/openapi/CHANGELOG.md
@@ -2,12 +2,22 @@

 ## v0.103: API changes

+### API: replace settings in GET /control/dns_info & POST /control/dns_config
+
+* added "upstream_mode"
+
+		"upstream_mode": "" | "parallel" | "fastest_addr"
+
+* removed "fastest_addr", "parallel_requests"
+
+
 ### API: Get querylog: GET /control/querylog

 * Added optional "offset" and "limit" parameters

 We are still using "older_than" approach in AdGuard Home UI, but we realize that it's easier to use offset/limit so here is this option now.

+
 ## v0.102: API changes

 ### API: Get general status: GET /control/status
--- a/update/check.go
+++ b/update/check.go
@@ -0,0 +1,104 @@
+package update
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"strings"
+	"time"
+)
+
+const versionCheckPeriod = 8 * 60 * 60
+
+// VersionInfo - VersionInfo
+type VersionInfo struct {
+	NewVersion           string // New version string
+	Announcement         string // Announcement text
+	AnnouncementURL      string // Announcement URL
+	SelfUpdateMinVersion string // Min version starting with which we can auto-update
+	CanAutoUpdate        bool   // If true - we can auto-update
+}
+
+// GetVersionResponse - downloads version.json (if needed) and deserializes it
+func (u *Updater) GetVersionResponse(forceRecheck bool) (VersionInfo, error) {
+	if !forceRecheck &&
+		u.versionCheckLastTime.Unix()+versionCheckPeriod > time.Now().Unix() {
+		return u.parseVersionResponse(u.versionJSON)
+	}
+
+	resp, err := u.Client.Get(u.VersionURL)
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+
+	if err != nil {
+		return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
+	}
+
+	u.versionJSON = body
+	u.versionCheckLastTime = time.Now()
+
+	return u.parseVersionResponse(body)
+}
+
+func (u *Updater) parseVersionResponse(data []byte) (VersionInfo, error) {
+	info := VersionInfo{}
+	versionJSON := make(map[string]interface{})
+	err := json.Unmarshal(data, &versionJSON)
+	if err != nil {
+		return info, fmt.Errorf("version.json: %s", err)
+	}
+
+	var ok1, ok2, ok3, ok4 bool
+	info.NewVersion, ok1 = versionJSON["version"].(string)
+	info.Announcement, ok2 = versionJSON["announcement"].(string)
+	info.AnnouncementURL, ok3 = versionJSON["announcement_url"].(string)
+	info.SelfUpdateMinVersion, ok4 = versionJSON["selfupdate_min_version"].(string)
+	if !ok1 || !ok2 || !ok3 || !ok4 {
+		return info, fmt.Errorf("version.json: invalid data")
+	}
+
+	packageURL, ok := u.getDownloadURL(versionJSON)
+
+	if ok &&
+		info.NewVersion != u.VersionString &&
+		strings.TrimPrefix(u.VersionString, "v") >= strings.TrimPrefix(info.SelfUpdateMinVersion, "v") {
+		info.CanAutoUpdate = true
+	}
+
+	u.NewVersion = info.NewVersion
+	u.PackageURL = packageURL
+
+	return info, nil
+}
+
+// Get download URL for the current GOOS/GOARCH/ARMVersion
+func (u *Updater) getDownloadURL(json map[string]interface{}) (string, bool) {
+	var key string
+
+	if u.Arch == "arm" && u.ARMVersion != "" {
+		// the key is:
+		// download_linux_armv5 for ARMv5
+		// download_linux_armv6 for ARMv6
+		// download_linux_armv7 for ARMv7
+		key = fmt.Sprintf("download_%s_%sv%s", u.OS, u.Arch, u.ARMVersion)
+	}
+
+	val, ok := json[key]
+	if !ok {
+		// the key is download_linux_arm or download_linux_arm64 for regular ARM versions
+		key = fmt.Sprintf("download_%s_%s", u.OS, u.Arch)
+		val, ok = json[key]
+	}
+
+	if !ok {
+		return "", false
+	}
+
+	return val.(string), true
+}
--- a/update/test/AdGuardHome.tar.gz
+++ b/update/test/AdGuardHome.tar.gz
--- a/update/test/AdGuardHome.zip
+++ b/update/test/AdGuardHome.zip
--- a/update/update_test.go
+++ b/update/update_test.go
@@ -0,0 +1,210 @@
+package update
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func startHTTPServer(data string) (net.Listener, uint16) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		_, _ = w.Write([]byte(data))
+	})
+
+	listener, err := net.Listen("tcp", ":0")
+	if err != nil {
+		panic(err)
+	}
+
+	go func() { _ = http.Serve(listener, mux) }()
+	return listener, uint16(listener.Addr().(*net.TCPAddr).Port)
+}
+
+func TestUpdateGetVersion(t *testing.T) {
+	const jsonData = `{
+  "version": "v0.103.0-beta2",
+  "announcement": "AdGuard Home v0.103.0-beta2 is now available!",
+  "announcement_url": "https://github.com/AdguardTeam/AdGuardHome/releases",
+  "selfupdate_min_version": "v0.0",
+  "download_windows_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip",
+  "download_windows_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip",
+  "download_darwin_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip",
+  "download_darwin_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip",
+  "download_linux_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz",
+  "download_linux_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz",
+  "download_linux_arm": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz",
+  "download_linux_armv5": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz",
+  "download_linux_armv6": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz",
+  "download_linux_armv7": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz",
+  "download_linux_arm64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz",
+  "download_linux_mips": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz",
+  "download_linux_mipsle": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz",
+  "download_linux_mips64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz",
+  "download_linux_mips64le": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz",
+  "download_freebsd_386": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_386.tar.gz",
+  "download_freebsd_amd64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_amd64.tar.gz",
+  "download_freebsd_arm": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz",
+  "download_freebsd_armv5": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv5.tar.gz",
+  "download_freebsd_armv6": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz",
+  "download_freebsd_armv7": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv7.tar.gz",
+  "download_freebsd_arm64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_arm64.tar.gz"
+}`
+
+	l, lport := startHTTPServer(jsonData)
+	defer func() { _ = l.Close() }()
+
+	u := NewUpdater(Config{
+		Client:        &http.Client{},
+		VersionURL:    fmt.Sprintf("http://127.0.0.1:%d/", lport),
+		OS:            "linux",
+		Arch:          "arm",
+		VersionString: "v0.103.0-beta1",
+	})
+
+	info, err := u.GetVersionResponse(false)
+	assert.Nil(t, err)
+	assert.Equal(t, "v0.103.0-beta2", info.NewVersion)
+	assert.Equal(t, "AdGuard Home v0.103.0-beta2 is now available!", info.Announcement)
+	assert.Equal(t, "https://github.com/AdguardTeam/AdGuardHome/releases", info.AnnouncementURL)
+	assert.Equal(t, "v0.0", info.SelfUpdateMinVersion)
+	assert.True(t, info.CanAutoUpdate)
+
+	_ = l.Close()
+
+	// check cached
+	_, err = u.GetVersionResponse(false)
+	assert.Nil(t, err)
+}
+
+func TestUpdate(t *testing.T) {
+	_ = os.Mkdir("aghtest", 0755)
+	defer func() {
+		_ = os.RemoveAll("aghtest")
+	}()
+
+	// create "current" files
+	assert.Nil(t, ioutil.WriteFile("aghtest/AdGuardHome", []byte("AdGuardHome"), 0755))
+	assert.Nil(t, ioutil.WriteFile("aghtest/README.md", []byte("README.md"), 0644))
+	assert.Nil(t, ioutil.WriteFile("aghtest/LICENSE.txt", []byte("LICENSE.txt"), 0644))
+	assert.Nil(t, ioutil.WriteFile("aghtest/AdGuardHome.yaml", []byte("AdGuardHome.yaml"), 0644))
+
+	// start server for returning package file
+	pkgData, err := ioutil.ReadFile("test/AdGuardHome.tar.gz")
+	assert.Nil(t, err)
+	l, lport := startHTTPServer(string(pkgData))
+	defer func() { _ = l.Close() }()
+
+	u := NewUpdater(Config{
+		Client:        &http.Client{},
+		PackageURL:    fmt.Sprintf("http://127.0.0.1:%d/AdGuardHome.tar.gz", lport),
+		VersionString: "v0.103.0",
+		NewVersion:    "v0.103.1",
+		ConfigName:    "aghtest/AdGuardHome.yaml",
+		WorkDir:       "aghtest",
+	})
+
+	assert.Nil(t, u.prepare())
+	u.currentExeName = "aghtest/AdGuardHome"
+	assert.Nil(t, u.downloadPackageFile(u.PackageURL, u.packageName))
+	assert.Nil(t, u.unpack())
+	// assert.Nil(t, u.check())
+	assert.Nil(t, u.backup())
+	assert.Nil(t, u.replace())
+	u.clean()
+
+	// check backup files
+	d, err := ioutil.ReadFile("aghtest/agh-backup/AdGuardHome.yaml")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome.yaml", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/agh-backup/AdGuardHome")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome", string(d))
+
+	// check updated files
+	d, err = ioutil.ReadFile("aghtest/AdGuardHome")
+	assert.Nil(t, err)
+	assert.Equal(t, "1", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/README.md")
+	assert.Nil(t, err)
+	assert.Equal(t, "2", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/LICENSE.txt")
+	assert.Nil(t, err)
+	assert.Equal(t, "3", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/AdGuardHome.yaml")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome.yaml", string(d))
+}
+
+func TestUpdateWindows(t *testing.T) {
+	_ = os.Mkdir("aghtest", 0755)
+	defer func() {
+		_ = os.RemoveAll("aghtest")
+	}()
+
+	// create "current" files
+	assert.Nil(t, ioutil.WriteFile("aghtest/AdGuardHome.exe", []byte("AdGuardHome.exe"), 0755))
+	assert.Nil(t, ioutil.WriteFile("aghtest/README.md", []byte("README.md"), 0644))
+	assert.Nil(t, ioutil.WriteFile("aghtest/LICENSE.txt", []byte("LICENSE.txt"), 0644))
+	assert.Nil(t, ioutil.WriteFile("aghtest/AdGuardHome.yaml", []byte("AdGuardHome.yaml"), 0644))
+
+	// start server for returning package file
+	pkgData, err := ioutil.ReadFile("test/AdGuardHome.zip")
+	assert.Nil(t, err)
+	l, lport := startHTTPServer(string(pkgData))
+	defer func() { _ = l.Close() }()
+
+	u := NewUpdater(Config{
+		WorkDir:       "aghtest",
+		Client:        &http.Client{},
+		PackageURL:    fmt.Sprintf("http://127.0.0.1:%d/AdGuardHome.zip", lport),
+		OS:            "windows",
+		VersionString: "v0.103.0",
+		NewVersion:    "v0.103.1",
+		ConfigName:    "aghtest/AdGuardHome.yaml",
+	})
+
+	assert.Nil(t, u.prepare())
+	u.currentExeName = "aghtest/AdGuardHome.exe"
+	assert.Nil(t, u.downloadPackageFile(u.PackageURL, u.packageName))
+	assert.Nil(t, u.unpack())
+	// assert.Nil(t, u.check())
+	assert.Nil(t, u.backup())
+	assert.Nil(t, u.replace())
+	u.clean()
+
+	// check backup files
+	d, err := ioutil.ReadFile("aghtest/agh-backup/AdGuardHome.yaml")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome.yaml", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/agh-backup/AdGuardHome.exe")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome.exe", string(d))
+
+	// check updated files
+	d, err = ioutil.ReadFile("aghtest/AdGuardHome.exe")
+	assert.Nil(t, err)
+	assert.Equal(t, "1", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/README.md")
+	assert.Nil(t, err)
+	assert.Equal(t, "2", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/LICENSE.txt")
+	assert.Nil(t, err)
+	assert.Equal(t, "3", string(d))
+
+	d, err = ioutil.ReadFile("aghtest/AdGuardHome.yaml")
+	assert.Nil(t, err)
+	assert.Equal(t, "AdGuardHome.yaml", string(d))
+}
--- a/update/updater.go
+++ b/update/updater.go
@@ -0,0 +1,418 @@
+package update
+
+import (
+	"archive/tar"
+	"archive/zip"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/AdguardTeam/AdGuardHome/util"
+	"github.com/AdguardTeam/golibs/log"
+)
+
+// Updater - Updater
+type Updater struct {
+	Config // Updater configuration
+
+	currentExeName string // current binary executable
+	updateDir      string // "work_dir/agh-update-v0.103.0"
+	packageName    string // "work_dir/agh-update-v0.103.0/pkg_name.tar.gz"
+	backupDir      string // "work_dir/agh-backup"
+	backupExeName  string // "work_dir/agh-backup/AdGuardHome[.exe]"
+	updateExeName  string // "work_dir/agh-update-v0.103.0/AdGuardHome[.exe]"
+	unpackedFiles  []string
+
+	// cached version.json to avoid hammering github.io for each page reload
+	versionJSON          []byte
+	versionCheckLastTime time.Time
+}
+
+// Config - updater config
+type Config struct {
+	Client *http.Client
+
+	VersionURL    string // version.json URL
+	VersionString string
+	OS            string // GOOS
+	Arch          string // GOARCH
+	ARMVersion    string // ARM version, e.g. "6"
+	NewVersion    string // VersionInfo.NewVersion
+	PackageURL    string // VersionInfo.PackageURL
+	ConfigName    string // current config file ".../AdGuardHome.yaml"
+	WorkDir       string // updater work dir (where backup/upd dirs will be created)
+}
+
+// NewUpdater - creates a new instance of the Updater
+func NewUpdater(cfg Config) *Updater {
+	return &Updater{
+		Config: cfg,
+	}
+}
+
+// DoUpdate - conducts the auto-update
+// 1. Downloads the update file
+// 2. Unpacks it and checks the contents
+// 3. Backups the current version and configuration
+// 4. Replaces the old files
+func (u *Updater) DoUpdate() error {
+	err := u.prepare()
+	if err != nil {
+		return err
+	}
+
+	defer u.clean()
+
+	err = u.downloadPackageFile(u.PackageURL, u.packageName)
+	if err != nil {
+		return err
+	}
+
+	err = u.unpack()
+	if err != nil {
+		return err
+	}
+
+	err = u.check()
+	if err != nil {
+		u.clean()
+		return err
+	}
+
+	err = u.backup()
+	if err != nil {
+		return err
+	}
+
+	err = u.replace()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (u *Updater) prepare() error {
+	u.updateDir = filepath.Join(u.WorkDir, fmt.Sprintf("agh-update-%s", u.NewVersion))
+
+	_, pkgNameOnly := filepath.Split(u.PackageURL)
+	if len(pkgNameOnly) == 0 {
+		return fmt.Errorf("invalid PackageURL")
+	}
+	u.packageName = filepath.Join(u.updateDir, pkgNameOnly)
+	u.backupDir = filepath.Join(u.WorkDir, "agh-backup")
+
+	exeName := "AdGuardHome"
+	if u.OS == "windows" {
+		exeName = "AdGuardHome.exe"
+	}
+
+	u.backupExeName = filepath.Join(u.backupDir, exeName)
+	u.updateExeName = filepath.Join(u.updateDir, exeName)
+
+	log.Info("Updating from %s to %s.  URL:%s",
+		u.VersionString, u.NewVersion, u.PackageURL)
+
+	// If the binary file isn't found in working directory, we won't be able to auto-update
+	// Getting the full path to the current binary file on UNIX and checking write permissions
+	//  is more difficult.
+	u.currentExeName = filepath.Join(u.WorkDir, exeName)
+	if !util.FileExists(u.currentExeName) {
+		return fmt.Errorf("executable file %s doesn't exist", u.currentExeName)
+	}
+	return nil
+}
+
+func (u *Updater) unpack() error {
+	var err error
+	_, pkgNameOnly := filepath.Split(u.PackageURL)
+
+	log.Debug("updater: unpacking the package")
+	if strings.HasSuffix(pkgNameOnly, ".zip") {
+		u.unpackedFiles, err = zipFileUnpack(u.packageName, u.updateDir)
+		if err != nil {
+			return fmt.Errorf(".zip unpack failed: %s", err)
+		}
+
+	} else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
+		u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
+		if err != nil {
+			return fmt.Errorf(".tar.gz unpack failed: %s", err)
+		}
+
+	} else {
+		return fmt.Errorf("unknown package extension")
+	}
+
+	return nil
+}
+
+func (u *Updater) check() error {
+	log.Debug("updater: checking configuration")
+	err := copyFile(u.ConfigName, filepath.Join(u.updateDir, "AdGuardHome.yaml"))
+	if err != nil {
+		return fmt.Errorf("copyFile() failed: %s", err)
+	}
+	cmd := exec.Command(u.updateExeName, "--check-config")
+	err = cmd.Run()
+	if err != nil || cmd.ProcessState.ExitCode() != 0 {
+		return fmt.Errorf("exec.Command(): %s %d", err, cmd.ProcessState.ExitCode())
+	}
+	return nil
+}
+
+func (u *Updater) backup() error {
+	log.Debug("updater: backing up the current configuration")
+	_ = os.Mkdir(u.backupDir, 0755)
+	err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
+	if err != nil {
+		return fmt.Errorf("copyFile() failed: %s", err)
+	}
+
+	// workdir/README.md -> backup/README.md
+	err = copySupportingFiles(u.unpackedFiles, u.WorkDir, u.backupDir)
+	if err != nil {
+		return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s",
+			u.WorkDir, u.backupDir, err)
+	}
+
+	return nil
+}
+
+func (u *Updater) replace() error {
+	// update/README.md -> workdir/README.md
+	err := copySupportingFiles(u.unpackedFiles, u.updateDir, u.WorkDir)
+	if err != nil {
+		return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s",
+			u.updateDir, u.WorkDir, err)
+	}
+
+	log.Debug("updater: renaming: %s -> %s", u.currentExeName, u.backupExeName)
+	err = os.Rename(u.currentExeName, u.backupExeName)
+	if err != nil {
+		return err
+	}
+
+	if u.OS == "windows" {
+		// rename fails with "File in use" error
+		err = copyFile(u.updateExeName, u.currentExeName)
+	} else {
+		err = os.Rename(u.updateExeName, u.currentExeName)
+	}
+	if err != nil {
+		return err
+	}
+	log.Debug("updater: renamed: %s -> %s", u.updateExeName, u.currentExeName)
+	return nil
+}
+
+func (u *Updater) clean() {
+	_ = os.RemoveAll(u.updateDir)
+}
+
+// Download package file and save it to disk
+func (u *Updater) downloadPackageFile(url string, filename string) error {
+	resp, err := u.Client.Get(url)
+	if err != nil {
+		return fmt.Errorf("HTTP request failed: %s", err)
+	}
+	if resp != nil && resp.Body != nil {
+		defer resp.Body.Close()
+	}
+
+	log.Debug("updater: reading HTTP body")
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
+	}
+
+	_ = os.Mkdir(u.updateDir, 0755)
+
+	log.Debug("updater: saving package to file")
+	err = ioutil.WriteFile(filename, body, 0644)
+	if err != nil {
+		return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
+	}
+	return nil
+}
+
+// Unpack all files from .tar.gz file to the specified directory
+// Existing files are overwritten
+// All files are created inside 'outdir', subdirectories are not created
+// Return the list of files (not directories) written
+func tarGzFileUnpack(tarfile, outdir string) ([]string, error) {
+	f, err := os.Open(tarfile)
+	if err != nil {
+		return nil, fmt.Errorf("os.Open(): %s", err)
+	}
+	defer func() {
+		_ = f.Close()
+	}()
+
+	gzReader, err := gzip.NewReader(f)
+	if err != nil {
+		return nil, fmt.Errorf("gzip.NewReader(): %s", err)
+	}
+
+	var files []string
+	var err2 error
+	tarReader := tar.NewReader(gzReader)
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			err2 = nil
+			break
+		}
+		if err != nil {
+			err2 = fmt.Errorf("tarReader.Next(): %s", err)
+			break
+		}
+
+		_, inputNameOnly := filepath.Split(header.Name)
+		if len(inputNameOnly) == 0 {
+			continue
+		}
+
+		outputName := filepath.Join(outdir, inputNameOnly)
+
+		if header.Typeflag == tar.TypeDir {
+			err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
+			if err != nil && !os.IsExist(err) {
+				err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
+				break
+			}
+			log.Debug("updater: created directory %s", outputName)
+			continue
+		} else if header.Typeflag != tar.TypeReg {
+			log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
+			continue
+		}
+
+		f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
+		if err != nil {
+			err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
+			break
+		}
+		_, err = io.Copy(f, tarReader)
+		if err != nil {
+			_ = f.Close()
+			err2 = fmt.Errorf("io.Copy(): %s", err)
+			break
+		}
+		err = f.Close()
+		if err != nil {
+			err2 = fmt.Errorf("f.Close(): %s", err)
+			break
+		}
+
+		log.Debug("updater: created file %s", outputName)
+		files = append(files, header.Name)
+	}
+
+	_ = gzReader.Close()
+	return files, err2
+}
+
+// Unpack all files from .zip file to the specified directory
+// Existing files are overwritten
+// All files are created inside 'outdir', subdirectories are not created
+// Return the list of files (not directories) written
+func zipFileUnpack(zipfile, outdir string) ([]string, error) {
+	r, err := zip.OpenReader(zipfile)
+	if err != nil {
+		return nil, fmt.Errorf("zip.OpenReader(): %s", err)
+	}
+	defer r.Close()
+
+	var files []string
+	var err2 error
+	var zr io.ReadCloser
+	for _, zf := range r.File {
+		zr, err = zf.Open()
+		if err != nil {
+			err2 = fmt.Errorf("zip file Open(): %s", err)
+			break
+		}
+
+		fi := zf.FileInfo()
+		inputNameOnly := fi.Name()
+		if len(inputNameOnly) == 0 {
+			continue
+		}
+
+		outputName := filepath.Join(outdir, inputNameOnly)
+
+		if fi.IsDir() {
+			err = os.Mkdir(outputName, fi.Mode())
+			if err != nil && !os.IsExist(err) {
+				err2 = fmt.Errorf("os.Mkdir(): %s", err)
+				break
+			}
+			log.Tracef("created directory %s", outputName)
+			continue
+		}
+
+		f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
+		if err != nil {
+			err2 = fmt.Errorf("os.OpenFile(): %s", err)
+			break
+		}
+		_, err = io.Copy(f, zr)
+		if err != nil {
+			_ = f.Close()
+			err2 = fmt.Errorf("io.Copy(): %s", err)
+			break
+		}
+		err = f.Close()
+		if err != nil {
+			err2 = fmt.Errorf("f.Close(): %s", err)
+			break
+		}
+
+		log.Tracef("created file %s", outputName)
+		files = append(files, inputNameOnly)
+	}
+
+	_ = zr.Close()
+	return files, err2
+}
+
+// Copy file on disk
+func copyFile(src, dst string) error {
+	d, e := ioutil.ReadFile(src)
+	if e != nil {
+		return e
+	}
+	e = ioutil.WriteFile(dst, d, 0644)
+	if e != nil {
+		return e
+	}
+	return nil
+}
+
+func copySupportingFiles(files []string, srcdir, dstdir string) error {
+	for _, f := range files {
+		_, name := filepath.Split(f)
+		if name == "AdGuardHome" || name == "AdGuardHome.exe" || name == "AdGuardHome.yaml" {
+			continue
+		}
+
+		src := filepath.Join(srcdir, name)
+		dst := filepath.Join(dstdir, name)
+
+		err := copyFile(src, dst)
+		if err != nil && !os.IsNotExist(err) {
+			return err
+		}
+
+		log.Debug("updater: copied: %s -> %s", src, dst)
+	}
+	return nil
+}
Author	SHA1	Message	Date
Andrey Meshkov	d2bf1e176e	Update urlfilter to v0.11.2	2020-07-23 20:48:50 +03:00
Simon Zolin	ffeb88ac0c	* openapi: update changelog Squashed commit of the following: commit a42d1762c2ffbfe65d728a5e76a3d0c5cc03a9c5 Author: Simon Zolin <s.zolin@adguard.com> Date: Thu Jul 23 19:17:05 2020 +0300 * openapi: update changelog	2020-07-23 19:25:42 +03:00
Simon Zolin	c71b8d3ad2	* use urlfilter v0.11.1 Squashed commit of the following: commit 35d2c34355b093ec1daa40f156809a7cae089c20 Author: Simon Zolin <s.zolin@adguard.com> Date: Thu Jul 23 18:00:43 2020 +0300 * use urlfilter v0.11.1	2020-07-23 18:09:39 +03:00
Andrey Meshkov	01957bf503	* updater: cut 'v' prefix when comparing SelfUpdateMinVersion Fix #1908 * commit '1e5419714ddcaab0913162460474dea8959529be': * (ui): fix the version check - strip the v prefix * updater: cut 'v' prefix when comparing SelfUpdateMinVersion	2020-07-23 13:21:12 +03:00
Andrey Meshkov	1e5419714d	* (ui): fix the version check - strip the v prefix	2020-07-23 12:27:14 +03:00
Simon Zolin	4f4a688ee6	* updater: cut 'v' prefix when comparing SelfUpdateMinVersion	2020-07-23 12:17:20 +03:00
Andrey Meshkov	ccf5494f67	Fix edge channel version string	2020-07-22 21:29:22 +03:00
Andrey Meshkov	f2edcca54b	*(global): update anti-ad filter URL Closes: #1903	2020-07-22 20:59:42 +03:00
Andrey Meshkov	b4aa791513	Merge: Refactor auto-update Merge in DNS/adguard-home from feature-auto-update to master * commit '6d5d1833111f65a69b208c609eda548b15db3606': Fix minor issues * use 'update' package minor + update package: perform update tasks added version cache Auto-update interface	2020-07-22 20:38:21 +03:00
Andrey Meshkov	6d5d183311	Fix minor issues	2020-07-22 20:27:20 +03:00
Simon Zolin	e3ea2528be	* use 'update' package	2020-07-22 14:20:14 +03:00
Simon Zolin	117ec4dd43	minor	2020-07-21 19:25:29 +03:00
Simon Zolin	0cc0aec5b3	+ update package: perform update tasks	2020-07-21 19:10:39 +03:00
Andrey Meshkov	3c53a2162c	added version cache	2020-07-21 12:17:23 +03:00
Andrey Meshkov	1bb183c2aa	Auto-update interface	2020-07-20 21:14:07 +03:00
Andrey Meshkov	62ccd3fb41	rollback file unpack	2020-07-20 20:15:05 +03:00
Andrey Meshkov	a409cdc2bb	fix tar.gz update	2020-07-20 20:04:54 +03:00
Andrey Meshkov	e0aa24e2b7	fix update check	2020-07-20 18:04:44 +03:00
Andrey Meshkov	0662769696	Fix version change check	2020-07-20 17:29:13 +03:00
Andrey Meshkov	dc237f10a8	Merge: Fix unpacking tar files * commit '793194db67a9b5f8440f77863a170375d3c7612f': Fix unpacking tar files	2020-07-20 17:27:15 +03:00
Andrey Meshkov	4fef0c32cb	Merge: Update locales Squashed commit of the following: commit 4d14f3a3f483a17ddd6aee3e082560d81802e5bc Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 20 15:46:54 2020 +0300 update locales commit 5d70bef97b98f4c7d8c360db2e0d8c1ce8200b8f Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 20 15:41:41 2020 +0300 update locales commit 35b28b1e606885853e55fa8bcf6693e7c07f6151 Merge: 051f6263 `c131ac44` Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 20 15:35:07 2020 +0300 Merge branch 'master' into feature/update_locales commit 051f62630f33ca06d814d7e646f58a3e0cdaa074 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 17 17:31:51 2020 +0300 + client: Update locales commit 7c88f1fbf5721098e92a3765b96b2f169afc7d43 Merge: 6d743bb1 `c1e56c83` Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 17 17:29:47 2020 +0300 Merge branch 'master' into feature/update_locales commit 6d743bb15974a85fedb004a3c639b1f849756e2d Merge: 1f6c5091 `7d2c7a61` Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 17 17:10:51 2020 +0300 Merge branch 'master' into feature/update_locales commit 1f6c50915e63c18834d63d3f8535d24a4e894647 Merge: 1a861a98 `4df02714` Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 16 11:23:08 2020 +0300 Merge branch 'master' into feature/update_locales commit 1a861a98326a749a347c184bb2b9aff663b3dd09 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 16 11:22:47 2020 +0300 Update locales commit 3f4850822c95b1147f39df939eca568f13b2c0dc Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 15 16:07:40 2020 +0300 Update locales commit 0f06bd8f188130e97394c8f20f27b66f263612cc Merge: 5abae336 `38366ba8` Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 15 12:59:22 2020 +0300 Merge branch 'master' into feature/update_locales commit 5abae33603e84dc410f77e7ec622314e85e03951 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 15 12:57:36 2020 +0300 Update locales commit 717455ecf42135077a7dae31281b1da0d89b27e3 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 17:45:15 2020 +0300 Rename label commit b399ef33eed3c0447d5c651d3b678d482dddbb5b Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 17:43:08 2020 +0300 Replace 'All responses' with 'All queries' commit 1f5a62a3d95906057c862b55d2ba91d67b346604 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 16:18:54 2020 +0300 + client: Update locales	2020-07-20 15:55:15 +03:00
Ildar Kamalov	c131ac445a	Merge: - client: fix names of clients in the top clients list Closes #1893 Squashed commit of the following: commit e5de0c4f53558e1ad89dc0069192e534f244f120 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jul 20 14:29:23 2020 +0300 - client: fix names of clients in the top clients list	2020-07-20 15:25:28 +03:00
Simon Zolin	87789679f5	Merge: - Makefile: repack all release archives so they contain AdGuardHome directory Squashed commit of the following: commit f519c82f042670e0bc377ef9f8490edce26085d9 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Jul 20 14:41:46 2020 +0300 fix commit 890a2c2b7812c2bc69224f88646ff3ab74e1562f Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Jul 20 14:24:34 2020 +0300 fix commit 753ab74b34a5ef010eb8b1d364f62d5a9c904d28 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Jul 20 14:06:49 2020 +0300 fix commit 160d0ac83ff656d39597711ab02485c1323f7a0e Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Jul 20 13:19:12 2020 +0300 - Makefile: repack all release archives so they contain AdGuardHome directory	2020-07-20 14:55:56 +03:00
Andrey Meshkov	793194db67	Fix unpacking tar files	2020-07-20 12:32:14 +03:00