{isValidAbsolutePath(value) ? value
diff --git a/client/src/components/ProtectionTimer/index.js b/client/src/components/ProtectionTimer/index.js
index 54106d31..40158617 100644
--- a/client/src/components/ProtectionTimer/index.js
+++ b/client/src/components/ProtectionTimer/index.js
@@ -32,6 +32,8 @@ const ProtectionTimer = ({
};
ProtectionTimer.propTypes = {
+ protectionDisabledDuration: PropTypes.number,
+ toggleProtectionSuccess: PropTypes.func.isRequired,
setProtectionTimerTime: PropTypes.func.isRequired,
};
diff --git a/client/src/components/Settings/LogsConfig/Form.js b/client/src/components/Settings/LogsConfig/Form.js
index dbecc183..5553bbbc 100644
--- a/client/src/components/Settings/LogsConfig/Form.js
+++ b/client/src/components/Settings/LogsConfig/Form.js
@@ -27,7 +27,6 @@ import {
} from '../../../helpers/constants';
import '../FormButton.css';
-
const getIntervalTitle = (interval, t) => {
switch (interval) {
case RETENTION_CUSTOM:
diff --git a/client/src/components/Settings/StatsConfig/Form.js b/client/src/components/Settings/StatsConfig/Form.js
index 087e9578..6512639e 100644
--- a/client/src/components/Settings/StatsConfig/Form.js
+++ b/client/src/components/Settings/StatsConfig/Form.js
@@ -7,7 +7,6 @@ import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { connect } from 'react-redux';
-
import {
renderRadioField,
toNumber,
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index c8ce1422..b38da489 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/no-unknown-property */
import React from 'react';
import './Icons.css';
diff --git a/client/src/containers/DnsRewrites.js b/client/src/containers/DnsRewrites.js
index 29547ff0..8fcda2a6 100644
--- a/client/src/containers/DnsRewrites.js
+++ b/client/src/containers/DnsRewrites.js
@@ -3,6 +3,7 @@ import {
getRewritesList,
addRewrite,
deleteRewrite,
+ updateRewrite,
toggleRewritesModal,
} from '../actions/rewrites';
import Rewrites from '../components/Filters/Rewrites';
@@ -17,6 +18,7 @@ const mapDispatchToProps = {
getRewritesList,
addRewrite,
deleteRewrite,
+ updateRewrite,
toggleRewritesModal,
};
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index 1a3182c5..ec1e437e 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -173,6 +173,8 @@ export const MODAL_TYPE = {
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
+ ADD_REWRITE: 'ADD_REWRITE',
+ EDIT_REWRITE: 'EDIT_REWRITE',
};
export const CLIENT_ID = {
diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
index 127b2902..c30326a7 100644
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -845,7 +845,6 @@ export const sortIp = (a, b) => {
}
};
-
/**
* @param {number} filterId
* @returns {string}
diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json
index 5195fe35..b7bb4664 100644
--- a/client/src/helpers/trackers/trackers.json
+++ b/client/src/helpers/trackers/trackers.json
@@ -1,5 +1,5 @@
{
- "timeUpdated": "2023-06-01T00:12:12.660Z",
+ "timeUpdated": "2023-07-01T00:11:37.465Z",
"categories": {
"0": "audio_video_player",
"1": "comments",
@@ -116,6 +116,13 @@
"url": "http://www.3dstats.com/",
"companyId": "3dstats"
},
+ "3gpp": {
+ "name": "3GPP Network",
+ "categoryId": 5,
+ "url": "https://www.3gpp.org/",
+ "companyId": "3gpp",
+ "source": "AdGuard"
+ },
"4chan": {
"name": "4Chan",
"categoryId": 8,
@@ -164,6 +171,13 @@
"url": "http://www.77agency.com/",
"companyId": "77agency"
},
+ "7plus": {
+ "name": "7plus",
+ "categoryId": 0,
+ "url": "https://7plus.com.au/",
+ "companyId": "7plus",
+ "source": "AdGuard"
+ },
"7tv.de": {
"name": "7tv.de",
"categoryId": 0,
@@ -218,6 +232,13 @@
"url": "https://en.abtasty.com",
"companyId": "ab_tasty"
},
+ "abc": {
+ "name": "Australian Broadcasting Corporation",
+ "categoryId": 8,
+ "url": "https://www.abc.net.au/",
+ "companyId": "abc",
+ "source": "AdGuard"
+ },
"ablida": {
"name": "ablida",
"categoryId": 4,
@@ -879,6 +900,20 @@
"companyId": "adguard",
"source": "AdGuard"
},
+ "adguard_dns": {
+ "name": "AdGuard DNS",
+ "categoryId": 8,
+ "url": "https://adguard-dns.io/",
+ "companyId": "adguard",
+ "source": "AdGuard"
+ },
+ "adguard_vpn": {
+ "name": "AdGuard VPN",
+ "categoryId": 8,
+ "url": "https://adguard-vpn.com/",
+ "companyId": "adguard",
+ "source": "AdGuard"
+ },
"adhands": {
"name": "AdHands",
"categoryId": 4,
@@ -2231,6 +2266,20 @@
"url": "http://www.alibaba.com/",
"companyId": "alibaba"
},
+ "alibaba_cloud": {
+ "name": "Alibaba Cloud",
+ "categoryId": 10,
+ "url": "https://www.alibabacloud.com/",
+ "companyId": "alibaba",
+ "source": "AdGuard"
+ },
+ "alibaba_ucbrowser": {
+ "name": "UC Browser",
+ "categoryId": 8,
+ "url": "https://ucweb.com/",
+ "companyId": "alibaba",
+ "source": "AdGuard"
+ },
"alipay.com": {
"name": "Alipay",
"categoryId": 2,
@@ -2501,6 +2550,13 @@
"url": "https://ww.deluxe.com/",
"companyId": "deluxe"
},
+ "appcenter": {
+ "name": "Microsoft App Center",
+ "categoryId": 5,
+ "url": "https://appcenter.ms/",
+ "companyId": null,
+ "source": "AdGuard"
+ },
"appcues": {
"name": "Appcues",
"categoryId": 2,
@@ -2519,6 +2575,20 @@
"url": "http://www.appier.com/en/index.html",
"companyId": "appier"
},
+ "apple": {
+ "name": "Apple",
+ "categoryId": 8,
+ "url": "https://www.apple.com/",
+ "companyId": "apple",
+ "source": "AdGuard"
+ },
+ "apple_ads": {
+ "name": "Apple Search Ads",
+ "categoryId": 4,
+ "url": "https://searchads.apple.com/",
+ "companyId": "apple",
+ "source": "AdGuard"
+ },
"applifier": {
"name": "Applifier",
"categoryId": 4,
@@ -2898,6 +2968,20 @@
"url": "http://azadify.com/engage/index.php",
"companyId": "azadify"
},
+ "azure": {
+ "name": "Microsoft Azure",
+ "categoryId": 10,
+ "url": "https://azure.microsoft.com/",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
+ "azure_blob_storage": {
+ "name": "Azure Blob Storage",
+ "categoryId": 8,
+ "url": "https://azure.microsoft.com/en-us/products/storage/blobs",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
"azureedge.net": {
"name": "Azure CDN",
"categoryId": 9,
@@ -3264,6 +3348,13 @@
"url": "https://www.microsoft.com/",
"companyId": "microsoft"
},
+ "binge": {
+ "name": "Binge",
+ "categoryId": 0,
+ "url": "https://binge.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"binlayer": {
"name": "BinLayer",
"categoryId": 4,
@@ -3300,6 +3391,13 @@
"url": "https://www.bitrix24.com/",
"companyId": "bitrix24"
},
+ "bitwarden": {
+ "name": "Bitwarden",
+ "categoryId": 8,
+ "url": "https://bitwarden.com/",
+ "companyId": "bitwarden",
+ "source": "AdGuard"
+ },
"bizcn": {
"name": "Bizcn",
"categoryId": 4,
@@ -3588,6 +3686,13 @@
"url": "http://www.brainsins.com/",
"companyId": "brainsins"
},
+ "branch": {
+ "name": "Branch.io",
+ "categoryId": 101,
+ "url": "https://branch.io/",
+ "companyId": "branch_metrics_inc",
+ "source": "AdGuard"
+ },
"branch_metrics": {
"name": "Branch",
"categoryId": 4,
@@ -3816,6 +3921,13 @@
"url": "http://www.businessol.com/",
"companyId": "businessonline"
},
+ "button": {
+ "name": "Button",
+ "categoryId": 4,
+ "url": "https://www.usebutton.com/",
+ "companyId": null,
+ "source": "AdGuard"
+ },
"buysellads": {
"name": "BuySellAds",
"categoryId": 4,
@@ -5160,6 +5272,13 @@
"url": "http://www.crankyads.com",
"companyId": "crankyads"
},
+ "crashlytics": {
+ "name": "Crashlytics",
+ "categoryId": 101,
+ "url": "https://crashlytics.com/",
+ "companyId": null,
+ "source": "AdGuard"
+ },
"crazy_egg": {
"name": "Crazy Egg",
"categoryId": 6,
@@ -5904,6 +6023,13 @@
"url": "http://s.dogannet.tv/",
"companyId": "dogannet"
},
+ "domainglass": {
+ "name": "Domain Glass",
+ "categoryId": 8,
+ "url": "https://domain.glass/",
+ "companyId": "domainglass",
+ "source": "AdGuard"
+ },
"domodomain": {
"name": "DomoDomain",
"categoryId": 6,
@@ -6234,6 +6360,13 @@
"url": "http://www.eco-tag.jp/",
"companyId": "ecotag"
},
+ "edgio": {
+ "name": "Edgio",
+ "categoryId": 9,
+ "url": "https://edg.io/",
+ "companyId": "edgio",
+ "source": "AdGuard"
+ },
"edigitalresearch": {
"name": "eDigitalResearch",
"categoryId": 4,
@@ -6294,6 +6427,13 @@
"url": "http://www.amazon.com/",
"companyId": "amazon_associates"
},
+ "element": {
+ "name": "Element",
+ "categoryId": 7,
+ "url": "https://element.io/",
+ "companyId": "element",
+ "source": "AdGuard"
+ },
"elicit": {
"name": "elicit",
"categoryId": 4,
@@ -6775,6 +6915,13 @@
"companyId": "meta",
"source": "AdGuard"
},
+ "facebook_audience": {
+ "name": "Facebook Audience Network",
+ "categoryId": 4,
+ "url": "https://www.facebook.com/business/products/audience-network",
+ "companyId": "meta",
+ "source": "AdGuard"
+ },
"facebook_beacon": {
"name": "Facebook Beacon",
"categoryId": 7,
@@ -6981,6 +7128,13 @@
"url": "https://www.findologic.com/",
"companyId": "findologic"
},
+ "firebase": {
+ "name": "Firebase",
+ "categoryId": 101,
+ "url": "https://firebase.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"firebaseio.com": {
"name": "Firebase",
"categoryId": 8,
@@ -7017,6 +7171,13 @@
"url": "http://flagcounter.com/",
"companyId": "flag_counter"
},
+ "flash": {
+ "name": "Flash",
+ "categoryId": 0,
+ "url": "https://flashnews.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"flashtalking": {
"name": "Flashtalking",
"categoryId": 4,
@@ -7222,6 +7383,13 @@
"url": "https://publishers.foxaudiencenetwork.com/",
"companyId": "fox_audience_network"
},
+ "fox_sports": {
+ "name": "Fox Sports",
+ "categoryId": 0,
+ "url": "https://foxsports.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"foxnews_static": {
"name": "Fox News CDN",
"categoryId": 9,
@@ -7234,6 +7402,13 @@
"url": "https://www.foxpush.com/",
"companyId": "foxpush"
},
+ "foxtel": {
+ "name": "Foxtel",
+ "categoryId": 0,
+ "url": "https://foxtel.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"foxydeal_com": {
"name": "foxydeal.com",
"categoryId": 12,
@@ -7282,6 +7457,13 @@
"url": "http://freenet.de/",
"companyId": "debitel"
},
+ "freeview": {
+ "name": "Freeview",
+ "categoryId": 0,
+ "url": "https://freeview.com.au/",
+ "companyId": "freeview",
+ "source": "AdGuard"
+ },
"freewheel": {
"name": "FreeWheel",
"categoryId": 4,
@@ -7714,6 +7896,13 @@
"url": "http://a.gmdelivery.com/",
"companyId": "gm_delivery"
},
+ "gmail": {
+ "name": "Gmail",
+ "categoryId": 13,
+ "url": "https://mail.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"gmo": {
"name": "GMO",
"categoryId": 4,
@@ -7822,12 +8011,40 @@
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_auth": {
+ "name": "Google Auth",
+ "categoryId": 2,
+ "url": "https://myaccount.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_beacons": {
"name": "Google Beacons",
"categoryId": 6,
"url": "https://google.xyz",
"companyId": "google"
},
+ "google_chat": {
+ "name": "Google Chat",
+ "categoryId": 7,
+ "url": "https://mail.google.com/chat/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_cloud_platform": {
+ "name": "Google Cloud Platform",
+ "categoryId": 10,
+ "url": "https://cloud.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_cloud_storage": {
+ "name": "Google Cloud Storage",
+ "categoryId": 10,
+ "url": "https://cloud.google.com/storage/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_custom_search": {
"name": "Google Custom Search Ads",
"categoryId": 4,
@@ -7840,6 +8057,27 @@
"url": "https://programmablesearchengine.google.com/about/",
"companyId": "google"
},
+ "google_dns": {
+ "name": "Google DNS",
+ "categoryId": 10,
+ "url": "hhttps://dns.google/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_domains": {
+ "name": "Google Domains",
+ "categoryId": 10,
+ "url": "https://domains.google/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_edge": {
+ "name": "Google Edge CDN",
+ "categoryId": 9,
+ "url": "https://peering.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_email": {
"name": "Google Email",
"categoryId": 13,
@@ -7852,12 +8090,47 @@
"url": "https://fonts.google.com/",
"companyId": "google"
},
+ "google_hosted": {
+ "name": "Google Hosted",
+ "categoryId": 10,
+ "url": "https://workspace.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_ima": {
"name": "Google IMA",
"categoryId": 4,
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_location": {
+ "name": "Google Location",
+ "categoryId": 8,
+ "url": "https://patents.google.com/patent/WO2007025143A1/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_maps": {
+ "name": "Google Maps",
+ "categoryId": 2,
+ "url": "https://www.google.com/maps/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_marketing": {
+ "name": "Google Marketing",
+ "categoryId": 6,
+ "url": "https://marketingplatform.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
+ "google_meet": {
+ "name": "Google Meet",
+ "categoryId": 2,
+ "url": "https://meet.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_photos": {
"name": "Google Photos",
"categoryId": 9,
@@ -7870,6 +8143,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_play": {
+ "name": "Google Play",
+ "categoryId": 8,
+ "url": "https://play.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_plus": {
"name": "Google+ Platform",
"categoryId": 7,
@@ -7930,6 +8210,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_trust_services": {
+ "name": "Google Trust Services",
+ "categoryId": 5,
+ "url": "https://pki.goog/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_trusted_stores": {
"name": "Google Trusted Stores",
"categoryId": 6,
@@ -7942,6 +8229,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_voice": {
+ "name": "Google Voice",
+ "categoryId": 2,
+ "url": "https://voice.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"google_website_optimizer": {
"name": "Google Website Optimizer",
"categoryId": 6,
@@ -7954,6 +8248,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
+ "google_workspace": {
+ "name": "Google Workspace",
+ "categoryId": 2,
+ "url": "https://workspace.google.com/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"googleapis.com": {
"name": "Google APIs",
"categoryId": 9,
@@ -8350,6 +8651,13 @@
"url": "https://hiveworkscomics.com/",
"companyId": "hive_works"
},
+ "hockeyapp": {
+ "name": "HockeyApp",
+ "categoryId": 101,
+ "url": "https://hockeyapp.net/",
+ "companyId": null,
+ "source": "AdGuard"
+ },
"hoholikik.club": {
"name": "hoholikik.club",
"categoryId": 12,
@@ -8626,6 +8934,13 @@
"url": "http://idealo.com/",
"companyId": null
},
+ "identrust": {
+ "name": "IdenTrust, Inc.",
+ "categoryId": 5,
+ "url": "https://identrust.com/",
+ "companyId": "identrust",
+ "source": "AdGuard"
+ },
"ideoclick": {
"name": "IdeoClick",
"categoryId": 4,
@@ -9185,6 +9500,13 @@
"url": "http://www.iprospect.com/",
"companyId": "dentsu_aegis_network"
},
+ "iqiyi": {
+ "name": "iQiyi",
+ "categoryId": 0,
+ "url": "https://www.iqiyi.com/",
+ "companyId": "iqiyi",
+ "source": "AdGuard"
+ },
"ironsource": {
"name": "ironSource",
"categoryId": 4,
@@ -9197,6 +9519,13 @@
"url": "http://www.isocket.com/",
"companyId": "rubicon_project"
},
+ "isolarcloud": {
+ "name": "iSolarCloud",
+ "categoryId": 6,
+ "url": "https://isolarcloud.com/",
+ "companyId": "sungrow",
+ "source": "AdGuard"
+ },
"ispot.tv": {
"name": "iSpot.tv",
"categoryId": 4,
@@ -9527,6 +9856,13 @@
"url": "https://www.kantarmedia.com/",
"companyId": "wpp"
},
+ "karambasecurity": {
+ "name": "Karamba Security",
+ "categoryId": 8,
+ "url": "https://karambasecurity.com/",
+ "companyId": "karambasecurity",
+ "source": "AdGuard"
+ },
"kargo": {
"name": "Kargo",
"categoryId": 4,
@@ -9563,6 +9899,13 @@
"url": "http://kavanga.ru/",
"companyId": "kavanga"
},
+ "kayo_sports": {
+ "name": "Kayo Sports",
+ "categoryId": 0,
+ "url": "https://kayosports.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"keen_io": {
"name": "Keen IO",
"categoryId": 6,
@@ -9629,6 +9972,13 @@
"url": "http://www.visistat.com/",
"companyId": "kickfire"
},
+ "kik": {
+ "name": "Kik",
+ "categoryId": 7,
+ "url": "https://kik.com/",
+ "companyId": "kik",
+ "source": "AdGuard"
+ },
"king.com": {
"name": "King.com",
"categoryId": 4,
@@ -9971,6 +10321,13 @@
"url": "https://letreach.com/",
"companyId": "let_reach"
},
+ "lets_encrypt": {
+ "name": "Let's Encrypt",
+ "categoryId": 5,
+ "url": "https://letsencrypt.org/",
+ "companyId": "lets_encrypt",
+ "source": "AdGuard"
+ },
"letv": {
"name": "LeTV",
"categoryId": 6,
@@ -9983,6 +10340,20 @@
"url": "http://www.level3.com/en/",
"companyId": "level3_communications"
},
+ "lgads": {
+ "name": "LG Ad Solutions",
+ "categoryId": 4,
+ "url": "https://lgads.tv/",
+ "companyId": "lgcorp",
+ "source": "AdGuard"
+ },
+ "lgtv": {
+ "name": "LG TV",
+ "categoryId": 8,
+ "url": "https://www.lg.com/",
+ "companyId": "lgcorp",
+ "source": "AdGuard"
+ },
"licensebuttons.net": {
"name": "licensebuttons.net",
"categoryId": 9,
@@ -10731,6 +11102,13 @@
"url": "http://www.matomymarket.com/",
"companyId": "matomy_media"
},
+ "matrix": {
+ "name": "Matrix",
+ "categoryId": 5,
+ "url": "https://matrix.org/",
+ "companyId": "matrix",
+ "source": "AdGuard"
+ },
"maxbounty": {
"name": "MaxBounty",
"categoryId": 5,
@@ -10863,6 +11241,13 @@
"url": "http://www.mediahub.com/",
"companyId": "mediahub"
},
+ "medialab": {
+ "name": "MediaLab.AI Inc.",
+ "categoryId": 8,
+ "url": "https://medialab.la/",
+ "companyId": "medialab",
+ "source": "AdGuard"
+ },
"medialand": {
"name": "Medialand",
"categoryId": 4,
@@ -10983,6 +11368,13 @@
"url": "http://www.megaindex.ru",
"companyId": "megaindex"
},
+ "meganz": {
+ "name": "Mega Ltd.",
+ "categoryId": 8,
+ "url": "https://mega.io/",
+ "companyId": "meganz",
+ "source": "AdGuard"
+ },
"mein-bmi.com": {
"name": "mein-bmi.com",
"categoryId": 12,
@@ -11427,6 +11819,13 @@
"url": "https://moz.com/",
"companyId": null
},
+ "mozilla": {
+ "name": "Mozilla Foundation",
+ "categoryId": 8,
+ "url": "https://www.mozilla.org/",
+ "companyId": "mozilla",
+ "source": "AdGuard"
+ },
"mozoo": {
"name": "MoZoo",
"categoryId": 4,
@@ -11451,6 +11850,13 @@
"url": "http://mrskincash.com/",
"companyId": "mrskincash.com"
},
+ "msedge": {
+ "name": "Microsoft Edge",
+ "categoryId": 8,
+ "url": "https://www.microsoft.com/en-us/edge",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
"msn": {
"name": "Microsoft Network",
"categoryId": 8,
@@ -11535,6 +11941,13 @@
"url": "http://mytop-in.net/",
"companyId": "mytop-in"
},
+ "nab": {
+ "name": "National Australia Bank",
+ "categoryId": 8,
+ "url": "https://www.nab.com.au/",
+ "companyId": "nab",
+ "source": "AdGuard"
+ },
"nakanohito.jp": {
"name": "Nakanohito",
"categoryId": 4,
@@ -11716,6 +12129,13 @@
"companyId": "netflix",
"source": "AdGuard"
},
+ "netify": {
+ "name": "Netify",
+ "categoryId": 8,
+ "url": "https://www.netify.ai/",
+ "companyId": "netify",
+ "source": "AdGuard"
+ },
"netletix": {
"name": "Netletix",
"categoryId": 4,
@@ -11962,6 +12382,13 @@
"url": "https://notifyfox.com/",
"companyId": "notifyfox"
},
+ "notion": {
+ "name": "Notion",
+ "categoryId": 8,
+ "url": "https://www.notion.so/",
+ "companyId": "notion",
+ "source": "AdGuard"
+ },
"now_interact": {
"name": "Now Interact",
"categoryId": 6,
@@ -12004,6 +12431,13 @@
"url": "http://www.verticalsearchworks.com",
"companyId": "ntent"
},
+ "ntppool": {
+ "name": "Network Time Protocol",
+ "categoryId": 5,
+ "url": "https://ntp.org/",
+ "companyId": "ntppool",
+ "source": "AdGuard"
+ },
"nttcom_online_marketing_solutions": {
"name": "NTTCom Online Marketing Solutions",
"categoryId": 6,
@@ -12370,6 +12804,13 @@
"url": "http://www.oplytic.com",
"companyId": "oplytic"
},
+ "oppo": {
+ "name": "OPPO",
+ "categoryId": 101,
+ "url": "https://www.oppo.com/",
+ "companyId": "oppo",
+ "source": "AdGuard"
+ },
"opta.net": {
"name": "Opta",
"categoryId": 6,
@@ -12586,6 +13027,13 @@
"url": "http://www.outbrain.com/",
"companyId": "outbrain"
},
+ "outlook": {
+ "name": "Microsoft Outlook",
+ "categoryId": 13,
+ "url": "https://outlook.live.com/",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
"overheat.it": {
"name": "overheat",
"categoryId": 6,
@@ -12628,6 +13076,13 @@
"url": "https://oxomi.com/",
"companyId": null
},
+ "oztam": {
+ "name": "OzTAM",
+ "categoryId": 8,
+ "url": "https://oztam.com.au/",
+ "companyId": "oztam",
+ "source": "AdGuard"
+ },
"pageanalytics.space": {
"name": "pageanalytics.space",
"categoryId": 11,
@@ -12778,6 +13233,13 @@
"url": "http://perfectmarket.com/",
"companyId": "perfect_market"
},
+ "perfops": {
+ "name": "PerfOps",
+ "categoryId": 6,
+ "url": "https://perfops.net/",
+ "companyId": "perfops",
+ "source": "AdGuard"
+ },
"perform_group": {
"name": "Perform Group",
"categoryId": 5,
@@ -12988,6 +13450,13 @@
"url": "http://www.pof.com/",
"companyId": "plentyoffish"
},
+ "plex": {
+ "name": "Plex",
+ "categoryId": 0,
+ "url": "https://www.plex.tv/",
+ "companyId": "plex",
+ "source": "AdGuard"
+ },
"plex_metrics": {
"name": "Plex Metrics",
"categoryId": 6,
@@ -13636,6 +14105,20 @@
"url": null,
"companyId": null
},
+ "qualcomm": {
+ "name": "Qualcomm",
+ "categoryId": 8,
+ "url": "https://www.qualcomm.com/",
+ "companyId": "qualcomm",
+ "source": "AdGuard"
+ },
+ "qualcomm_location_service": {
+ "name": "Qualcomm Location Service",
+ "categoryId": 15,
+ "url": "https://www.qualcomm.com/site/privacy/services",
+ "companyId": "qualcomm",
+ "source": "AdGuard"
+ },
"qualia": {
"name": "Qualia",
"categoryId": 4,
@@ -13924,6 +14407,13 @@
"url": "https://www.rebelmouse.com/",
"companyId": "rebelmouse"
},
+ "recaptcha": {
+ "name": "reCAPTCHA",
+ "categoryId": 8,
+ "url": "https://www.google.com/recaptcha/about/",
+ "companyId": "google",
+ "source": "AdGuard"
+ },
"recettes.net": {
"name": "Recettes.net",
"categoryId": 8,
@@ -14578,6 +15068,55 @@
"url": "https://samba.tv/",
"companyId": "samba_tv"
},
+ "samsung": {
+ "name": "Samsung",
+ "categoryId": 8,
+ "url": "https://www.samsung.com/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungads": {
+ "name": "Samsung Ads",
+ "categoryId": 4,
+ "url": "https://www.samsung.com/business/samsungads/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungapps": {
+ "name": "Samsung Apps",
+ "categoryId": 101,
+ "url": "https://www.samsung.com/au/apps/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungmobile": {
+ "name": "Samsung Mobile",
+ "categoryId": 101,
+ "url": "https://www.samsung.com/mobile/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungpush": {
+ "name": "Samsung Push",
+ "categoryId": 8,
+ "url": null,
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungsds": {
+ "name": "Samsung SDS",
+ "categoryId": 10,
+ "url": "https://www.samsungsds.com/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
+ "samsungtv": {
+ "name": "Samsung TV",
+ "categoryId": 15,
+ "url": "https://www.samsung.com/au/tvs/",
+ "companyId": "samsung",
+ "source": "AdGuard"
+ },
"sanoma.fi": {
"name": "Sanoma",
"categoryId": 4,
@@ -14734,6 +15273,13 @@
"url": "http://www.secondmedia.com/",
"companyId": "second_media"
},
+ "sectigo": {
+ "name": "Sectigo Limited",
+ "categoryId": 5,
+ "url": "https://www.solaredge.com/",
+ "companyId": "sectigo",
+ "source": "AdGuard"
+ },
"securedtouch": {
"name": "SecuredTouch",
"categoryId": 6,
@@ -14992,11 +15538,19 @@
"url": "https://www.shopgate.com/",
"companyId": null
},
+ "shopify": {
+ "name": "Shopify Inc.",
+ "categoryId": 2,
+ "url": "https://www.shopify.com/",
+ "companyId": "shopify",
+ "source": "AdGuard"
+ },
"shopify_stats": {
"name": "Shopify Stats",
- "categoryId": 4,
+ "categoryId": 6,
"url": "http://www.shopify.com/",
- "companyId": "shopify"
+ "companyId": "shopify",
+ "source": "AdGuard"
},
"shopifycdn.com": {
"name": "Shopify CDN",
@@ -15052,6 +15606,13 @@
"url": "http://www.shortnews.de/#",
"companyId": null
},
+ "showrss": {
+ "name": "showRSS",
+ "categoryId": 8,
+ "url": "https://showrss.info/",
+ "companyId": "showrss",
+ "source": "AdGuard"
+ },
"shrink": {
"name": "Shrink",
"categoryId": 2,
@@ -15106,6 +15667,13 @@
"url": "http://www.similardeals.net/",
"companyId": null
},
+ "similarweb": {
+ "name": "SimilarWeb",
+ "categoryId": 6,
+ "url": "https://www.similarweb.com/",
+ "companyId": "similarweb",
+ "source": "AdGuard"
+ },
"simplereach": {
"name": "SimpleReach",
"categoryId": 6,
@@ -15274,6 +15842,13 @@
"url": "https://www.skyscanner.net/",
"companyId": null
},
+ "slack": {
+ "name": "Slack",
+ "categoryId": 8,
+ "url": "https://www.slack.com/",
+ "companyId": "salesforce",
+ "source": "AdGuard"
+ },
"slashdot_widget": {
"name": "Slashdot Widget",
"categoryId": 2,
@@ -15598,6 +16173,13 @@
"url": "http://solads.media/",
"companyId": null
},
+ "solaredge": {
+ "name": "SolarEdge Technologies, Inc.",
+ "categoryId": 8,
+ "url": "https://www.solaredge.com/",
+ "companyId": "solaredge",
+ "source": "AdGuard"
+ },
"solidopinion": {
"name": "SolidOpinion",
"categoryId": 2,
@@ -15628,6 +16210,13 @@
"url": "http://sonobi.com/",
"companyId": "sonobi"
},
+ "sonos": {
+ "name": "Sonos",
+ "categoryId": 8,
+ "url": "https://www.sonos.com/",
+ "companyId": "sonos",
+ "source": "AdGuard"
+ },
"sophus3": {
"name": "Sophus3",
"categoryId": 4,
@@ -16042,6 +16631,13 @@
"url": "http://www.streak.com/",
"companyId": "streak"
},
+ "streamotion": {
+ "name": "Streamotion",
+ "categoryId": 0,
+ "url": "https://streamotion.com.au/",
+ "companyId": "foxtel",
+ "source": "AdGuard"
+ },
"streamrail.com": {
"name": "StreamRail",
"categoryId": 4,
@@ -16192,6 +16788,13 @@
"url": "http://www.switchconcepts.co.uk/",
"companyId": "switch_concepts"
},
+ "switchtv": {
+ "name": "Switch Media",
+ "categoryId": 8,
+ "url": "https://www.switch.tv/",
+ "companyId": "switchtv",
+ "source": "AdGuard"
+ },
"swoop": {
"name": "Swoop",
"categoryId": 4,
@@ -16420,6 +17023,13 @@
"url": "http://www.webmetro.com/whoweare/technology.aspx",
"companyId": "teletech"
},
+ "telstra": {
+ "name": "Telstra",
+ "categoryId": 8,
+ "url": "https://www.telstra.com.au/",
+ "companyId": "telstra",
+ "source": "AdGuard"
+ },
"tender": {
"name": "Tender",
"categoryId": 2,
@@ -17230,6 +17840,13 @@
"url": "https://www.ubersetzung-app.com/",
"companyId": null
},
+ "ubuntu": {
+ "name": "Ubuntu",
+ "categoryId": 8,
+ "url": "https://ubuntu.com/",
+ "companyId": "ubuntu",
+ "source": "AdGuard"
+ },
"ucfunnel": {
"name": "ucfunnel",
"categoryId": 4,
@@ -17332,6 +17949,20 @@
"url": "https://www.united-internet.de/",
"companyId": "united_internet"
},
+ "unity": {
+ "name": "Unity",
+ "categoryId": 8,
+ "url": "https://unity.com/",
+ "companyId": "unity",
+ "source": "AdGuard"
+ },
+ "unity_ads": {
+ "name": "Unity Ads",
+ "categoryId": 4,
+ "url": "https://unity.com/products/unity-ads",
+ "companyId": "unity",
+ "source": "AdGuard"
+ },
"univide": {
"name": "Univide",
"categoryId": 4,
@@ -18073,6 +18704,13 @@
"url": "http://vpscash.nl/home",
"companyId": "vps_cash"
},
+ "vscode": {
+ "name": "Visual Studio Code",
+ "categoryId": 8,
+ "url": "https://code.visualstudio.com/",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
"vtracy.de": {
"name": "vtracy.de",
"categoryId": 11,
@@ -18379,6 +19017,13 @@
"url": "https://www.whatsbroadcast.com/",
"companyId": "whatsbroadcast"
},
+ "whatsapp": {
+ "name": "WhatsApp",
+ "categoryId": 8,
+ "url": "https://www.whatsapp.com/",
+ "companyId": "meta",
+ "source": "AdGuard"
+ },
"whos.amung.us": {
"name": "Whos.amung.us",
"categoryId": 6,
@@ -18469,6 +19114,34 @@
"url": "http://www.winaffiliates.com/",
"companyId": "winaffiliates"
},
+ "windows_maps": {
+ "name": "Windows Maps",
+ "categoryId": 8,
+ "url": "https://www.microsoft.com/store/apps/9wzdncrdtbvb",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
+ "windows_notifications": {
+ "name": "The Windows Push Notification Services",
+ "categoryId": 8,
+ "url": "https://learn.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/windows-push-notification-services--wns--overview",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
+ "windows_time": {
+ "name": "Windows Time Service",
+ "categoryId": 8,
+ "url": "https://learn.microsoft.com/en-us/windows-server/networking/windows-time-service/how-the-windows-time-service-works",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
+ "windowsupdate": {
+ "name": "Windows Update",
+ "categoryId": 9,
+ "url": "https://support.microsoft.com/en-us/windows/windows-update-faq-8a903416-6f45-0718-f5c7-375e92dddeb2",
+ "companyId": "microsoft",
+ "source": "AdGuard"
+ },
"wipmania": {
"name": "WIPmania",
"categoryId": 6,
@@ -18799,6 +19472,13 @@
"url": "https://sovetnik.yandex.ru/",
"companyId": "yandex"
},
+ "yandex_appmetrica": {
+ "name": "Yandex AppMetrica",
+ "categoryId": 101,
+ "url": "https://appmetrica.yandex.com/",
+ "companyId": "yandex",
+ "source": "AdGuard"
+ },
"yandex_direct": {
"name": "Yandex.Direct",
"categoryId": 6,
@@ -19224,503 +19904,6 @@
"categoryId": 4,
"url": "http://www.zypmedia.com/",
"companyId": "zypmedia"
- },
- "abc": {
- "name": "Australian Broadcasting Corporation",
- "categoryId": 8,
- "url": "https://www.abc.net.au/",
- "companyId": "abc",
- "source": "AdGuard"
- },
- "adguard_dns": {
- "name": "AdGuard DNS",
- "categoryId": 8,
- "url": "https://adguard-dns.io/",
- "companyId": "adguard",
- "source": "AdGuard"
- },
- "adguard_vpn": {
- "name": "AdGuard VPN",
- "categoryId": 8,
- "url": "https://adguard-vpn.com/",
- "companyId": "adguard",
- "source": "AdGuard"
- },
- "appcenter": {
- "name": "Microsoft App Center",
- "categoryId": 5,
- "url": "https://appcenter.ms/",
- "companyId": null,
- "source": "AdGuard"
- },
- "alibaba_cloud": {
- "name": "Alibaba Cloud",
- "categoryId": 10,
- "url": "https://www.alibabacloud.com/",
- "companyId": "alibaba",
- "source": "AdGuard"
- },
- "alibaba_ucbrowser": {
- "name": "UC Browser",
- "categoryId": 8,
- "url": "https://ucweb.com/",
- "companyId": "alibaba",
- "source": "AdGuard"
- },
- "apple": {
- "name": "Apple",
- "categoryId": 8,
- "url": "https://www.apple.com/",
- "companyId": "apple",
- "source": "AdGuard"
- },
- "apple_ads": {
- "name": "Apple Search Ads",
- "categoryId": 4,
- "url": "https://searchads.apple.com/",
- "companyId": "apple",
- "source": "AdGuard"
- },
- "azure": {
- "name": "Microsoft Azure",
- "categoryId": 10,
- "url": "https://azure.microsoft.com/",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "azure_blob_storage": {
- "name": "Azure Blob Storage",
- "categoryId": 8,
- "url": "https://azure.microsoft.com/en-us/products/storage/blobs",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "bitwarden": {
- "name": "Bitwarden",
- "categoryId": 8,
- "url": "https://bitwarden.com/",
- "companyId": "bitwarden",
- "source": "AdGuard"
- },
- "branch": {
- "name": "Branch.io",
- "categoryId": 101,
- "url": "https://branch.io/",
- "companyId": "branch_metrics_inc",
- "source": "AdGuard"
- },
- "button": {
- "name": "Button",
- "categoryId": 4,
- "url": "https://www.usebutton.com/",
- "companyId": null,
- "source": "AdGuard"
- },
- "crashlytics": {
- "name": "Crashlytics",
- "categoryId": 101,
- "url": "https://crashlytics.com/",
- "companyId": null,
- "source": "AdGuard"
- },
- "domainglass": {
- "name": "Domain Glass",
- "categoryId": 8,
- "url": "https://domain.glass/",
- "companyId": "domainglass",
- "source": "AdGuard"
- },
- "edgio": {
- "name": "Edgio",
- "categoryId": 9,
- "url": "https://edg.io/",
- "companyId": "edgio",
- "source": "AdGuard"
- },
- "element": {
- "name": "Element",
- "categoryId": 7,
- "url": "https://element.io/",
- "companyId": "element",
- "source": "AdGuard"
- },
- "facebook_audience": {
- "name": "Facebook Audience Network",
- "categoryId": 4,
- "url": "https://www.facebook.com/business/products/audience-network",
- "companyId": "meta",
- "source": "AdGuard"
- },
- "firebase": {
- "name": "Firebase",
- "categoryId": 101,
- "url": "https://firebase.google.com/",
- "companyId": "google",
- "source": "AdGuard"
- },
- "freeview": {
- "name": "Freeview",
- "categoryId": 0,
- "url": "https://freeview.com.au/",
- "companyId": "freeview",
- "source": "AdGuard"
- },
- "gmail": {
- "name": "Gmail",
- "categoryId": 13,
- "url": "https://mail.google.com/",
- "companyId": "google",
- "source": "AdGuard"
- },
- "google_trust_services": {
- "name": "Google Trust Services",
- "categoryId": 5,
- "url": "https://pki.goog/",
- "companyId": "google",
- "source": "AdGuard"
- },
- "iqiyi": {
- "name": "iQiyi",
- "categoryId": 0,
- "url": "https://www.iqiyi.com/",
- "companyId": "iqiyi",
- "source": "AdGuard"
- },
- "hockeyapp": {
- "name": "HockeyApp",
- "categoryId": 101,
- "url": "https://hockeyapp.net/",
- "companyId": null,
- "source": "AdGuard"
- },
- "karambasecurity": {
- "name": "Karamba Security",
- "categoryId": 8,
- "url": "https://karambasecurity.com/",
- "companyId": "karambasecurity",
- "source": "AdGuard"
- },
- "kik": {
- "name": "Kik",
- "categoryId": 7,
- "url": "https://kik.com/",
- "companyId": "kik",
- "source": "AdGuard"
- },
- "lets_encrypt": {
- "name": "Let's Encrypt",
- "categoryId": 5,
- "url": "https://letsencrypt.org/",
- "companyId": "lets_encrypt",
- "source": "AdGuard"
- },
- "lgads": {
- "name": "LG Ad Solutions",
- "categoryId": 4,
- "url": "https://lgads.tv/",
- "companyId": "lgcorp",
- "source": "AdGuard"
- },
- "lgtv": {
- "name": "LG TV",
- "categoryId": 8,
- "url": "https://www.lg.com/",
- "companyId": "lgcorp",
- "source": "AdGuard"
- },
- "matrix": {
- "name": "Matrix",
- "categoryId": 5,
- "url": "https://matrix.org/",
- "companyId": "matrix",
- "source": "AdGuard"
- },
- "medialab": {
- "name": "MediaLab.AI Inc.",
- "categoryId": 8,
- "url": "https://medialab.la/",
- "companyId": "medialab",
- "source": "AdGuard"
- },
- "meganz": {
- "name": "Mega Ltd.",
- "categoryId": 8,
- "url": "https://mega.io/",
- "companyId": "meganz",
- "source": "AdGuard"
- },
- "msedge": {
- "name": "Microsoft Edge",
- "categoryId": 8,
- "url": "https://www.microsoft.com/en-us/edge",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "mozilla": {
- "name": "Mozilla Foundation",
- "categoryId": 8,
- "url": "https://www.mozilla.org/",
- "companyId": "mozilla",
- "source": "AdGuard"
- },
- "nab": {
- "name": "National Australia Bank",
- "categoryId": 8,
- "url": "https://www.nab.com.au/",
- "companyId": "nab",
- "source": "AdGuard"
- },
- "netify": {
- "name": "Netify",
- "categoryId": 8,
- "url": "https://www.netify.ai/",
- "companyId": "netify",
- "source": "AdGuard"
- },
- "notion": {
- "name": "Notion",
- "categoryId": 8,
- "url": "https://www.notion.so/",
- "companyId": "notion",
- "source": "AdGuard"
- },
- "ntppool": {
- "name": "Network Time Protocol",
- "categoryId": 5,
- "url": "https://ntp.org/",
- "companyId": "ntppool",
- "source": "AdGuard"
- },
- "oppo": {
- "name": "OPPO",
- "categoryId": 101,
- "url": "https://www.oppo.com/",
- "companyId": "oppo",
- "source": "AdGuard"
- },
- "outlook": {
- "name": "Microsoft Outlook",
- "categoryId": 13,
- "url": "https://outlook.live.com/",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "oztam": {
- "name": "OzTAM",
- "categoryId": 8,
- "url": "https://oztam.com.au/",
- "companyId": "oztam",
- "source": "AdGuard"
- },
- "plex": {
- "name": "Plex",
- "categoryId": 0,
- "url": "https://www.plex.tv/",
- "companyId": "plex",
- "source": "AdGuard"
- },
- "qualcomm": {
- "name": "Qualcomm",
- "categoryId": 8,
- "url": "https://www.qualcomm.com/",
- "companyId": "qualcomm",
- "source": "AdGuard"
- },
- "qualcomm_location_service": {
- "name": "Qualcomm Location Service",
- "categoryId": 15,
- "url": "https://www.qualcomm.com/site/privacy/services",
- "companyId": "qualcomm",
- "source": "AdGuard"
- },
- "recaptcha": {
- "name": "reCAPTCHA",
- "categoryId": 8,
- "url": "https://www.google.com/recaptcha/about/",
- "companyId": "google",
- "source": "AdGuard"
- },
- "samsung": {
- "name": "Samsung",
- "categoryId": 8,
- "url": "https://www.samsung.com/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungads": {
- "name": "Samsung Ads",
- "categoryId": 4,
- "url": "https://www.samsung.com/business/samsungads/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungapps": {
- "name": "Samsung Apps",
- "categoryId": 101,
- "url": "https://www.samsung.com/au/apps/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungmobile": {
- "name": "Samsung Mobile",
- "categoryId": 101,
- "url": "https://www.samsung.com/mobile/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungpush": {
- "name": "Samsung Push",
- "categoryId": 8,
- "url": null,
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungsds": {
- "name": "Samsung SDS",
- "categoryId": 10,
- "url": "https://www.samsungsds.com/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "samsungtv": {
- "name": "Samsung TV",
- "categoryId": 15,
- "url": "https://www.samsung.com/au/tvs/",
- "companyId": "samsung",
- "source": "AdGuard"
- },
- "sectigo": {
- "name": "Sectigo Limited",
- "categoryId": 5,
- "url": "https://www.solaredge.com/",
- "companyId": "sectigo",
- "source": "AdGuard"
- },
- "showrss": {
- "name": "showRSS",
- "categoryId": 8,
- "url": "https://showrss.info/",
- "companyId": "showrss",
- "source": "AdGuard"
- },
- "similarweb": {
- "name": "SimilarWeb",
- "categoryId": 6,
- "url": "https://www.similarweb.com/",
- "companyId": "similarweb",
- "source": "AdGuard"
- },
- "slack": {
- "name": "Slack",
- "categoryId": 8,
- "url": "https://www.slack.com/",
- "companyId": "salesforce",
- "source": "AdGuard"
- },
- "solaredge": {
- "name": "SolarEdge Technologies, Inc.",
- "categoryId": 8,
- "url": "https://www.solaredge.com/",
- "companyId": "solaredge",
- "source": "AdGuard"
- },
- "sonos": {
- "name": "Sonos",
- "categoryId": 8,
- "url": "https://www.sonos.com/",
- "companyId": "sonos",
- "source": "AdGuard"
- },
- "switchtv": {
- "name": "Switch Media",
- "categoryId": 8,
- "url": "https://www.switch.tv/",
- "companyId": "switchtv",
- "source": "AdGuard"
- },
- "telstra": {
- "name": "Telstra",
- "categoryId": 8,
- "url": "https://www.telstra.com.au/",
- "companyId": "telstra",
- "source": "AdGuard"
- },
- "ubuntu": {
- "name": "Ubuntu",
- "categoryId": 8,
- "url": "https://ubuntu.com/",
- "companyId": "ubuntu",
- "source": "AdGuard"
- },
- "unity_ads": {
- "name": "Unity Ads",
- "categoryId": 4,
- "url": "https://unity.com/solutions/mobile-business/monetize-your-game",
- "companyId": null,
- "source": "AdGuard"
- },
- "vscode": {
- "name": "Visual Studio Code",
- "categoryId": 8,
- "url": "https://code.visualstudio.com/",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "whatsapp": {
- "name": "WhatsApp",
- "categoryId": 8,
- "url": "https://www.whatsapp.com/",
- "companyId": "meta",
- "source": "AdGuard"
- },
- "windows_maps": {
- "name": "Windows Maps",
- "categoryId": 8,
- "url": "https://www.microsoft.com/store/apps/9wzdncrdtbvb",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "windows_notifications": {
- "name": "The Windows Push Notification Services",
- "categoryId": 8,
- "url": "https://learn.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/windows-push-notification-services--wns--overview",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "windows_time": {
- "name": "Windows Time Service",
- "categoryId": 8,
- "url": "https://learn.microsoft.com/en-us/windows-server/networking/windows-time-service/how-the-windows-time-service-works",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "windowsupdate": {
- "name": "Windows Update",
- "categoryId": 9,
- "url": "https://support.microsoft.com/en-us/windows/windows-update-faq-8a903416-6f45-0718-f5c7-375e92dddeb2",
- "companyId": "microsoft",
- "source": "AdGuard"
- },
- "yandex_appmetrica": {
- "name": "Yandex AppMetrica",
- "categoryId": 101,
- "url": "https://appmetrica.yandex.com/",
- "companyId": "yandex",
- "source": "AdGuard"
- },
- "3gpp": {
- "name": "3GPP Network",
- "categoryId": 5,
- "url": "https://www.3gpp.org/",
- "companyId": "3gpp",
- "source": "AdGuard"
- },
- "7plus": {
- "name": "7plus",
- "categoryId": 0,
- "url": "https://7plus.com.au/",
- "companyId": "7plus",
- "source": "AdGuard"
}
},
"trackerDomains": {
@@ -19746,6 +19929,8 @@
"2leep.com": "2leep",
"33across.com": "33across",
"3dstats.com": "3dstats",
+ "3gppnetwork.org": "3gpp",
+ "3gpp.org": "3gpp",
"4cdn.org": "4chan",
"4finance.com": "4finance_com",
"4wnet.com": "4w_marketplace",
@@ -19755,6 +19940,7 @@
"d1lm7kd3bd3yo9.cloudfront.net": "6sense",
"grepdata.com": "6sense",
"77tracking.com": "77tracking",
+ "swm.digital": "7plus",
"7tv.de": "7tv.de",
"888media.net": "888media",
"hit.8digits.com": "8digits",
@@ -19765,6 +19951,16 @@
"aaxads.com": "aaxads.com",
"abtasty.com": "ab_tasty",
"d1447tq2m68ekg.cloudfront.net": "ab_tasty",
+ "abc.net.au": "abc",
+ "ab.co": "abc",
+ "abc-cdn.net.au": "abc",
+ "abc-host.net": "abc",
+ "abc-host.net.au": "abc",
+ "abc-prod.net.au": "abc",
+ "abc-stage.net.au": "abc",
+ "abc-test.net.au": "abc",
+ "abcaustralia.net.au": "abc",
+ "abcradio.net.au": "abc",
"ablida.de": "ablida",
"ablida.net": "ablida",
"durasite.net": "accelia",
@@ -19913,8 +20109,6 @@
"adfreestyle.pl": "adfreestyle",
"adfront.org": "adfront",
"adfrontiers.com": "adfrontiers",
- "adgear.com": "samsungads",
- "adgrx.com": "samsungads",
"adgebra.co.in": "adgebra",
"adgenie.co.uk": "adgenie",
"ad.adgile.com": "adgile",
@@ -19926,6 +20120,16 @@
"adgorithms.com": "adgorithms",
"adgoto.com": "adgoto",
"adguard.com": "adguard",
+ "adtidy.org": "adguard",
+ "agrd.io": "adguard",
+ "adguard.app": "adguard",
+ "adguard.io": "adguard",
+ "adguard.org": "adguard",
+ "adguard-dns.com": "adguard_dns",
+ "adguard-dns.io": "adguard_dns",
+ "adguardvpn.com": "adguard_vpn",
+ "adguard-vpn.com": "adguard_vpn",
+ "adguard-vpn.online": "adguard_vpn",
"adhands.ru": "adhands",
"adhese.be": "adhese",
"adhese.com": "adhese",
@@ -19941,6 +20145,11 @@
"cdn.adjs.net": "adjs",
"adjug.com": "adjug",
"adjust.com": "adjust",
+ "adjust.net.in": "adjust",
+ "adj.st": "adjust",
+ "adjust.io": "adjust",
+ "adjust.world": "adjust",
+ "apptrace.com": "adjust",
"adk2.com": "adk2",
"cdn.adsrvmedia.com": "adk2",
"cdn.cdnrl.com": "adk2",
@@ -20232,6 +20441,9 @@
"edgekey.net": "akamai_technologies",
"edgesuite.net": "akamai_technologies",
"imiclk.com": "akamai_technologies",
+ "akadns.net": "akamai_technologies",
+ "akamaiedge.net": "akamai_technologies",
+ "akaquill.net": "akamai_technologies",
"akamoihd.net": "akamoihd.net",
"adn-d.sp.gmossp-sp.jp": "akane",
"akanoo.com": "akanoo",
@@ -20250,7 +20462,18 @@
"algovid.com": "algovid.com",
"alibaba.com": "alibaba.com",
"alicdn.com": "alibaba.com",
+ "aliapp.org": "alibaba.com",
+ "alibabachengdun.com": "alibaba.com",
+ "alibabausercontent.com": "alibaba.com",
+ "aliexpress.com": "alibaba.com",
+ "alikunlun.com": "alibaba.com",
+ "aliyuncs.com": "alibaba.com",
+ "alibabacloud.com": "alibaba_cloud",
+ "alibabadns.com": "alibaba_cloud",
+ "aliyun.com": "alibaba_cloud",
+ "ucweb.com": "alibaba_ucbrowser",
"alipay.com": "alipay.com",
+ "alipayobjects.com": "alipay.com",
"websitealive.com": "alivechat",
"allegroimg.com": "allegro.pl",
"allegrostatic.com": "allegro.pl",
@@ -20274,6 +20497,17 @@
"amazon.fr": "amazon",
"amazon.it": "amazon",
"d3io1k5o0zdpqr.cloudfront.net": "amazon",
+ "amazoncrl.com": "amazon",
+ "aamazoncognito.com": "amazon",
+ "amazonbrowserapp.es": "amazon",
+ "amazonbrowserapp.co.uk": "amazon",
+ "amazon.sa": "amazon",
+ "amazon.nl": "amazon",
+ "amazon.in": "amazon",
+ "amazon.com.mx": "amazon",
+ "amazon.com.au": "amazon",
+ "amazon-corp.com": "amazon",
+ "a2z.com": "amazon",
"amazon-adsystem.com": "amazon_adsystem",
"serving-sys.com": "amazon_adsystem",
"sizmek.com": "amazon_adsystem",
@@ -20286,11 +20520,15 @@
"images-amazon.com": "amazon_cdn",
"media-amazon.com": "amazon_cdn",
"ssl-images-amazon.com": "amazon_cdn",
+ "amazontrust.com": "amazon_cdn",
+ "associates-amazon.com": "amazon_cdn",
"cloudfront.net": "amazon_cloudfront",
"axx-eu.amazon-adsystem.com": "amazon_mobile_ads",
"amazonpay.com": "amazon_payments",
"payments-amazon.com": "amazon_payments",
+ "amazonpay.in": "amazon_payments",
"aiv-cdn.net": "amazon_video",
+ "amazonvideo.com": "amazon_video",
"amazonaws.com": "amazon_web_services",
"amazonwebservices.com": "amazon_web_services",
"awsstatic.com": "amazon_web_services",
@@ -20327,13 +20565,34 @@
"apester.com": "apester",
"apicit.net": "apicit.net",
"carrierzone.com": "aplus_analytics",
+ "appcenter.ms": "appcenter",
"appcues.com": "appcues",
"appdynamics.com": "appdynamics",
"de8of677fyt0b.cloudfront.net": "appdynamics",
"eum-appdynamics.com": "appdynamics",
"jscdn.appier.net": "appier",
+ "apple.com": "apple",
+ "me.com": "apple",
+ "apple.news": "apple",
+ "apple-dns.net": "apple",
+ "aaplimg.com": "apple",
+ "icloud.com": "apple",
+ "itunes.com": "apple",
+ "icloud-content.com": "apple",
+ "mzstatic.com": "apple",
+ "cdn-apple.com": "apple",
+ "apple-mapkit.com": "apple",
+ "icons.axm-usercontent-apple.com": "apple",
+ "apple-cloudkit.com": "apple",
+ "apzones.com": "apple",
+ "apple-livephotoskit.com": "apple",
+ "safebrowsing.apple": "apple",
+ "safebrowsing.g.applimg.com": "apple",
+ "iadsdk.apple.com": "apple_ads",
"applifier.com": "applifier",
"assets.applovin.com": "applovin",
+ "applvn.com": "applovin",
+ "applovin.com": "applovin",
"appmetrx.com": "appmetrx",
"adnxs.com": "appnexus",
"adnxs.net": "appnexus",
@@ -20370,6 +20629,9 @@
"atlassian.com": "atlassian.net",
"atlassian.net": "atlassian.net",
"d12ramskps3070.cloudfront.net": "atlassian.net",
+ "bitbucket.org": "atlassian.net",
+ "jira.com": "atlassian.net",
+ "ss-inf.net": "atlassian.net",
"d1xfq2052q7thw.cloudfront.net": "atlassian_marketplace",
"marketplace.atlassian.com": "atlassian_marketplace",
"atomz.com": "atomz_search",
@@ -20411,6 +20673,9 @@
"perfb.com": "awin",
"ad.globe7.com": "axill",
"azadify.com": "azadify",
+ "azure.com": "azure",
+ "trafficmanager.net": "azure",
+ "blob.core.windows.net": "azure_blob_storage",
"azureedge.net": "azureedge.net",
"b2bcontext.ru": "b2bcontext",
"b2bvideo.ru": "b2bvideo",
@@ -20487,6 +20752,7 @@
"bing.com": "bing_ads",
"bing.net": "bing_ads",
"virtualearth.net": "bing_maps",
+ "binge.com.au": "binge",
"view.binlayer.com": "binlayer",
"widgets.binotel.com": "binotel",
"esendra.fi": "bisnode",
@@ -20497,6 +20763,7 @@
"bitrix.ru": "bitrix",
"bitrix24.com": "bitrix",
"bitrix24.com.br": "bitrix",
+ "bitwarden.com": "bitwarden",
"traffic.adxprts.com": "bizcn",
"jssr.jd.com": "blackdragon",
"blau.de": "blau.de",
@@ -20561,6 +20828,7 @@
"brainient.com": "brainient",
"brainsins.com": "brainsins",
"d2xkqxdy6ewr93.cloudfront.net": "brainsins",
+ "mobileapptracking.com": "branch",
"app.link": "branch_metrics",
"branch.io": "branch_metrics",
"brandaffinity.net": "brand_affinity",
@@ -20607,6 +20875,7 @@
"rich-agent.s3.amazonaws.com": "burt",
"richmetrics.com": "burt",
"stats.businessol.com": "businessonline_analytics",
+ "bttn.io": "button",
"buysellads.com": "buysellads",
"servedby-buysellads.com": "buysellads",
"buzzadexchange.com": "buzzadexchange.com",
@@ -20780,6 +21049,22 @@
"cloud-media.fr": "cloud-media.fr",
"cloudflare.com": "cloudflare",
"cloudflare.net": "cloudflare",
+ "cloudflare-dns.com": "cloudflare",
+ "cloudflare-dm-cmpimg.com": "cloudflare",
+ "cloudflare-ipfs.com": "cloudflare",
+ "cloudflare-quic.com": "cloudflare",
+ "cloudflare-terms-of-service-abuse.com": "cloudflare",
+ "cloudflare.tv": "cloudflare",
+ "cloudflareaccess.com": "cloudflare",
+ "cloudflareclient.com": "cloudflare",
+ "cloudflareinsights.com": "cloudflare",
+ "cloudflareok.com": "cloudflare",
+ "cloudflareportal.com": "cloudflare",
+ "cloudflareresolve.com": "cloudflare",
+ "cloudflaressl.com": "cloudflare",
+ "cloudflarestatus.com": "cloudflare",
+ "pacloudflare.com": "cloudflare",
+ "sn-cloudflare.com": "cloudflare",
"cloudimg.io": "cloudimage.io",
"cloudinary.com": "cloudinary",
"clovenetwork.com": "clove_network",
@@ -20903,6 +21188,7 @@
"ads.crakmedia.com": "crakmedia_network",
"craktraffic.com": "crakmedia_network",
"crankyads.com": "crankyads",
+ "crashlytics.com": "crashlytics",
"cetrk.com": "crazy_egg",
"crazyegg.com": "crazy_egg",
"dnn506yrbagrg.cloudfront.net": "crazy_egg",
@@ -21022,6 +21308,7 @@
"privacy-center.org": "didomi",
"digg.com": "digg_widget",
"digicert.com": "digicert_trust_seal",
+ "phicdn.net": "digicert_trust_seal",
"digidip.net": "digidip",
"digiglitzmarketing.go2cloud.org": "digiglitz",
"wtp101.com": "digilant",
@@ -21065,6 +21352,7 @@
"awecr.com": "docler",
"fwbntw.com": "docler",
"s.dogannet.tv": "dogannet",
+ "domain.glass": "domainglass",
"www.domodomain.com": "domodomain",
"donation-tools.org": "donationtools",
"doofinder.com": "doofinder.com",
@@ -21079,6 +21367,7 @@
"2mdn.net": "doubleclick",
"doubleclick.net": "doubleclick",
"invitemedia.com": "doubleclick",
+ "doubleclick.com": "doubleclick",
"doublepimp.com": "doublepimp",
"doublepimpssl.com": "doublepimp",
"redcourtside.com": "doublepimp",
@@ -21143,6 +21432,12 @@
"eclick.vn": "eclick",
"econda-monitor.de": "econda",
"eco-tag.jp": "ecotag",
+ "alphacdn.net": "edgio",
+ "edg.io": "edgio",
+ "edgecast.com": "edgio",
+ "edgecastcdn.net": "edgio",
+ "edgecastdns.net": "edgio",
+ "sigmacdn.net": "edgio",
"ecustomeropinions.com": "edigitalresearch",
"effectivemeasure.net": "effective_measure",
"effiliation.com": "effiliation",
@@ -21153,6 +21448,8 @@
"ekomi.de": "ekomi",
"elasticad.net": "elastic_ad",
"elasticbeanstalk.com": "elastic_beanstalk",
+ "element.io": "element",
+ "riot.im": "element",
"elicitapp.com": "elicit",
"eloqua.com": "eloqua",
"en25.com": "eloqua",
@@ -21259,9 +21556,9 @@
"f11-ads.com": "f11-ads.com",
"facebook.com": "facebook",
"facebook.net": "facebook",
+ "graph.facebook.com": "facebook_audience",
"fbcdn.net": "facebook_cdn",
"fbsbx.com": "facebook_cdn",
- "graph.facebook.com": "facebook_audience",
"facetz.net": "facetz.dca",
"adsfac.eu": "facilitate_digital",
"adsfac.net": "facilitate_digital",
@@ -21293,12 +21590,29 @@
"tracker.financialcontent.com": "financial_content",
"findizer.fr": "findizer.fr",
"findologic.com": "findologic.com",
+ "app-measurement.com": "firebase",
+ "fcm.googleapis.com": "firebase",
+ "firebaseappcheck.googleapis.com": "firebase",
+ "firebaseapp.com": "firebase",
+ "firebase.com": "firebase",
+ "firebasedynamiclinks.googleapis.com": "firebase",
+ "firebasedynamiclinks-ipv4.googleapis.com": "firebase",
+ "firebasedynamiclinks-ipv6.googleapis.com": "firebase",
+ "firebase.googleapis.com": "firebase",
+ "firebase.google.com": "firebase",
+ "firebaseinappmessaging.googleapis.com": "firebase",
+ "firebaseinstallations.googleapis.com": "firebase",
+ "firebaselogging.googleapis.com": "firebase",
+ "firebaselogging-pa.googleapis.com": "firebase",
+ "firebaseperusertopics-pa.googleapis.com": "firebase",
+ "firebaseremoteconfig.googleapis.com": "firebase",
"firebaseio.com": "firebaseio.com",
"firstimpression.io": "first_impression",
"fitanalytics.com": "fit_analytics",
"fivetran.com": "fivetran",
"flagads.net": "flag_ads",
"flagcounter.com": "flag_counter",
+ "flashnews.com.au": "flash",
"flashtalking.com": "flashtalking",
"flattr.com": "flattr_button",
"flexlinks.com": "flexoffers",
@@ -21306,6 +21620,7 @@
"flickr.com": "flickr_badge",
"staticflickr.com": "flickr_badge",
"lflipboard.com": "flipboard",
+ "flipboard.com": "flipboard",
"flite.com": "flite",
"flixcdn.com": "flixcdn.com",
"flix360.com": "flixmedia",
@@ -21319,6 +21634,7 @@
"fluidsurveys.com": "fluidsurveys",
"cdn.flurry.com": "flurry",
"data.flurry.com": "flurry",
+ "flurry.com": "flurry",
"flx1.com": "flxone",
"flxpxl.com": "flxone",
"api.flyertown.ca": "flyertown",
@@ -21342,9 +21658,11 @@
"platform.foursquare.com": "foursquare_widget",
"fout.jp": "fout.jp",
"fimserve.com": "fox_audience_network",
+ "foxsports.com.au": "fox_sports",
"fncstatic.com": "foxnews_static",
"cdn.foxpush.net": "foxpush",
"foxpush.com": "foxpush",
+ "foxtel.com.au": "foxtel",
"foxydeal.com": "foxydeal_com",
"yabidos.com": "fraudlogix",
"besucherstatistiken.com": "free_counter",
@@ -21363,6 +21681,9 @@
"freegeoip.net": "freegeoip_net",
"freenet.de": "freenet_de",
"freent.de": "freenet_de",
+ "freeviewaustralia.tv": "freeview",
+ "freeview.com.au": "freeview",
+ "freeview.com": "freeview",
"fwmrm.net": "freewheel",
"heimdall.fresh8.co": "fresh8",
"d36mpcpuzc4ztk.cloudfront.net": "freshdesk",
@@ -21436,6 +21757,8 @@
"github.com": "github",
"githubassets.com": "github",
"githubusercontent.com": "github",
+ "ghcr.io": "github",
+ "github.dev": "github",
"githubapp.com": "github_apps",
"github.io": "github_pages",
"aff3.gittigidiyor.com": "gittigidiyor_affiliate_program",
@@ -21450,6 +21773,7 @@
"glomex.com": "glomex.com",
"glotgrx.com": "glotgrx.com",
"a.gmdelivery.com": "gm_delivery",
+ "gmail.com": "gmail",
"ad.atown.jp": "gmo",
"gmx.net": "gmx_net",
"gmxpro.net": "gmx_net",
@@ -21499,23 +21823,315 @@
"google.ru": "google",
"google.se": "google",
"google.tn": "google",
+ "1e100.net": "google",
+ "agnss.goog": "google",
+ "channel.status.request.url": "google",
+ "g.cn": "google",
+ "g.co": "google",
+ "google.ad": "google",
+ "google.ae": "google",
+ "google.al": "google",
+ "google.am": "google",
+ "googleapis.cn": "google",
+ "google.as": "google",
+ "google.az": "google",
+ "google.ba": "google",
+ "google.bf": "google",
+ "google.bg": "google",
+ "google.bi": "google",
+ "google.bj": "google",
+ "google.bs": "google",
+ "google.bt": "google",
+ "google.by": "google",
+ "google.cat": "google",
+ "google.cd": "google",
+ "google.cf": "google",
+ "google.cg": "google",
+ "google.ci": "google",
+ "google.cl": "google",
+ "google.cm": "google",
+ "google.cn": "google",
+ "google.co.ao": "google",
+ "google.co.bw": "google",
+ "google.co.ck": "google",
+ "google.co.cr": "google",
+ "googlecode.com": "google",
+ "google.co.il": "google",
+ "google.co.ke": "google",
+ "google.co.kr": "google",
+ "google.co.ls": "google",
+ "google.com.af": "google",
+ "google.com.ag": "google",
+ "google.com.ai": "google",
+ "google.com.bd": "google",
+ "google.com.bh": "google",
+ "google.com.bn": "google",
+ "google.com.bo": "google",
+ "google.com.bz": "google",
+ "google.com.co": "google",
+ "google.com.cu": "google",
+ "google.com.cy": "google",
+ "google.com.ec": "google",
+ "google.com.eg": "google",
+ "google.com.et": "google",
+ "google.com.fj": "google",
+ "google.com.gh": "google",
+ "google.com.gi": "google",
+ "google.com.gt": "google",
+ "google.com.hk": "google",
+ "google.com.jm": "google",
+ "google.com.kh": "google",
+ "google.com.kw": "google",
+ "google.com.lb": "google",
+ "google.com.my": "google",
+ "google.com.na": "google",
+ "google.com.nf": "google",
+ "google.com.ng": "google",
+ "google.com.ni": "google",
+ "google.com.np": "google",
+ "google.com.om": "google",
+ "google.com.pa": "google",
+ "google.com.pe": "google",
+ "google.com.pg": "google",
+ "google.com.ph": "google",
+ "google.com.pk": "google",
+ "google.com.pr": "google",
+ "google.com.py": "google",
+ "google.com.qa": "google",
+ "google.com.sa": "google",
+ "google.com.sb": "google",
+ "google.com.sg": "google",
+ "google.com.sl": "google",
+ "google.com.sv": "google",
+ "google.com.tj": "google",
+ "google.com.uy": "google",
+ "google.com.vc": "google",
+ "google.com.vn": "google",
+ "google.co.mz": "google",
+ "google.co.nz": "google",
+ "google.co.tz": "google",
+ "google.co.ug": "google",
+ "google.co.uz": "google",
+ "google.co.ve": "google",
+ "google.co.vi": "google",
+ "google.co.za": "google",
+ "google.co.zm": "google",
+ "google.co.zw": "google",
+ "google.cv": "google",
+ "google.dj": "google",
+ "google.dm": "google",
+ "googledownloads.cn": "google",
+ "google.ee": "google",
+ "google.fm": "google",
+ "google.ga": "google",
+ "google.ge": "google",
+ "google.gg": "google",
+ "google.gl": "google",
+ "google.gm": "google",
+ "google.gp": "google",
+ "google.gy": "google",
+ "google.hn": "google",
+ "google.hr": "google",
+ "google.ht": "google",
+ "google.im": "google",
+ "google.in": "google",
+ "google.iq": "google",
+ "google.is": "google",
+ "google.je": "google",
+ "google.jo": "google",
+ "google.kg": "google",
+ "google.ki": "google",
+ "google.kz": "google",
+ "google.la": "google",
+ "google.li": "google",
+ "google.lk": "google",
+ "google.lt": "google",
+ "google.lu": "google",
+ "google.lv": "google",
+ "google.md": "google",
+ "google.me": "google",
+ "google.mg": "google",
+ "google.mk": "google",
+ "google.ml": "google",
+ "google.mn": "google",
+ "google.ms": "google",
+ "google.mu": "google",
+ "google.mv": "google",
+ "google.mw": "google",
+ "google.ne": "google",
+ "google.net": "google",
+ "google.nr": "google",
+ "google.nu": "google",
+ "googleoptimize.com": "google",
+ "google.org": "google",
+ "google.pn": "google",
+ "google.ps": "google",
+ "google.rw": "google",
+ "google.sc": "google",
+ "google.sh": "google",
+ "google.si": "google",
+ "google.sk": "google",
+ "google.sm": "google",
+ "google.sn": "google",
+ "google.so": "google",
+ "google.sr": "google",
+ "google.st": "google",
+ "google.td": "google",
+ "google.tg": "google",
+ "google.tk": "google",
+ "google.tl": "google",
+ "google.tm": "google",
+ "google.to": "google",
+ "google.tt": "google",
+ "google.us": "google",
+ "google.vg": "google",
+ "google.vu": "google",
+ "googleweblight.in": "google",
+ "google.ws": "google",
+ "googlezip.net": "google",
+ "gstatic.cn": "google",
+ "news.google.com": "google",
+ "oo.gl": "google",
+ "withgoogle.com": "google",
"googleadservices.com": "google_adservices",
"google-analytics.com": "google_analytics",
+ "ssl-google-analytics.l.google.com": "google_analytics",
+ "www-googletagmanager.l.google.com": "google_analytics",
"appspot.com": "google_appspot",
+ "googlehosted.com": "google_appspot",
+ "accounts.google.com": "google_auth",
+ "myaccount.google.com": "google_auth",
+ "oauth2.googleapis.com": "google_auth",
+ "ogs.google.com": "google_auth",
+ "securetoken.googleapis.com": "google_auth",
"beacons-google.com": "google_beacons",
+ "alt1-mtalk.google.com": "google_chat",
+ "alt2-mtalk.google.com": "google_chat",
+ "alt3-mtalk.google.com": "google_chat",
+ "alt4-mtalk.google.com": "google_chat",
+ "alt5-mtalk.google.com": "google_chat",
+ "alt6-mtalk.google.com": "google_chat",
+ "alt7-mtalk.google.com": "google_chat",
+ "alt8-mtalk.google.com": "google_chat",
+ "chat.google.com": "google_chat",
+ "mobile-gtalk4.l.google.com": "google_chat",
+ "mobile-gtalk.l.google.com": "google_chat",
+ "mtalk4.google.com": "google_chat",
+ "mtalk.google.com": "google_chat",
+ "talk.google.com": "google_chat",
+ "talk.l.google.com": "google_chat",
+ "talkx.l.google.com": "google_chat",
+ "cloud.google.com": "google_cloud_platform",
+ "gcp.gvt2.com": "google_cloud_platform",
+ "storage.googleapis.com": "google_cloud_storage",
"adsensecustomsearchads.com": "google_custom_search",
+ "dns.google": "google_dns",
+ "dns.google.com": "google_dns",
+ "google-public-dns-a.google.com": "google_dns",
+ "google-public-dns-b.google.com": "google_dns",
+ "domains.google": "google_domains",
+ "googledomains.com": "google_domains",
+ "nic.google": "google_domains",
+ "registry.google": "google_domains",
+ "edge.google.com": "google_edge",
"mail-ads.google.com": "google_email",
"fonts.googleapis.com": "google_fonts",
+ "cloudfunctions.net": "google_hosted",
+ "ghs46.googlehosted.com": "google_hosted",
+ "ghs4.googlehosted.com": "google_hosted",
+ "ghs6.googlehosted.com": "google_hosted",
+ "ghs.googlehosted.com": "google_hosted",
+ "googlehosted.l.googleusercontent.com": "google_hosted",
+ "run.app": "google_hosted",
+ "supl.google.com": "google_location",
+ "earth.app.goo.gl": "google_maps",
+ "geo0.ggpht.com": "google_maps",
+ "geo1.ggpht.com": "google_maps",
+ "geo2.ggpht.com": "google_maps",
+ "geo3.ggpht.com": "google_maps",
+ "kh.google.com": "google_maps",
+ "maps.app.goo.gl": "google_maps",
+ "maps.google.ca": "google_maps",
+ "maps.google.ch": "google_maps",
+ "maps.google.co.jp": "google_maps",
+ "maps.google.com": "google_maps",
+ "maps.google.com.mx": "google_maps",
+ "maps.google.co.uk": "google_maps",
+ "maps.google.es": "google_maps",
+ "maps.google.se": "google_maps",
+ "maps.gstatic.com": "google_maps",
+ "adsense.google.com": "google_marketing",
+ "adservice.google.ca": "google_marketing",
+ "adservice.google.co.in": "google_marketing",
+ "adservice.google.co.kr": "google_marketing",
+ "adservice.google.com": "google_marketing",
+ "adservice.google.com.ar": "google_marketing",
+ "adservice.google.com.au": "google_marketing",
+ "adservice.google.com.br": "google_marketing",
+ "adservice.google.com.co": "google_marketing",
+ "adservice.google.com.gt": "google_marketing",
+ "adservice.google.com.mx": "google_marketing",
+ "adservice.google.com.pe": "google_marketing",
+ "adservice.google.com.ph": "google_marketing",
+ "adservice.google.com.pk": "google_marketing",
+ "adservice.google.com.tr": "google_marketing",
+ "adservice.google.com.tw": "google_marketing",
+ "adservice.google.com.vn": "google_marketing",
+ "adservice.google.co.uk": "google_marketing",
+ "adservice.google.co.za": "google_marketing",
+ "adservice.google.de": "google_marketing",
+ "adservice.google.dk": "google_marketing",
+ "adservice.google.es": "google_marketing",
+ "adservice.google.fr": "google_marketing",
+ "adservice.google.nl": "google_marketing",
+ "adservice.google.no": "google_marketing",
+ "adservice.google.pl": "google_marketing",
+ "adservice.google.ru": "google_marketing",
+ "adservice.google.vg": "google_marketing",
+ "dai.google.com": "google_marketing",
+ "doubleclickbygoogle.com": "google_marketing",
+ "googlesyndication-cn.com": "google_marketing",
+ "duo.google.com": "google_meet",
+ "hangouts.clients6.google.com": "google_meet",
+ "hangouts.googleapis.com": "google_meet",
+ "hangouts.google.com": "google_meet",
+ "meet.google.com": "google_meet",
+ "meetings.googleapis.com": "google_meet",
+ "stun1.l.google.com": "google_meet",
+ "stun.l.google.com": "google_meet",
"ggpht.com": "google_photos",
+ "play-fe.googleapis.com": "google_play",
+ "play.googleapis.com": "google_play",
+ "play.google.com": "google_play",
+ "play-lh.googleusercontent.com": "google_play",
"1e100cdn.net": "google_servers",
+ "gvt1.com": "google_servers",
+ "gvt2.com": "google_servers",
+ "gvt3.com": "google_servers",
"googlesyndication.com": "google_syndication",
"googletagmanager.com": "google_tag_manager",
"googletagservices.com": "google_tag_manager",
"translate.google.com": "google_translate",
"googletraveladservices.com": "google_travel_adds",
+ "pki.goog": "google_trust_services",
"googlecommerce.com": "google_trusted_stores",
"googleusercontent.com": "google_users",
+ "telephony.goog": "google_voice",
+ "voice.google.com": "google_voice",
"gmodules.com": "google_widgets",
+ "calendar.google.com": "google_workspace",
+ "contacts.google.com": "google_workspace",
+ "currents.google.com": "google_workspace",
+ "docs.google.com": "google_workspace",
+ "drive.google.com": "google_workspace",
+ "forms.google.com": "google_workspace",
+ "gsuite.google.com": "google_workspace",
+ "jamboard.google.com": "google_workspace",
+ "keep.google.com": "google_workspace",
+ "plus.google.com": "google_workspace",
+ "sheets.google.com": "google_workspace",
+ "slides.google.com": "google_workspace",
+ "spreadsheets.google.com": "google_workspace",
"googleapis.com": "googleapis.com",
"gooal.herokuapp.com": "goooal",
"gooo.al": "goooal",
@@ -21602,6 +22218,7 @@
"hittail.com": "hittail",
"hivedx.com": "hivedx.com",
"ads.thehiveworks.com": "hiveworks",
+ "hockeyapp.net": "hockeyapp",
"hoholikik.club": "hoholikik.club",
"h-cdn.com": "hola_player",
"homeaway.com": "homeaway",
@@ -21660,6 +22277,7 @@
"cdn.id.services": "id_services",
"e-generator.com": "ideal_media",
"idealo.com": "idealo_com",
+ "identrust.com": "identrust",
"ideoclick.com": "ideoclick",
"s.idio.co": "idio",
"ie8eamus.com": "ie8eamus.com",
@@ -21787,14 +22405,23 @@
"iprom.net": "iprom",
"ipromote.com": "ipromote",
"clickmanage.com": "iprospect",
+ "qy.net": "iqiyi",
+ "iqiyi.com": "iqiyi",
+ "iq.com": "iqiyi",
"addelive.com": "ironsource",
"afdads.com": "ironsource",
"delivery47.com": "ironsource",
+ "ironsrc.com": "ironsource",
+ "ironsrc.net": "ironsource",
+ "supersonicads.com": "ironsource",
"adsbyisocket.com": "isocket",
"isocket.com": "isocket",
+ "isolarcloud.com": "isolarcloud",
+ "isolarcloud.com.a.lahuashanbx.com": "isolarcloud",
+ "isolarcloud.com.w.cdngslb.com": "isolarcloud",
+ "isolarcloud.com.w.kunlunsl.com": "isolarcloud",
"ispot.tv": "ispot.tv",
"itineraire.info": "itineraire.info",
- "apple.com": "apple",
"autolinkmaker.itunes.apple.com": "itunes_link_maker",
"ity.im": "ity.im",
"iubenda.com": "iubenda.com",
@@ -21864,12 +22491,14 @@
"kanoodle.com": "kanoodle",
"kmi-us.com": "kantar_media",
"tnsinternet.be": "kantar_media",
+ "karambasecurity.com": "karambasecurity",
"kargo.com": "kargo",
"kaspersky-labs.com": "kaspersky-labs.com",
"kataweb.it": "kataweb.it",
"cen.katchup.fr": "katchup",
"kau.li": "kauli",
"kavanga.ru": "kavanga",
+ "kayosports.com.au": "kayo_sports",
"dc8na2hxrj29i.cloudfront.net": "keen_io",
"keen.io": "keen_io",
"widget.kelkoo.com": "kelkoo",
@@ -21885,6 +22514,9 @@
"sa-as.com": "kickfire",
"sniff.visistat.com": "kickfire",
"stats.visistat.com": "kickfire",
+ "kik.com": "kik",
+ "apikik.com": "kik",
+ "kik-live.com": "kik",
"king.com": "king.com",
"midasplayer.com": "king_com",
"kinja-img.com": "kinja.com",
@@ -21898,6 +22530,7 @@
"kixer.com": "kixer",
"klarna.com": "klarna.com",
"a.klaviyo.com": "klaviyo",
+ "klaviyo.com": "klaviyo",
"klikki.com": "klikki",
"scr.kliksaya.com": "kliksaya",
"mediapeo2.com": "kmeleo",
@@ -21923,9 +22556,11 @@
"lanistaads.com": "lanista_concepts",
"latimes.com": "latimes",
"events.launchdarkly.com": "launch_darkly",
+ "launchdarkly.com": "launch_darkly",
"launchbit.com": "launchbit",
"layer-ad.org": "layer-ad.org",
"ph-live.slatic.net": "lazada",
+ "slatic.net": "lazada",
"lcxdigital.com": "lcx_digital",
"lemde.fr": "le_monde.fr",
"t1.llanalytics.com": "lead_liaison",
@@ -21998,8 +22633,17 @@
"lentainform.com": "lentainform.com",
"lenua.de": "lenua.de",
"letreach.com": "let_reach",
+ "lencr.org": "lets_encrypt",
+ "letsencrypt.org": "lets_encrypt",
"js.letvcdn.com": "letv",
"footprint.net": "level3_communications",
+ "alphonso.tv": "lgads",
+ "lgads.tv": "lgads",
+ "lgsmartad.com": "lgtv",
+ "lgtvcommon.com": "lgtv",
+ "lgtvsdp.com": "lgtv",
+ "lge.com": "lgtv",
+ "lg.com": "lgtv",
"licensebuttons.net": "licensebuttons.net",
"lfstmedia.com": "lifestreet_media",
"content-recommendation.net": "ligatus",
@@ -22150,6 +22794,7 @@
"mktoresp.com": "marketo",
"caanalytics.com": "markmonitor",
"mmstat.com": "markmonitor",
+ "markmonitor.com": "markmonitor",
"netscope.data.marktest.pt": "marktest",
"marshadow.io": "marshadow.io",
"martiniadnetwork.com": "martini_media",
@@ -22166,6 +22811,7 @@
"piwik.org": "matomo",
"adsmarket.com": "matomy_market",
"m2pub.com": "matomy_market",
+ "matrix.org": "matrix",
"mb01.com": "maxbounty",
"maxcdn.com": "maxcdn",
"netdna-cdn.com": "maxcdn",
@@ -22192,6 +22838,8 @@
"s1.mediaad.org": "mediaad",
"mlnadvertising.com": "mediaglu",
"fhserve.com": "mediahub",
+ "medialab.la": "medialab",
+ "media-lab.ai": "medialab",
"adnet.ru": "medialand",
"medialand.ru": "medialand",
"medialead.de": "medialead",
@@ -22219,6 +22867,9 @@
"mxcdn.net": "meetrics",
"research.de.com": "meetrics",
"counter.megaindex.ru": "megaindex",
+ "mega.co.nz": "meganz",
+ "mega.io": "meganz",
+ "mega.nz": "meganz",
"mein-bmi.com": "mein-bmi.com",
"webvisitor.melissadata.net": "melissa",
"meltdsp.com": "melt",
@@ -22248,7 +22899,6 @@
"azurewebsites.net": "microsoft",
"cloudapp.net": "microsoft",
"gfx.ms": "microsoft",
- "live.com": "outlook",
"microsoft.com": "microsoft",
"microsoftonline-p.com": "microsoft",
"microsoftonline.com": "microsoft",
@@ -22260,6 +22910,7 @@
"s-microsoft.com": "microsoft",
"trouter.io": "microsoft",
"windows.net": "microsoft",
+ "msidentity.com": "microsoft",
"analytics.live.com": "microsoft_analytics",
"a.clarity.ms": "microsoft_clarity",
"b.clarity.ms": "microsoft_clarity",
@@ -22333,11 +22984,19 @@
"micpn.com": "movable_ink",
"mvb.me": "movable_media",
"moz.com": "moz",
+ "firefox.com": "mozilla",
+ "mozaws.net": "mozilla",
+ "mozgcp.net": "mozilla",
+ "mozilla.com": "mozilla",
+ "mozilla.net": "mozilla",
+ "mozilla.org": "mozilla",
"storage.mozoo.com": "mozoo",
"tracker.mrpfd.com": "mrp",
"mrpdata.com": "mrpdata",
"mrpdata.net": "mrpdata",
"mrskincash.com": "mrskincash",
+ "e-msedge.net": "msedge",
+ "l-msedge.net": "msedge",
"msn.com": "msn",
"s-msn.com": "msn",
"musculahq.appspot.com": "muscula",
@@ -22353,6 +23012,13 @@
"stat.mystat.hu": "mystat",
"mythings.com": "mythings",
"mystat-in.net": "mytop_counter",
+ "nab.com": "nab",
+ "nab.com.au": "nab",
+ "nab.net": "nab",
+ "nabgroup.com": "nab",
+ "national.com.au": "nab",
+ "nationalaustraliabank.com.au": "nab",
+ "nationalbank.com.au": "nab",
"nakanohito.jp": "nakanohito.jp",
"namogoo.coom": "namogoo",
"nanigans.com": "nanigans",
@@ -22393,6 +23059,25 @@
"nflximg.net": "netflix",
"nflxso.net": "netflix",
"nflxvideo.net": "netflix",
+ "flxvpn.net": "netflix",
+ "netflix.ca": "netflix",
+ "netflix.com.au": "netflix",
+ "netflix.net": "netflix",
+ "netflixdnstest1.com": "netflix",
+ "netflixdnstest10.com": "netflix",
+ "netflixdnstest2.com": "netflix",
+ "netflixdnstest3.com": "netflix",
+ "netflixdnstest4.com": "netflix",
+ "netflixdnstest5.com": "netflix",
+ "netflixdnstest6.com": "netflix",
+ "netflixdnstest7.com": "netflix",
+ "netflixdnstest8.com": "netflix",
+ "netflixdnstest9.com": "netflix",
+ "netflixinvestor.com": "netflix",
+ "netflixstudios.com": "netflix",
+ "netflixtechblog.com": "netflix",
+ "nflximg.com": "netflix",
+ "netify.ai": "netify",
"netzathleten-media.de": "netletix",
"netminers.dk": "netminers",
"netmining.com": "netmining",
@@ -22443,6 +23128,7 @@
"nosto.com": "nosto.com",
"adleadevent.com": "notify",
"notifyfox.com": "notifyfox",
+ "notion.so": "notion",
"nowinteract.com": "now_interact",
"npario-inc.net": "npario",
"nplexmedia.com": "nplexmedia",
@@ -22450,6 +23136,8 @@
"ns8.com": "ns8",
"nt.vc": "nt.vc",
"featurelink.com": "ntent",
+ "ntp.org": "ntppool",
+ "ntppool.org": "ntppool",
"tracer.jp": "nttcom_online_marketing_solutions",
"nuffnang.com": "nuffnang",
"nuggad.net": "nugg.ad",
@@ -22528,6 +23216,12 @@
"opinary.com": "opinary",
"opinionbar.com": "opinionbar",
"emagazines.com": "oplytic",
+ "oppomobile.com": "oppo",
+ "heytapmobi.com": "oppo",
+ "heytapmobile.com": "oppo",
+ "heytapdl.com": "oppo",
+ "allawnos.com": "oppo",
+ "allawntech.com": "oppo",
"opta.net": "opta.net",
"optaim.com": "optaim",
"cookielaw.org": "optanaon",
@@ -22536,6 +23230,7 @@
"optmd.com": "optimax_media_delivery",
"optimicdn.com": "optimicdn.com",
"optimizely.com": "optimizely",
+ "episerver.net": "optimizely",
"optimonk.com": "optimonk",
"mstrlytcs.com": "optinmonster",
"optmnstr.com": "optinmonster",
@@ -22563,6 +23258,9 @@
"ottogroup.media": "otto.de",
"outbrain.com": "outbrain",
"outbrainimg.com": "outbrain",
+ "live.com": "outlook",
+ "hotmail.com": "outlook",
+ "outlook.com": "outlook",
"overheat.it": "overheat.it",
"oewabox.at": "owa",
"owneriq.net": "owneriq",
@@ -22571,6 +23269,7 @@
"adconnexa.com": "oxamedia",
"adsbwm.com": "oxamedia",
"oxomi.com": "oxomi.com",
+ "oztam.com.au": "oztam",
"pageanalytics.space": "pageanalytics.space",
"blockmetrics.com": "pagefair",
"pagefair.com": "pagefair",
@@ -22610,6 +23309,7 @@
"perfectaudience.com": "perfect_audience",
"prfct.co": "perfect_audience",
"perfectmarket.com": "perfect_market",
+ "perfops.io": "perfops",
"performgroup.com": "perform_group",
"analytics.performable.com": "performable",
"performancing.com": "performancing_metrics",
@@ -22647,6 +23347,8 @@
"loveadvert.ru": "play_by_mamba",
"playbuzz.com": "playbuzz.com",
"pof.com": "plenty_of_fish",
+ "plex.tv": "plex",
+ "plex.direct": "plex",
"analytics.plex.tv": "plex_metrics",
"metrics.plex.tv": "plex_metrics",
"plista.com": "plista",
@@ -22776,6 +23478,10 @@
"qq.com": "qq.com",
"qrius.me": "qrius",
"qualaroo.com": "qualaroo",
+ "qualcomm.com": "qualcomm",
+ "gpsonextra.net": "qualcomm_location_service",
+ "izatcloud.net": "qualcomm_location_service",
+ "xtracloud.net": "qualcomm_location_service",
"bluecava.com": "qualia",
"qualtrics.com": "qualtrics",
"quantcast.com": "quantcast",
@@ -22842,6 +23548,7 @@
"dcniko1cv0rz.cloudfront.net": "realytics",
"realytics.io": "realytics",
"static.rbl.ms": "rebel_mouse",
+ "recaptcha.net": "recaptcha",
"recettes.net": "recettes.net",
"static.recopick.com": "recopick",
"recreativ.ru": "recreativ",
@@ -22989,6 +23696,66 @@
"salespidermedia.com": "salespider_media",
"salesviewer.com": "salesviewer",
"samba.tv": "samba.tv",
+ "game-mode.net": "samsung",
+ "gos-gsp.io": "samsung",
+ "lldns.net": "samsung",
+ "pavv.co.kr": "samsung",
+ "remotesamsung.com": "samsung",
+ "samsung-gamelauncher.com": "samsung",
+ "samsung.co.kr": "samsung",
+ "samsung.com": "samsung",
+ "samsung.com.cn": "samsung",
+ "samsungcloud.com": "samsung",
+ "samsungcloudcdn.com": "samsung",
+ "samsungcloudprint.com": "samsung",
+ "samsungcloudsolution.com": "samsung",
+ "samsungcloudsolution.net": "samsung",
+ "samsungelectronics.com": "samsung",
+ "samsunghealth.com": "samsung",
+ "samsungiotcloud.com": "samsung",
+ "samsungknox.com": "samsung",
+ "samsungnyc.com": "samsung",
+ "samsungosp.com": "samsung",
+ "samsungotn.net": "samsung",
+ "samsungpositioning.com": "samsung",
+ "samsungqbe.com": "samsung",
+ "samsungrm.net": "samsung",
+ "samsungrs.com": "samsung",
+ "samsungsemi.com": "samsung",
+ "samsungsetup.com": "samsung",
+ "samsungusa.com": "samsung",
+ "secb2b.com": "samsung",
+ "smartthings.com": "samsung",
+ "adgear.com": "samsungads",
+ "adgrx.com": "samsungads",
+ "samsungacr.com": "samsungads",
+ "samsungadhub.com": "samsungads",
+ "samsungads.com": "samsungads",
+ "samsungtifa.com": "samsungads",
+ "aibixby.com": "samsungapps",
+ "findmymobile.samsung.com": "samsungapps",
+ "samsapps.cust.lldns.net": "samsungapps",
+ "samsung-omc.com": "samsungapps",
+ "samsungapps.com": "samsungapps",
+ "samsungdiroute.net": "samsungapps",
+ "samsungdive.com": "samsungapps",
+ "samsungdm.com": "samsungapps",
+ "samsungdmroute.com": "samsungapps",
+ "samsungmdec.com": "samsungapps",
+ "samsungvisioncloud.com": "samsungapps",
+ "sbixby.com": "samsungapps",
+ "ospserver.net": "samsungmobile",
+ "samsungdms.net": "samsungmobile",
+ "samsungmax.com": "samsungmobile",
+ "samsungmobile.com": "samsungmobile",
+ "secmobilesvc.com": "samsungmobile",
+ "push.samsungosp.com": "samsungpush",
+ "pushmessage.samsung.com": "samsungpush",
+ "scs.samsungqbe.com": "samsungpush",
+ "ssp.samsung.com": "samsungpush",
+ "samsungsds.com": "samsungsds",
+ "internetat.tv": "samsungtv",
+ "samsungcloud.tv": "samsungtv",
"ilsemedia.nl": "sanoma.fi",
"sanoma.fi": "sanoma.fi",
"d13im3ek7neeqp.cloudfront.net": "sap_crm",
@@ -23027,6 +23794,7 @@
"searchignite.com": "searchignite",
"srtk.net": "searchrev",
"tacticalrepublic.com": "second_media",
+ "sectigo.com": "sectigo",
"securedtouch.com": "securedtouch",
"securedvisit.com": "securedvisit",
"bacontent.de": "seeding_alliance",
@@ -23087,8 +23855,22 @@
"retargeter.com.br": "shop_target",
"shopauskunft.de": "shopauskunft.de",
"shopgate.com": "shopgate.com",
- "shopify.com": "shopify_stats",
- "shopifycdn.com": "shopifycdn.com",
+ "shopify.com": "shopify",
+ "shopifycdn.com": "shopify",
+ "cdn.shopify.com": "shopify",
+ "myshopify.com": "shopify",
+ "shop.app": "shopify",
+ "shopifyapps.com": "shopify",
+ "shopifycdn.net": "shopify",
+ "shopify.com.au": "shopify",
+ "shopify.com.mx": "shopify",
+ "shopify.co.za": "shopify",
+ "shopify.dev": "shopify",
+ "shopifynetwork.com": "shopify",
+ "shopifypreview.com": "shopify",
+ "shopifysvc.com": "shopify_stats",
+ "stats.shopify.com": "shopify_stats",
+ "v.shopify.com": "shopify_stats",
"shopifycloud.com": "shopifycloud.com",
"shopperapproved.com": "shopper_approved",
"shoppingshadow.com": "shopping_com",
@@ -23097,6 +23879,7 @@
"shopsocially.com": "shopsocially",
"shopzilla.com": "shopzilla",
"shortnews.de": "shortnews",
+ "showrss.info": "showrss",
"shink.in": "shrink",
"shutterstock.com": "shutterstock",
"siblesectiveal.club": "siblesectiveal.club",
@@ -23119,6 +23902,8 @@
"pages04.net": "silverpop",
"pages05.net": "silverpop",
"similardeals.net": "similardeals.net",
+ "similarweb.io": "similarweb",
+ "similarweb.com": "similarweb",
"d8rk54i4mohrb.cloudfront.net": "simplereach",
"simplereach.com": "simplereach",
"simpli.fi": "simpli.fi",
@@ -23157,6 +23942,10 @@
"skypeassets.com": "skype",
"skysa.com": "skysa",
"skyscnr.com": "skyscnr.com",
+ "slack.com": "slack",
+ "slackb.com": "slack",
+ "slack-edge.com": "slack",
+ "slack-imgs.com": "slack",
"slashdot.org": "slashdot_widget",
"sleeknotestaticcontent.sleeknote.com": "sleeknote",
"resultspage.com": "sli_systems",
@@ -23199,6 +23988,16 @@
"smyte.com": "smyte",
"snacktv.de": "snacktv",
"snap.com": "snap",
+ "addlive.io": "snap",
+ "feelinsonice.com": "snap",
+ "sc-cdn.net": "snap",
+ "sc-corp.net": "snap",
+ "sc-gw.com": "snap",
+ "sc-jpl.com": "snap",
+ "sc-prod.net": "snap",
+ "snap-dev.net": "snap",
+ "snapads.com": "snap",
+ "snapkit.com": "snap",
"snapengage.com": "snap_engage",
"sc-static.net": "snapchat",
"snapchat.com": "snapchat",
@@ -23225,11 +24024,13 @@
"sojern.com": "sojern",
"sokrati.com": "sokrati",
"solads.media": "solads.media",
+ "solaredge.com": "solaredge",
"solidopinion.com": "solidopinion",
"pixel.solvemedia.com": "solve_media",
"soma2.de": "soma_2",
"mobileadtrading.com": "somoaudience",
"sonobi.com": "sonobi",
+ "sonos.com": "sonos",
"sophus3.com": "sophus3",
"deployads.com": "sortable",
"sndcdn.com": "soundcloud",
@@ -23300,6 +24101,7 @@
"statsy.net": "statsy.net",
"statuscake.com": "statuscake",
"statuspage.io": "statuspage.io",
+ "stspg-customer.com": "statuspage.io",
"stayfriends.de": "stayfriends.de",
"steelhousemedia.com": "steelhouse",
"steepto.com": "steepto.com",
@@ -23313,6 +24115,7 @@
"bizsolutions.strands.com": "strands_recommender",
"strava.com": "strava",
"mailfoogae.appspot.com": "streak",
+ "streamotion.com.au": "streamotion",
"streamrail.com": "streamrail.com",
"streamrail.net": "streamrail.com",
"stridespark.com": "stride",
@@ -23353,6 +24156,7 @@
"switchadhub.com": "switch_concepts",
"switchads.com": "switch_concepts",
"switchafrica.com": "switch_concepts",
+ "switch.tv": "switchtv",
"shopximity.com": "swoop",
"swoop.com": "swoop",
"analytics-cdn.sykescottages.co.uk": "sykes",
@@ -23387,6 +24191,7 @@
"tamedia.ch": "tamedia.ch",
"tanx.com": "tanx",
"alipcsec.com": "taobao",
+ "taobao.com": "taobao",
"tapad.com": "tapad",
"theblogfrog.com": "tapinfluence",
"tarafdari.com": "tarafdari",
@@ -23407,6 +24212,8 @@
"teaser.cc": "teaser.cc",
"emailretargeting.com": "tedemis",
"tracking.dsmmadvantage.com": "teletech",
+ "telstra.com.au": "telstra",
+ "telstra.com": "telstra",
"tenderapp.com": "tender",
"tensitionschoo.club": "tensitionschoo.club",
"watch.teroti.com": "teroti",
@@ -23545,6 +24352,7 @@
"trustev.com": "trustev",
"secure.comodo.net": "trustlogo",
"trustlogo.com": "trustlogo",
+ "usertrust.com": "trustlogo",
"trustpilot.com": "trustpilot",
"trustwave.com": "trustwave.com",
"tubecorporate.com": "tubecorporate",
@@ -23591,6 +24399,13 @@
"tyroodr.com": "tyroo",
"tzetze.it": "tzetze",
"ubersetzung-app.com": "ubersetzung-app.com",
+ "canonical.com": "ubuntu",
+ "launchpad.net": "ubuntu",
+ "launchpadcontent.net": "ubuntu",
+ "snapcraft.io": "ubuntu",
+ "snapcraftcontent.com": "ubuntu",
+ "ubuntu.com": "ubuntu",
+ "ubuntucompanyservices.co.za": "ubuntu",
"aralego.net": "ucfunnel",
"ucfunnel.com": "ucfunnel",
"at.ua": "ucoz",
@@ -23617,6 +24432,10 @@
"tifbs.net": "united_internet_media_gmbh",
"ui-portal.de": "united_internet_media_gmbh",
"uimserv.net": "united_internet_media_gmbh",
+ "unity.com": "unity",
+ "unity3d.com": "unity",
+ "unity3dusercontent.com": "unity",
+ "unityads.unity3d.com": "unity_ads",
"univide.com": "univide",
"unpkg.com": "unpkg.com",
"unrulymedia.com": "unruly_media",
@@ -23765,6 +24584,10 @@
"voxus-targeting-voxusmidia.netdna-ssl.com": "voxus",
"c-dsp.vpadn.com": "vpon",
"tools.vpscash.nl": "vpscash",
+ "exp-tas.com": "vscode",
+ "vscode-unpkg.net": "vscode",
+ "v0cdn.net": "vscode",
+ "vscode-cdn.net": "vscode",
"vtracy.de": "vtracy.de",
"vuukle.com": "vuukle",
"view.vzaar.com": "vzaar",
@@ -23835,6 +24658,8 @@
"wetter.com": "wetter_com",
"wettercomassets.com": "wetter_com",
"whatsbroadcast.com": "whatbroadcast",
+ "whatsapp.net": "whatsapp",
+ "whatsapp.com": "whatsapp",
"amung.us": "whos.amung.us",
"whoson.com": "whoson",
"api.wibbitz.com": "wibbitz",
@@ -23854,6 +24679,10 @@
"wikipedia.org": "wikimedia.org",
"wikiquote.org": "wikimedia.org",
"tracking.winaffiliates.com": "winaffiliates",
+ "maps.windows.com": "windows_maps",
+ "client.wns.windows.com": "windows_notifications",
+ "time.windows.com": "windows_time",
+ "windowsupdate.com": "windowsupdate",
"api.wipmania.com": "wipmania",
"col1.wiqhit.com": "wiqhit",
"wirecard.com": "wirecard",
@@ -23938,9 +24767,16 @@
"yandex.net": "yandex",
"yandex.ru": "yandex",
"yastatic.net": "yandex",
+ "ya.ru": "yandex",
+ "yandex.by": "yandex",
+ "yandex.com": "yandex",
+ "yandex.com.tr": "yandex",
+ "yandex.fr": "yandex",
+ "yandex.kz": "yandex",
"yandex.st": "yandex.api",
"yandexadexchange.net": "yandex_adexchange",
"metabar.ru": "yandex_advisor",
+ "appmetrica.yandex.com": "yandex_appmetrica",
"an.webvisor.org": "yandex_direct",
"an.yandex.ru": "yandex_direct",
"bs.yandex.ru": "yandex_direct",
@@ -24050,323 +24886,6 @@
"zukxd6fkxqn.com": "zukxd6fkxqn.com",
"zwaar.net": "zwaar",
"zwaar.org": "zwaar",
- "extend.tv": "zypmedia",
- "abc.net.au": "abc",
- "ab.co": "abc",
- "abc-cdn.net.au": "abc",
- "abc-host.net": "abc",
- "abc-host.net.au": "abc",
- "abc-prod.net.au": "abc",
- "abc-stage.net.au": "abc",
- "abc-test.net.au": "abc",
- "abcaustralia.net.au": "abc",
- "abcradio.net.au": "abc",
- "adtidy.org": "adguard",
- "agrd.io": "adguard",
- "adguard.app": "adguard",
- "adguard.io": "adguard",
- "adguard.org": "adguard",
- "adguard-dns.com": "adguard_dns",
- "adguard-dns.io": "adguard_dns",
- "adguardvpn.com": "adguard_vpn",
- "adguard-vpn.com": "adguard_vpn",
- "adguard-vpn.online": "adguard_vpn",
- "adjust.net.in": "adjust",
- "adj.st": "adjust",
- "adjust.io": "adjust",
- "adjust.world": "adjust",
- "apptrace.com": "adjust",
- "akadns.net": "akamai_technologies",
- "akamaiedge.net": "akamai_technologies",
- "akaquill.net": "akamai_technologies",
- "aliapp.org": "alibaba.com",
- "alibabachengdun.com": "alibaba.com",
- "alibabausercontent.com": "alibaba.com",
- "aliexpress.com": "alibaba.com",
- "alikunlun.com": "alibaba.com",
- "aliyuncs.com": "alibaba.com",
- "alibabacloud.com": "alibaba_cloud",
- "alibabadns.com": "alibaba_cloud",
- "aliyun.com": "alibaba_cloud",
- "ucweb.com": "alibaba_ucbrowser",
- "alipayobjects.com": "alipay.com",
- "amazoncrl.com": "amazon",
- "aamazoncognito.com": "amazon",
- "amazonbrowserapp.es": "amazon",
- "amazonbrowserapp.co.uk": "amazon",
- "amazon.sa": "amazon",
- "amazon.nl": "amazon",
- "amazon.in": "amazon",
- "amazon.com.mx": "amazon",
- "amazon.com.au": "amazon",
- "amazon-corp.com": "amazon",
- "a2z.com": "amazon",
- "amazontrust.com": "amazon_cdn",
- "associates-amazon.com": "amazon_cdn",
- "amazonpay.in": "amazon_payments",
- "amazonvideo.com": "amazon_video",
- "taobao.com": "taobao",
- "appcenter.ms": "appcenter",
- "iadsdk.apple.com": "apple_ads",
- "me.com": "apple",
- "apple.news": "apple",
- "apple-dns.net": "apple",
- "aaplimg.com": "apple",
- "icloud.com": "apple",
- "itunes.com": "apple",
- "icloud-content.com": "apple",
- "mzstatic.com": "apple",
- "cdn-apple.com": "apple",
- "apple-mapkit.com": "apple",
- "icons.axm-usercontent-apple.com": "apple",
- "apple-cloudkit.com": "apple",
- "apzones.com": "apple",
- "apple-livephotoskit.com": "apple",
- "safebrowsing.apple": "apple",
- "safebrowsing.g.applimg.com": "apple",
- "applvn.com": "applovin",
- "applovin.com": "applovin",
- "bitbucket.org": "atlassian.net",
- "jira.com": "atlassian.net",
- "ss-inf.net": "atlassian.net",
- "stspg-customer.com": "statuspage.io",
- "blob.core.windows.net": "azure_blob_storage",
- "azure.com": "azure",
- "trafficmanager.net": "azure",
- "bitwarden.com": "bitwarden",
- "mobileapptracking.com": "branch",
- "bttn.io": "button",
- "cloudflare-dns.com": "cloudflare",
- "cloudflare-dm-cmpimg.com": "cloudflare",
- "cloudflare-ipfs.com": "cloudflare",
- "cloudflare-quic.com": "cloudflare",
- "cloudflare-terms-of-service-abuse.com": "cloudflare",
- "cloudflare.tv": "cloudflare",
- "cloudflareaccess.com": "cloudflare",
- "cloudflareclient.com": "cloudflare",
- "cloudflareinsights.com": "cloudflare",
- "cloudflareok.com": "cloudflare",
- "cloudflareportal.com": "cloudflare",
- "cloudflareresolve.com": "cloudflare",
- "cloudflaressl.com": "cloudflare",
- "cloudflarestatus.com": "cloudflare",
- "pacloudflare.com": "cloudflare",
- "sn-cloudflare.com": "cloudflare",
- "crashlytics.com": "crashlytics",
- "phicdn.net": "digicert_trust_seal",
- "domain.glass": "domainglass",
- "alphacdn.net": "edgio",
- "edg.io": "edgio",
- "edgecast.com": "edgio",
- "edgecastcdn.net": "edgio",
- "edgecastdns.net": "edgio",
- "sigmacdn.net": "edgio",
- "element.io": "element",
- "riot.im": "element",
- "app-measurement.com": "firebase",
- "flipboard.com": "flipboard",
- "flurry.com": "flurry",
- "freeviewaustralia.tv": "freeview",
- "freeview.com.au": "freeview",
- "freeview.com": "freeview",
- "ghcr.io": "github",
- "github.dev": "github",
- "gmail.com": "gmail",
- "googlehosted.com": "google_appspot",
- "gvt1.com": "google_servers",
- "gvt2.com": "google_servers",
- "gvt3.com": "google_servers",
- "pki.goog": "google_trust_services",
- "hockeyapp.net": "hockeyapp",
- "qy.net": "iqiyi",
- "iqiyi.com": "iqiyi",
- "iq.com": "iqiyi",
- "ironsrc.com": "ironsource",
- "ironsrc.net": "ironsource",
- "supersonicads.com": "ironsource",
- "karambasecurity.com": "karambasecurity",
- "kik.com": "kik",
- "apikik.com": "kik",
- "kik-live.com": "kik",
- "slatic.net": "lazada",
- "lencr.org": "lets_encrypt",
- "letsencrypt.org": "lets_encrypt",
- "alphonso.tv": "lgads",
- "lgads.tv": "lgads",
- "lgsmartad.com": "lgtv",
- "lgtvcommon.com": "lgtv",
- "lgtvsdp.com": "lgtv",
- "lge.com": "lgtv",
- "lg.com": "lgtv",
- "markmonitor.com": "markmonitor",
- "matrix.org": "matrix",
- "medialab.la": "medialab",
- "media-lab.ai": "medialab",
- "mega.co.nz": "meganz",
- "mega.io": "meganz",
- "mega.nz": "meganz",
- "e-msedge.net": "msedge",
- "l-msedge.net": "msedge",
- "firefox.com": "mozilla",
- "mozaws.net": "mozilla",
- "mozgcp.net": "mozilla",
- "mozilla.com": "mozilla",
- "mozilla.net": "mozilla",
- "mozilla.org": "mozilla",
- "flxvpn.net": "netflix",
- "netflix.ca": "netflix",
- "netflix.com.au": "netflix",
- "netflix.net": "netflix",
- "netflixdnstest1.com": "netflix",
- "netflixdnstest10.com": "netflix",
- "netflixdnstest2.com": "netflix",
- "netflixdnstest3.com": "netflix",
- "netflixdnstest4.com": "netflix",
- "netflixdnstest5.com": "netflix",
- "netflixdnstest6.com": "netflix",
- "netflixdnstest7.com": "netflix",
- "netflixdnstest8.com": "netflix",
- "netflixdnstest9.com": "netflix",
- "netflixinvestor.com": "netflix",
- "netflixstudios.com": "netflix",
- "netflixtechblog.com": "netflix",
- "nflximg.com": "netflix",
- "netify.ai": "netify",
- "nab.com": "nab",
- "nab.com.au": "nab",
- "nab.net": "nab",
- "nabgroup.com": "nab",
- "national.com.au": "nab",
- "nationalaustraliabank.com.au": "nab",
- "nationalbank.com.au": "nab",
- "notion.so": "notion",
- "ntp.org": "ntppool",
- "ntppool.org": "ntppool",
- "oppomobile.com": "oppo",
- "heytapmobi.com": "oppo",
- "heytapmobile.com": "oppo",
- "heytapdl.com": "oppo",
- "allawnos.com": "oppo",
- "allawntech.com": "oppo",
- "hotmail.com": "outlook",
- "outlook.com": "outlook",
- "oztam.com.au": "oztam",
- "plex.tv": "plex",
- "plex.direct": "plex",
- "qualcomm.com": "qualcomm",
- "gpsonextra.net": "qualcomm_location_service",
- "izatcloud.net": "qualcomm_location_service",
- "xtracloud.net": "qualcomm_location_service",
- "recaptcha.net": "recaptcha",
- "samsungacr.com": "samsungads",
- "samsungadhub.com": "samsungads",
- "samsungads.com": "samsungads",
- "samsungtifa.com": "samsungads",
- "game-mode.net": "samsung",
- "gos-gsp.io": "samsung",
- "lldns.net": "samsung",
- "pavv.co.kr": "samsung",
- "remotesamsung.com": "samsung",
- "samsung-gamelauncher.com": "samsung",
- "samsung.co.kr": "samsung",
- "samsung.com": "samsung",
- "samsung.com.cn": "samsung",
- "samsungcloud.com": "samsung",
- "samsungcloudcdn.com": "samsung",
- "samsungcloudprint.com": "samsung",
- "samsungcloudsolution.com": "samsung",
- "samsungcloudsolution.net": "samsung",
- "samsungelectronics.com": "samsung",
- "samsunghealth.com": "samsung",
- "samsungiotcloud.com": "samsung",
- "samsungknox.com": "samsung",
- "samsungnyc.com": "samsung",
- "samsungosp.com": "samsung",
- "samsungotn.net": "samsung",
- "samsungpositioning.com": "samsung",
- "samsungqbe.com": "samsung",
- "samsungrm.net": "samsung",
- "samsungrs.com": "samsung",
- "samsungsemi.com": "samsung",
- "samsungsetup.com": "samsung",
- "samsungusa.com": "samsung",
- "secb2b.com": "samsung",
- "smartthings.com": "samsung",
- "ospserver.net": "samsungmobile",
- "samsungdms.net": "samsungmobile",
- "samsungmax.com": "samsungmobile",
- "samsungmobile.com": "samsungmobile",
- "secmobilesvc.com": "samsungmobile",
- "internetat.tv": "samsungtv",
- "samsungcloud.tv": "samsungtv",
- "samsungsds.com": "samsungsds",
- "push.samsungosp.com": "samsungpush",
- "pushmessage.samsung.com": "samsungpush",
- "scs.samsungqbe.com": "samsungpush",
- "ssp.samsung.com": "samsungpush",
- "aibixby.com": "samsungapps",
- "findmymobile.samsung.com": "samsungapps",
- "samsapps.cust.lldns.net": "samsungapps",
- "samsung-omc.com": "samsungapps",
- "samsungapps.com": "samsungapps",
- "samsungdiroute.net": "samsungapps",
- "samsungdive.com": "samsungapps",
- "samsungdm.com": "samsungapps",
- "samsungdmroute.com": "samsungapps",
- "samsungmdec.com": "samsungapps",
- "samsungvisioncloud.com": "samsungapps",
- "sbixby.com": "samsungapps",
- "sectigo.com": "sectigo",
- "showrss.info": "showrss",
- "similarweb.io": "similarweb",
- "similarweb.com": "similarweb",
- "slack.com": "slack",
- "slackb.com": "slack",
- "slack-edge.com": "slack",
- "slack-imgs.com": "slack",
- "addlive.io": "snap",
- "feelinsonice.com": "snap",
- "sc-cdn.net": "snap",
- "sc-corp.net": "snap",
- "sc-gw.com": "snap",
- "sc-jpl.com": "snap",
- "sc-prod.net": "snap",
- "snap-dev.net": "snap",
- "snapads.com": "snap",
- "snapkit.com": "snap",
- "switch.tv": "switchtv",
- "solaredge.com": "solaredge",
- "sonos.com": "sonos",
- "telstra.com.au": "telstra",
- "telstra.com": "telstra",
- "usertrust.com": "trustlogo",
- "canonical.com": "ubuntu",
- "launchpad.net": "ubuntu",
- "launchpadcontent.net": "ubuntu",
- "snapcraft.io": "ubuntu",
- "snapcraftcontent.com": "ubuntu",
- "ubuntu.com": "ubuntu",
- "ubuntucompanyservices.co.za": "ubuntu",
- "unityads.unity3d.com": "unity_ads",
- "exp-tas.com": "vscode",
- "vscode-unpkg.net": "vscode",
- "v0cdn.net": "vscode",
- "vscode-cdn.net": "vscode",
- "whatsapp.net": "whatsapp",
- "whatsapp.com": "whatsapp",
- "maps.windows.com": "windows_maps",
- "client.wns.windows.com": "windows_notifications",
- "time.windows.com": "windows_time",
- "windowsupdate.com": "windowsupdate",
- "ya.ru": "yandex",
- "yandex.by": "yandex",
- "yandex.com": "yandex",
- "yandex.com.tr": "yandex",
- "yandex.fr": "yandex",
- "yandex.kz": "yandex",
- "appmetrica.yandex.com": "yandex_appmetrica",
- "3gppnetwork.org": "3gpp",
- "3gpp.org": "3gpp",
- "swm.digital": "7plus"
+ "extend.tv": "zypmedia"
}
}
diff --git a/client/src/reducers/rewrites.js b/client/src/reducers/rewrites.js
index 972bead9..85a12fbc 100644
--- a/client/src/reducers/rewrites.js
+++ b/client/src/reducers/rewrites.js
@@ -30,7 +30,27 @@ const rewrites = handleActions(
[actions.deleteRewriteFailure]: (state) => ({ ...state, processingDelete: false }),
[actions.deleteRewriteSuccess]: (state) => ({ ...state, processingDelete: false }),
- [actions.toggleRewritesModal]: (state) => {
+ [actions.updateRewriteRequest]: (state) => ({ ...state, processingUpdate: true }),
+ [actions.updateRewriteFailure]: (state) => ({ ...state, processingUpdate: false }),
+ [actions.updateRewriteSuccess]: (state) => {
+ const newState = {
+ ...state,
+ processingUpdate: false,
+ };
+ return newState;
+ },
+
+ [actions.toggleRewritesModal]: (state, { payload }) => {
+ if (payload) {
+ const newState = {
+ ...state,
+ modalType: payload.type || '',
+ isModalOpen: !state.isModalOpen,
+ currentRewrite: payload.currentRewrite,
+ };
+ return newState;
+ }
+
const newState = {
...state,
isModalOpen: !state.isModalOpen,
@@ -42,7 +62,10 @@ const rewrites = handleActions(
processing: true,
processingAdd: false,
processingDelete: false,
+ processingUpdate: false,
isModalOpen: false,
+ modalType: '',
+ currentRewrite: {},
list: [],
},
);
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57ab408e..6424faf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -82,6 +82,5 @@ CMD [ \
"/opt/adguardhome/AdGuardHome", \
"--no-check-update", \
"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
- "-h", "0.0.0.0", \
"-w", "/opt/adguardhome/work" \
]
diff --git a/docker/web-bind.awk b/docker/web-bind.awk
index d3c94abf..2ae64a4c 100644
--- a/docker/web-bind.awk
+++ b/docker/web-bind.awk
@@ -1,13 +1,5 @@
# Don't consider the HTTPS hostname since the enforced HTTPS redirection should
# work if the SSL check skipped. See file docker/healthcheck.sh.
-/^bind_host:/ { host = $2 }
+/^[^[:space:]]/ { is_http = /^http:/ }
-/^bind_port:/ { port = $2 }
-
-END {
- if (match(host, ":")) {
- print "http://[" host "]:" port
- } else {
- print "http://" host ":" port
- }
-}
+/^[[:space:]]+address:/ { if (is_http) print "http://" $2 }
diff --git a/go.mod b/go.mod
index 9c396d7d..80479193 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,9 @@ module github.com/AdguardTeam/AdGuardHome
go 1.19
require (
- github.com/AdguardTeam/dnsproxy v0.50.2
- github.com/AdguardTeam/golibs v0.13.2
+ // TODO(a.garipov): Update to a tagged version when it's released.
+ github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768
+ github.com/AdguardTeam/golibs v0.13.3
github.com/AdguardTeam/urlfilter v0.16.1
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.7
@@ -15,7 +16,7 @@ require (
github.com/google/gopacket v1.1.19
github.com/google/renameio v1.0.1
github.com/google/uuid v1.3.0
- github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb
+ github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
github.com/kardianos/service v1.2.2
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
@@ -24,15 +25,15 @@ require (
// TODO(a.garipov): This package is deprecated; find a new one or use our
// own code for that. Perhaps, use gopacket.
github.com/mdlayher/raw v0.1.0
- github.com/miekg/dns v1.1.54
+ github.com/miekg/dns v1.1.55
github.com/quic-go/quic-go v0.35.1
- github.com/stretchr/testify v1.8.2
+ github.com/stretchr/testify v1.8.4
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
- golang.org/x/crypto v0.9.0
- golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
- golang.org/x/net v0.10.0
- golang.org/x/sys v0.8.0
+ golang.org/x/crypto v0.10.0
+ golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
+ golang.org/x/net v0.11.0
+ golang.org/x/sys v0.9.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v3 v3.0.1
howett.net/plist v1.0.0
@@ -49,17 +50,17 @@ require (
github.com/golang/mock v1.6.0 // indirect
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
- github.com/onsi/ginkgo/v2 v2.10.0 // indirect
+ github.com/onsi/ginkgo/v2 v2.11.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
- github.com/pierrec/lz4/v4 v4.1.17 // indirect
+ github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
- golang.org/x/mod v0.10.0 // indirect
- golang.org/x/sync v0.2.0 // indirect
- golang.org/x/text v0.9.0 // indirect
- golang.org/x/tools v0.9.3 // indirect
+ golang.org/x/mod v0.11.0 // indirect
+ golang.org/x/sync v0.3.0 // indirect
+ golang.org/x/text v0.10.0 // indirect
+ golang.org/x/tools v0.10.0 // indirect
)
diff --git a/go.sum b/go.sum
index 447fe966..9b266b14 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/AdguardTeam/dnsproxy v0.50.2 h1:p1471SsMZ6SMo7T51Olw4aNluahvMwSLMorwxYV18ts=
-github.com/AdguardTeam/dnsproxy v0.50.2/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
+github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768 h1:5Ia6wA+tqAlTyzuaOVGSlHmb0osLWXeJUs3NxCuC4gA=
+github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
-github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=
-github.com/AdguardTeam/golibs v0.13.2/go.mod h1:7ylQLv2Lqsc3UW3jHoITynYk6Y1tYtgEMkR09ppfsN8=
+github.com/AdguardTeam/golibs v0.13.3 h1:RT3QbzThtaLiFLkIUDS6/hlGEXrh0zYvdf4bd7UWpGo=
+github.com/AdguardTeam/golibs v0.13.3/go.mod h1:wkJ6EUsN4np/9Gp7+9QeooY9E2U2WCLJYAioLCzkHsI=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
@@ -56,8 +56,8 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
-github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb h1:6fDKEAXwe3rsfS4khW3EZ8kEqmSiV9szhMPcDrD+Y7Q=
-github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
+github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df h1:pF1MMIzEJzJ/MyI4bXYXVYyN8CJgoQ2PPKT2z3O/Cl4=
+github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
@@ -83,18 +83,18 @@ github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
-github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
+github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
-github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
-github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
+github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
+github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
+github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -111,17 +111,13 @@ github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5
github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8=
@@ -136,15 +132,15 @@ go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
+golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -154,12 +150,12 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
+golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -179,22 +175,22 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
+golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
+golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/aghnet/hostscontainer.go b/internal/aghnet/hostscontainer.go
index 2f4f20b8..2fecbc6f 100644
--- a/internal/aghnet/hostscontainer.go
+++ b/internal/aghnet/hostscontainer.go
@@ -56,15 +56,20 @@ func (rm *requestMatcher) MatchRequest(
) (res *urlfilter.DNSResult, ok bool) {
switch req.DNSType {
case dns.TypeA, dns.TypeAAAA, dns.TypePTR:
- log.Debug("%s: handling the request for %s", hostsContainerPrefix, req.Hostname)
+ log.Debug(
+ "%s: handling %s request for %s",
+ hostsContainerPrefix,
+ dns.Type(req.DNSType),
+ req.Hostname,
+ )
+
+ rm.stateLock.RLock()
+ defer rm.stateLock.RUnlock()
+
+ return rm.engine.MatchRequest(req)
default:
return nil, false
}
-
- rm.stateLock.RLock()
- defer rm.stateLock.RUnlock()
-
- return rm.engine.MatchRequest(req)
}
// Translate returns the source hosts-syntax rule for the generated dnsrewrite
@@ -96,6 +101,8 @@ const hostsContainerPrefix = "hosts container"
// HostsContainer stores the relevant hosts database provided by the OS and
// processes both A/AAAA and PTR DNS requests for those.
+//
+// TODO(e.burkov): Improve API and move to golibs.
type HostsContainer struct {
// requestMatcher matches the requests and translates the rules. It's
// embedded to implement MatchRequest and Translate for *HostsContainer.
diff --git a/internal/dhcpd/bitset.go b/internal/dhcpd/bitset.go
index e726319c..7459c2f1 100644
--- a/internal/dhcpd/bitset.go
+++ b/internal/dhcpd/bitset.go
@@ -25,11 +25,8 @@ func (s *bitSet) isSet(n uint64) (ok bool) {
var word uint64
word, ok = s.words[wordIdx]
- if !ok {
- return false
- }
- return word&(1<
0
useDefault, err := validateUpstream(upstreamAddr, domains)
if err != nil {
- return fmt.Errorf("wrong upstream format: %w", err)
+ return nil, specific, fmt.Errorf("wrong upstream format: %w", err)
} else if useDefault {
- return nil
- }
-
- if len(bootstrap) == 0 {
- bootstrap = defaultBootstrap
+ return nil, specific, nil
}
log.Debug("dnsforward: checking if upstream %q works", upstreamAddr)
- u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{
- Bootstrap: bootstrap,
- Timeout: timeout,
- PreferIPv6: bootstrapPrefIPv6,
- })
+ opts = &upstream.Options{
+ Bootstrap: opts.Bootstrap,
+ Timeout: opts.Timeout,
+ PreferIPv6: opts.PreferIPv6,
+ }
+
+ if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil {
+ resolved := s.resolveUpstreamHost(extractUpstreamHost(upstreamAddr))
+ sortNetIPAddrs(resolved, opts.PreferIPv6)
+ opts.ServerIPAddrs = resolved
+ }
+ u, err = upstream.AddressToUpstream(upstreamAddr, opts)
if err != nil {
- return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err)
+ return nil, specific, fmt.Errorf("creating upstream for %q: %w", upstreamAddr, err)
+ }
+
+ return u, specific, nil
+}
+
+func (s *Server) checkDNS(line string, opts *upstream.Options, check healthCheckFunc) (err error) {
+ if IsCommentOrEmpty(line) {
+ return nil
+ }
+
+ var u upstream.Upstream
+ var specific bool
+ defer func() {
+ if err != nil && specific {
+ err = domainSpecificTestError{error: err}
+ }
+ }()
+
+ u, specific, err = s.parseUpstreamLine(line, opts)
+ if err != nil || u == nil {
+ return err
}
defer func() { err = errors.WithDeferred(err, u.Close()) }()
- if err = healthCheck(u); err != nil {
- err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
- if domains != nil {
- return domainSpecificTestError{error: err}
- }
-
- return err
- }
-
- log.Debug("dnsforward: upstream %q is ok", upstreamAddr)
-
- return nil
+ return check(u)
}
func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
@@ -699,47 +708,54 @@ func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
return
}
- result := map[string]string{}
- bootstraps := req.BootstrapDNS
- bootstrapPrefIPv6 := s.conf.BootstrapPreferIPv6
- timeout := s.conf.UpstreamTimeout
+ opts := &upstream.Options{
+ Bootstrap: req.BootstrapDNS,
+ Timeout: s.conf.UpstreamTimeout,
+ PreferIPv6: s.conf.BootstrapPreferIPv6,
+ }
+ if len(opts.Bootstrap) == 0 {
+ opts.Bootstrap = defaultBootstrap
+ }
type upsCheckResult = struct {
- res string
+ err error
host string
}
+ req.Upstreams = stringutil.FilterOut(req.Upstreams, IsCommentOrEmpty)
+ req.PrivateUpstreams = stringutil.FilterOut(req.PrivateUpstreams, IsCommentOrEmpty)
+
upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
+ result := make(map[string]string, upsNum)
resCh := make(chan upsCheckResult, upsNum)
- checkUps := func(ups string, healthCheck healthCheckFunc) {
- res := upsCheckResult{
- host: ups,
- }
- defer func() { resCh <- res }()
-
- checkErr := checkDNS(ups, bootstraps, bootstrapPrefIPv6, timeout, healthCheck)
- if checkErr != nil {
- res.res = checkErr.Error()
- } else {
- res.res = "OK"
- }
- }
-
for _, ups := range req.Upstreams {
- go checkUps(ups, checkDNSUpstreamExc)
+ go func(ups string) {
+ resCh <- upsCheckResult{
+ host: ups,
+ err: s.checkDNS(ups, opts, checkDNSUpstreamExc),
+ }
+ }(ups)
}
for _, ups := range req.PrivateUpstreams {
- go checkUps(ups, checkPrivateUpstreamExc)
+ go func(ups string) {
+ resCh <- upsCheckResult{
+ host: ups,
+ err: s.checkDNS(ups, opts, checkPrivateUpstreamExc),
+ }
+ }(ups)
}
for i := 0; i < upsNum; i++ {
- pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
- result[pair.host] = pair.res
+ pair := <-resCh
+ if pair.err != nil {
+ result[pair.host] = pair.err.Error()
+ } else {
+ result[pair.host] = "OK"
+ }
}
- close(resCh)
_ = aghhttp.WriteJSONResponse(w, r, result)
}
diff --git a/internal/dnsforward/http_test.go b/internal/dnsforward/http_test.go
index c9846ae4..38d8a766 100644
--- a/internal/dnsforward/http_test.go
+++ b/internal/dnsforward/http_test.go
@@ -13,10 +13,12 @@ import (
"path/filepath"
"strings"
"testing"
+ "testing/fstest"
"time"
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
+ "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/golibs/httphdr"
"github.com/AdguardTeam/golibs/netutil"
@@ -280,6 +282,10 @@ func TestIsCommentOrEmpty(t *testing.T) {
}
func TestValidateUpstreams(t *testing.T) {
+ const sdnsStamp = `sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_J` +
+ `S3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczE` +
+ `uYWRndWFyZC5jb20`
+
testCases := []struct {
name string
wantErr string
@@ -300,7 +306,7 @@ func TestValidateUpstreams(t *testing.T) {
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
- "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
+ "[/host/]" + sdnsStamp,
},
}, {
name: "with_default",
@@ -310,7 +316,7 @@ func TestValidateUpstreams(t *testing.T) {
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
- "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
+ "[/host/]" + sdnsStamp,
"8.8.8.8",
},
}, {
@@ -326,9 +332,10 @@ func TestValidateUpstreams(t *testing.T) {
wantErr: `validating upstream "123.3.7m": not an ip:port`,
set: []string{"123.3.7m"},
}, {
- name: "invalid",
- wantErr: `bad upstream for domain "[/host.com]tls://dns.adguard.com": missing separator`,
- set: []string{"[/host.com]tls://dns.adguard.com"},
+ name: "invalid",
+ wantErr: `bad upstream for domain "[/host.com]tls://dns.adguard.com": ` +
+ `missing separator`,
+ set: []string{"[/host.com]tls://dns.adguard.com"},
}, {
name: "invalid",
wantErr: `validating upstream "[host.ru]#": not an ip:port`,
@@ -340,14 +347,14 @@ func TestValidateUpstreams(t *testing.T) {
"1.1.1.1",
"tls://1.1.1.1",
"https://dns.adguard.com/dns-query",
- "sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
+ sdnsStamp,
"udp://dns.google",
"udp://8.8.8.8",
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
- "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
+ "[/host/]" + sdnsStamp,
"[/пример.рф/]8.8.8.8",
},
}, {
@@ -418,27 +425,28 @@ func TestValidateUpstreamsPrivate(t *testing.T) {
}
}
-func newLocalUpstreamListener(t *testing.T, port int, handler dns.Handler) (real net.Addr) {
+func newLocalUpstreamListener(t *testing.T, port uint16, handler dns.Handler) (real netip.AddrPort) {
+ t.Helper()
+
startCh := make(chan struct{})
upsSrv := &dns.Server{
- Addr: netip.AddrPortFrom(netutil.IPv4Localhost(), uint16(port)).String(),
+ Addr: netip.AddrPortFrom(netutil.IPv4Localhost(), port).String(),
Net: "tcp",
Handler: handler,
NotifyStartedFunc: func() { close(startCh) },
}
go func() {
- t := testutil.PanicT{}
-
err := upsSrv.ListenAndServe()
- require.NoError(t, err)
+ require.NoError(testutil.PanicT{}, err)
}()
+
<-startCh
testutil.CleanupAndRequireSuccess(t, upsSrv.Shutdown)
- return upsSrv.Listener.Addr()
+ return testutil.RequireTypeAssert[*net.TCPAddr](t, upsSrv.Listener.Addr()).AddrPort()
}
-func TestServer_handleTestUpstreaDNS(t *testing.T) {
+func TestServer_HandleTestUpstreamDNS(t *testing.T) {
goodHandler := dns.HandlerFunc(func(w dns.ResponseWriter, m *dns.Msg) {
err := w.WriteMsg(new(dns.Msg).SetReply(m))
require.NoError(testutil.PanicT{}, err)
@@ -457,9 +465,38 @@ func TestServer_handleTestUpstreaDNS(t *testing.T) {
Host: newLocalUpstreamListener(t, 0, badHandler).String(),
}).String()
- const upsTimeout = 100 * time.Millisecond
+ const (
+ upsTimeout = 100 * time.Millisecond
- srv := createTestServer(t, &filtering.Config{}, ServerConfig{
+ hostsFileName = "hosts"
+ upstreamHost = "custom.localhost"
+ )
+
+ hostsListener := newLocalUpstreamListener(t, 0, goodHandler)
+ hostsUps := (&url.URL{
+ Scheme: "tcp",
+ Host: netutil.JoinHostPort(upstreamHost, int(hostsListener.Port())),
+ }).String()
+
+ hc, err := aghnet.NewHostsContainer(
+ filtering.SysHostsListID,
+ fstest.MapFS{
+ hostsFileName: &fstest.MapFile{
+ Data: []byte(hostsListener.Addr().String() + " " + upstreamHost),
+ },
+ },
+ &aghtest.FSWatcher{
+ OnEvents: func() (e <-chan struct{}) { return nil },
+ OnAdd: func(_ string) (err error) { return nil },
+ OnClose: func() (err error) { return nil },
+ },
+ hostsFileName,
+ )
+ require.NoError(t, err)
+
+ srv := createTestServer(t, &filtering.Config{
+ EtcHosts: hc,
+ }, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
UpstreamTimeout: upsTimeout,
@@ -486,8 +523,7 @@ func TestServer_handleTestUpstreaDNS(t *testing.T) {
"upstream_dns": []string{badUps},
},
wantResp: map[string]any{
- badUps: `upstream "` + badUps + `" fails to exchange: ` +
- `couldn't communicate with upstream: exchanging with ` +
+ badUps: `couldn't communicate with upstream: exchanging with ` +
badUps + ` over tcp: dns: id mismatch`,
},
name: "broken",
@@ -497,20 +533,40 @@ func TestServer_handleTestUpstreaDNS(t *testing.T) {
},
wantResp: map[string]any{
goodUps: "OK",
- badUps: `upstream "` + badUps + `" fails to exchange: ` +
- `couldn't communicate with upstream: exchanging with ` +
+ badUps: `couldn't communicate with upstream: exchanging with ` +
badUps + ` over tcp: dns: id mismatch`,
},
name: "both",
+ }, {
+ body: map[string]any{
+ "upstream_dns": []string{"[/domain.example/]" + badUps},
+ },
+ wantResp: map[string]any{
+ "[/domain.example/]" + badUps: `WARNING: couldn't communicate ` +
+ `with upstream: exchanging with ` + badUps + ` over tcp: ` +
+ `dns: id mismatch`,
+ },
+ name: "domain_specific_error",
+ }, {
+ body: map[string]any{
+ "upstream_dns": []string{hostsUps},
+ },
+ wantResp: map[string]any{
+ hostsUps: "OK",
+ },
+ name: "etc_hosts",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
- reqBody, err := json.Marshal(tc.body)
+ var reqBody []byte
+ reqBody, err = json.Marshal(tc.body)
require.NoError(t, err)
w := httptest.NewRecorder()
- r, err := http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
+
+ var r *http.Request
+ r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
require.NoError(t, err)
srv.handleTestUpstreamDNS(w, r)
@@ -538,11 +594,15 @@ func TestServer_handleTestUpstreaDNS(t *testing.T) {
req := map[string]any{
"upstream_dns": []string{sleepyUps},
}
- reqBody, err := json.Marshal(req)
+
+ var reqBody []byte
+ reqBody, err = json.Marshal(req)
require.NoError(t, err)
w := httptest.NewRecorder()
- r, err := http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
+
+ var r *http.Request
+ r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
require.NoError(t, err)
srv.handleTestUpstreamDNS(w, r)
diff --git a/internal/dnsforward/ipset.go b/internal/dnsforward/ipset.go
index 1aca3077..4330eb4b 100644
--- a/internal/dnsforward/ipset.go
+++ b/internal/dnsforward/ipset.go
@@ -110,6 +110,9 @@ func ipsFromAnswer(ans []dns.RR) (ip4s, ip6s []net.IP) {
// process adds the resolved IP addresses to the domain's ipsets, if any.
func (c *ipsetCtx) process(dctx *dnsContext) (rc resultCode) {
+ log.Debug("dnsforward: ipset: started processing")
+ defer log.Debug("dnsforward: ipset: finished processing")
+
if c.skipIpsetProcessing(dctx) {
return resultCodeSuccess
}
@@ -125,12 +128,12 @@ func (c *ipsetCtx) process(dctx *dnsContext) (rc resultCode) {
n, err := c.ipsetMgr.Add(host, ip4s, ip6s)
if err != nil {
// Consider ipset errors non-critical to the request.
- log.Error("ipset: adding host ips: %s", err)
+ log.Error("dnsforward: ipset: adding host ips: %s", err)
return resultCodeSuccess
}
- log.Debug("ipset: added %d new ipset entries", n)
+ log.Debug("dnsforward: ipset: added %d new ipset entries", n)
return resultCodeSuccess
}
diff --git a/internal/dnsforward/msg.go b/internal/dnsforward/msg.go
index e6bd178e..36c82f0b 100644
--- a/internal/dnsforward/msg.go
+++ b/internal/dnsforward/msg.go
@@ -57,16 +57,13 @@ func (s *Server) genDNSFilterMessage(
return s.genBlockedHost(req, s.conf.SafeBrowsingBlockHost, dctx)
case filtering.FilteredParental:
return s.genBlockedHost(req, s.conf.ParentalBlockHost, dctx)
+ case filtering.FilteredSafeSearch:
+ // If Safe Search generated the necessary IP addresses, use them.
+ // Otherwise, if there were no errors, there are no addresses for the
+ // requested IP version, so produce a NODATA response.
+ return s.genResponseWithIPs(req, ipsFromRules(res.Rules))
default:
- // If the query was filtered by Safe Search, filtering also must return
- // the IP addresses that must be used in response. Return them
- // regardless of the filtering method.
- ips := ipsFromRules(res.Rules)
- if res.Reason == filtering.FilteredSafeSearch && len(ips) > 0 {
- return s.genResponseWithIPs(req, ips)
- }
-
- return s.genForBlockingMode(req, ips)
+ return s.genForBlockingMode(req, ipsFromRules(res.Rules))
}
}
diff --git a/internal/dnsforward/stats.go b/internal/dnsforward/stats.go
index 8557205b..4d4f1324 100644
--- a/internal/dnsforward/stats.go
+++ b/internal/dnsforward/stats.go
@@ -17,60 +17,78 @@ import (
// Write Stats data and logs
func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
+ log.Debug("dnsforward: started processing querylog and stats")
+ defer log.Debug("dnsforward: finished processing querylog and stats")
+
elapsed := time.Since(dctx.startTime)
pctx := dctx.proxyCtx
- shouldLog := true
- msg := pctx.Req
- q := msg.Question[0]
+ q := pctx.Req.Question[0]
host := strings.ToLower(strings.TrimSuffix(q.Name, "."))
- // don't log ANY request if refuseAny is enabled
- if q.Qtype == dns.TypeANY && s.conf.RefuseAny {
- shouldLog = false
- }
-
ip, _ := netutil.IPAndPortFromAddr(pctx.Addr)
ip = slices.Clone(ip)
-
- s.serverLock.RLock()
- defer s.serverLock.RUnlock()
-
s.anonymizer.Load()(ip)
- log.Debug("client ip: %s", ip)
+ log.Debug("dnsforward: client ip for stats and querylog: %s", ip)
ipStr := ip.String()
ids := []string{ipStr, dctx.clientID}
+ qt, cl := q.Qtype, q.Qclass
// Synchronize access to s.queryLog and s.stats so they won't be suddenly
// uninitialized while in use. This can happen after proxy server has been
// stopped, but its workers haven't yet exited.
- if shouldLog &&
- s.queryLog != nil &&
- // TODO(s.chzhen): Use dnsforward.dnsContext when it will start
- // containing persistent client.
- s.queryLog.ShouldLog(host, q.Qtype, q.Qclass, ids) {
+ s.serverLock.RLock()
+ defer s.serverLock.RUnlock()
+
+ if s.shouldLog(host, qt, cl, ids) {
s.logQuery(dctx, pctx, elapsed, ip)
} else {
log.Debug(
- "dnsforward: request %s %s from %s ignored; not logging",
- dns.Type(q.Qtype),
+ "dnsforward: request %s %s %q from %s ignored; not adding to querylog",
+ dns.Class(cl),
+ dns.Type(qt),
host,
ip,
)
}
- if s.stats != nil &&
- // TODO(s.chzhen): Use dnsforward.dnsContext when it will start
- // containing persistent client.
- s.stats.ShouldCount(host, q.Qtype, q.Qclass, ids) {
+ if s.shouldCountStat(host, qt, cl, ids) {
s.updateStats(dctx, elapsed, *dctx.result, ipStr)
+ } else {
+ log.Debug(
+ "dnsforward: request %s %s %q from %s ignored; not counting in stats",
+ dns.Class(cl),
+ dns.Type(qt),
+ host,
+ ip,
+ )
}
return resultCodeSuccess
}
+// shouldLog returns true if the query with the given data should be logged in
+// the query log. s.serverLock is expected to be locked.
+func (s *Server) shouldLog(host string, qt, cl uint16, ids []string) (ok bool) {
+ if qt == dns.TypeANY && s.conf.RefuseAny {
+ return false
+ }
+
+ // TODO(s.chzhen): Use dnsforward.dnsContext when it will start containing
+ // persistent client.
+ return s.queryLog != nil && s.queryLog.ShouldLog(host, qt, cl, ids)
+}
+
+// shouldCountStat returns true if the query with the given data should be
+// counted in the statistics. s.serverLock is expected to be locked.
+func (s *Server) shouldCountStat(host string, qt, cl uint16, ids []string) (ok bool) {
+ // TODO(s.chzhen): Use dnsforward.dnsContext when it will start containing
+ // persistent client.
+ return s.stats != nil && s.stats.ShouldCount(host, qt, cl, ids)
+}
+
// logQuery pushes the request details into the query log.
func (s *Server) logQuery(
dctx *dnsContext,
@@ -123,7 +141,10 @@ func (s *Server) updateStats(
pctx := ctx.proxyCtx
e := stats.Entry{}
e.Domain = strings.ToLower(pctx.Req.Question[0].Name)
- e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
+ if e.Domain != "." {
+ // Remove last ".", but save the domain as is for "." queries.
+ e.Domain = e.Domain[:len(e.Domain)-1]
+ }
if clientID := ctx.clientID; clientID != "" {
e.Client = clientID
diff --git a/internal/dnsforward/stats_test.go b/internal/dnsforward/stats_test.go
index 3d793f7a..49cfb68a 100644
--- a/internal/dnsforward/stats_test.go
+++ b/internal/dnsforward/stats_test.go
@@ -46,6 +46,10 @@ type testStats struct {
// Update implements the [stats.Interface] interface for *testStats.
func (l *testStats) Update(e stats.Entry) {
+ if e.Domain == "" {
+ return
+ }
+
l.lastEntry = e
}
@@ -54,9 +58,12 @@ func (l *testStats) ShouldCount(string, uint16, uint16, []string) bool {
return true
}
-func TestProcessQueryLogsAndStats(t *testing.T) {
+func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
+ const domain = "example.com."
+
testCases := []struct {
name string
+ domain string
proto proxy.Proto
addr net.Addr
clientID string
@@ -67,6 +74,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult stats.Result
}{{
name: "success_udp",
+ domain: domain,
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -77,6 +85,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_tls_clientid",
+ domain: domain,
proto: proxy.ProtoTLS,
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "cli42",
@@ -87,6 +96,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_tls",
+ domain: domain,
proto: proxy.ProtoTLS,
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -97,6 +107,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_quic",
+ domain: domain,
proto: proxy.ProtoQUIC,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -107,6 +118,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_https",
+ domain: domain,
proto: proxy.ProtoHTTPS,
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -117,6 +129,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_dnscrypt",
+ domain: domain,
proto: proxy.ProtoDNSCrypt,
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -127,6 +140,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RNotFiltered,
}, {
name: "success_udp_filtered",
+ domain: domain,
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -137,6 +151,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RFiltered,
}, {
name: "success_udp_sb",
+ domain: domain,
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -147,6 +162,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RSafeBrowsing,
}, {
name: "success_udp_ss",
+ domain: domain,
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -157,6 +173,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantStatResult: stats.RSafeSearch,
}, {
name: "success_udp_pc",
+ domain: domain,
proto: proxy.ProtoUDP,
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
clientID: "",
@@ -165,6 +182,17 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
wantCode: resultCodeSuccess,
reason: filtering.FilteredParental,
wantStatResult: stats.RParental,
+ }, {
+ name: "success_udp_pc_empty_fqdn",
+ domain: ".",
+ proto: proxy.ProtoUDP,
+ addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 5}, Port: 1234},
+ clientID: "",
+ wantLogProto: "",
+ wantStatClient: "1.2.3.5",
+ wantCode: resultCodeSuccess,
+ reason: filtering.FilteredParental,
+ wantStatResult: stats.RParental,
}}
ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
@@ -181,7 +209,7 @@ func TestProcessQueryLogsAndStats(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
req := &dns.Msg{
Question: []dns.Question{{
- Name: "example.com.",
+ Name: tc.domain,
}},
}
pctx := &proxy.DNSContext{
diff --git a/internal/dnsforward/upstreams.go b/internal/dnsforward/upstreams.go
new file mode 100644
index 00000000..cbd92b36
--- /dev/null
+++ b/internal/dnsforward/upstreams.go
@@ -0,0 +1,311 @@
+package dnsforward
+
+import (
+ "bytes"
+ "fmt"
+ "net"
+ "net/url"
+ "os"
+ "strings"
+ "time"
+
+ "github.com/AdguardTeam/dnsproxy/proxy"
+ "github.com/AdguardTeam/dnsproxy/upstream"
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/AdguardTeam/golibs/netutil"
+ "github.com/AdguardTeam/golibs/stringutil"
+ "github.com/AdguardTeam/urlfilter"
+ "github.com/miekg/dns"
+ "golang.org/x/exp/maps"
+ "golang.org/x/exp/slices"
+)
+
+// loadUpstreams parses upstream DNS servers from the configured file or from
+// the configuration itself.
+func (s *Server) loadUpstreams() (upstreams []string, err error) {
+ if s.conf.UpstreamDNSFileName == "" {
+ return stringutil.FilterOut(s.conf.UpstreamDNS, IsCommentOrEmpty), nil
+ }
+
+ var data []byte
+ data, err = os.ReadFile(s.conf.UpstreamDNSFileName)
+ if err != nil {
+ return nil, fmt.Errorf("reading upstream from file: %w", err)
+ }
+
+ upstreams = stringutil.SplitTrimmed(string(data), "\n")
+
+ log.Debug("dnsforward: got %d upstreams in %q", len(upstreams), s.conf.UpstreamDNSFileName)
+
+ return stringutil.FilterOut(upstreams, IsCommentOrEmpty), nil
+}
+
+// prepareUpstreamSettings sets upstream DNS server settings.
+func (s *Server) prepareUpstreamSettings() (err error) {
+ // We're setting a customized set of RootCAs. The reason is that Go default
+ // mechanism of loading TLS roots does not always work properly on some
+ // routers so we're loading roots manually and pass it here.
+ //
+ // See [aghtls.SystemRootCAs].
+ upstream.RootCAs = s.conf.TLSv12Roots
+ upstream.CipherSuites = s.conf.TLSCiphers
+
+ // Load upstreams either from the file, or from the settings
+ var upstreams []string
+ upstreams, err = s.loadUpstreams()
+ if err != nil {
+ return fmt.Errorf("loading upstreams: %w", err)
+ }
+
+ s.conf.UpstreamConfig, err = s.prepareUpstreamConfig(upstreams, defaultDNS, &upstream.Options{
+ Bootstrap: s.conf.BootstrapDNS,
+ Timeout: s.conf.UpstreamTimeout,
+ HTTPVersions: UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams),
+ PreferIPv6: s.conf.BootstrapPreferIPv6,
+ })
+ if err != nil {
+ return fmt.Errorf("preparing upstream config: %w", err)
+ }
+
+ return nil
+}
+
+// prepareUpstreamConfig sets upstream configuration based on upstreams and
+// configuration of s.
+func (s *Server) prepareUpstreamConfig(
+ upstreams []string,
+ defaultUpstreams []string,
+ opts *upstream.Options,
+) (uc *proxy.UpstreamConfig, err error) {
+ uc, err = proxy.ParseUpstreamsConfig(upstreams, opts)
+ if err != nil {
+ return nil, fmt.Errorf("parsing upstream config: %w", err)
+ }
+
+ if len(uc.Upstreams) == 0 && defaultUpstreams != nil {
+ log.Info("dnsforward: warning: no default upstreams specified, using %v", defaultUpstreams)
+ var defaultUpstreamConfig *proxy.UpstreamConfig
+ defaultUpstreamConfig, err = proxy.ParseUpstreamsConfig(defaultUpstreams, opts)
+ if err != nil {
+ return nil, fmt.Errorf("parsing default upstreams: %w", err)
+ }
+
+ uc.Upstreams = defaultUpstreamConfig.Upstreams
+ }
+
+ if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil {
+ err = s.replaceUpstreamsWithHosts(uc, opts)
+ if err != nil {
+ return nil, fmt.Errorf("resolving upstreams with hosts: %w", err)
+ }
+ }
+
+ return uc, nil
+}
+
+// replaceUpstreamsWithHosts replaces unique upstreams with their resolved
+// versions based on the system hosts file.
+//
+// TODO(e.burkov): This should be performed inside dnsproxy, which should
+// actually consider /etc/hosts. See TODO on [aghnet.HostsContainer].
+func (s *Server) replaceUpstreamsWithHosts(
+ upsConf *proxy.UpstreamConfig,
+ opts *upstream.Options,
+) (err error) {
+ resolved := map[string]*upstream.Options{}
+
+ err = s.resolveUpstreamsWithHosts(resolved, upsConf.Upstreams, opts)
+ if err != nil {
+ return fmt.Errorf("resolving upstreams: %w", err)
+ }
+
+ hosts := maps.Keys(upsConf.DomainReservedUpstreams)
+ // TODO(e.burkov): Think of extracting sorted range into an util function.
+ slices.Sort(hosts)
+ for _, host := range hosts {
+ err = s.resolveUpstreamsWithHosts(resolved, upsConf.DomainReservedUpstreams[host], opts)
+ if err != nil {
+ return fmt.Errorf("resolving upstreams reserved for %s: %w", host, err)
+ }
+ }
+
+ hosts = maps.Keys(upsConf.SpecifiedDomainUpstreams)
+ slices.Sort(hosts)
+ for _, host := range hosts {
+ err = s.resolveUpstreamsWithHosts(resolved, upsConf.SpecifiedDomainUpstreams[host], opts)
+ if err != nil {
+ return fmt.Errorf("resolving upstreams specific for %s: %w", host, err)
+ }
+ }
+
+ return nil
+}
+
+// resolveUpstreamsWithHosts resolves the IP addresses of each of the upstreams
+// and replaces those both in upstreams and resolved. Upstreams that failed to
+// resolve are placed to resolved as-is. This function only returns error of
+// upstreams closing.
+func (s *Server) resolveUpstreamsWithHosts(
+ resolved map[string]*upstream.Options,
+ upstreams []upstream.Upstream,
+ opts *upstream.Options,
+) (err error) {
+ for i := range upstreams {
+ u := upstreams[i]
+ addr := u.Address()
+ host := extractUpstreamHost(addr)
+
+ withIPs, ok := resolved[host]
+ if !ok {
+ ips := s.resolveUpstreamHost(host)
+ if len(ips) == 0 {
+ resolved[host] = nil
+
+ return nil
+ }
+
+ sortNetIPAddrs(ips, opts.PreferIPv6)
+
+ withIPs = opts.Clone()
+ withIPs.ServerIPAddrs = ips
+ resolved[host] = withIPs
+ } else if withIPs == nil {
+ continue
+ }
+
+ if err = u.Close(); err != nil {
+ return fmt.Errorf("closing upstream %s: %w", addr, err)
+ }
+
+ upstreams[i], err = upstream.AddressToUpstream(addr, withIPs)
+ if err != nil {
+ return fmt.Errorf("replacing upstream %s with resolved %s: %w", addr, host, err)
+ }
+
+ log.Debug("dnsforward: using %s for %s", withIPs.ServerIPAddrs, upstreams[i].Address())
+ }
+
+ return nil
+}
+
+// extractUpstreamHost returns the hostname of addr without port with an
+// assumption that any address passed here has already been successfully parsed
+// by [upstream.AddressToUpstream]. This function eesentially mirrors the logic
+// of [upstream.AddressToUpstream], see TODO on [replaceUpstreamsWithHosts].
+func extractUpstreamHost(addr string) (host string) {
+ var err error
+ if strings.Contains(addr, "://") {
+ var u *url.URL
+ u, err = url.Parse(addr)
+ if err != nil {
+ log.Debug("dnsforward: parsing upstream %s: %s", addr, err)
+
+ return addr
+ }
+
+ return u.Hostname()
+ }
+
+ // Probably, plain UDP upstream defined by address or address:port.
+ host, err = netutil.SplitHost(addr)
+ if err != nil {
+ return addr
+ }
+
+ return host
+}
+
+// resolveUpstreamHost returns the version of ups with IP addresses from the
+// system hosts file placed into its options.
+func (s *Server) resolveUpstreamHost(host string) (addrs []net.IP) {
+ req := &urlfilter.DNSRequest{
+ Hostname: host,
+ DNSType: dns.TypeA,
+ }
+ aRes, _ := s.dnsFilter.EtcHosts.MatchRequest(req)
+
+ req.DNSType = dns.TypeAAAA
+ aaaaRes, _ := s.dnsFilter.EtcHosts.MatchRequest(req)
+
+ var ips []net.IP
+ for _, rw := range append(aRes.DNSRewrites(), aaaaRes.DNSRewrites()...) {
+ dr := rw.DNSRewrite
+ if dr == nil || dr.Value == nil {
+ continue
+ }
+
+ if ip, ok := dr.Value.(net.IP); ok {
+ ips = append(ips, ip)
+ }
+ }
+
+ return ips
+}
+
+// sortNetIPAddrs sorts addrs in accordance with the protocol preferences.
+// Invalid addresses are sorted near the end.
+//
+// TODO(e.burkov): This function taken from dnsproxy, which also already
+// contains a few similar functions. Think of moving to golibs.
+func sortNetIPAddrs(addrs []net.IP, preferIPv6 bool) {
+ l := len(addrs)
+ if l <= 1 {
+ return
+ }
+
+ slices.SortStableFunc(addrs, func(addrA, addrB net.IP) (sortsBefore bool) {
+ switch len(addrA) {
+ case net.IPv4len, net.IPv6len:
+ switch len(addrB) {
+ case net.IPv4len, net.IPv6len:
+ // Go on.
+ default:
+ return true
+ }
+ default:
+ return false
+ }
+
+ if aIs4, bIs4 := addrA.To4() != nil, addrB.To4() != nil; aIs4 != bIs4 {
+ if aIs4 {
+ return !preferIPv6
+ }
+
+ return preferIPv6
+ }
+
+ return bytes.Compare(addrA, addrB) < 0
+ })
+}
+
+// UpstreamHTTPVersions returns the HTTP versions for upstream configuration
+// depending on configuration.
+func UpstreamHTTPVersions(http3 bool) (v []upstream.HTTPVersion) {
+ if !http3 {
+ return upstream.DefaultHTTPVersions
+ }
+
+ return []upstream.HTTPVersion{
+ upstream.HTTPVersion3,
+ upstream.HTTPVersion2,
+ upstream.HTTPVersion11,
+ }
+}
+
+// setProxyUpstreamMode sets the upstream mode and related settings in conf
+// based on provided parameters.
+func setProxyUpstreamMode(
+ conf *proxy.Config,
+ allServers bool,
+ fastestAddr bool,
+ fastestTimeout time.Duration,
+) {
+ if allServers {
+ conf.UpstreamMode = proxy.UModeParallel
+ } else if fastestAddr {
+ conf.UpstreamMode = proxy.UModeFastestAddr
+ conf.FastestPingTimeout = fastestTimeout
+ } else {
+ conf.UpstreamMode = proxy.UModeLoadBalance
+ }
+}
diff --git a/internal/filtering/blocked.go b/internal/filtering/blocked.go
index 4e4878aa..f403d0ab 100644
--- a/internal/filtering/blocked.go
+++ b/internal/filtering/blocked.go
@@ -2,9 +2,12 @@ package filtering
import (
"encoding/json"
+ "fmt"
"net/http"
+ "time"
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
+ "github.com/AdguardTeam/AdGuardHome/internal/schedule"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/urlfilter/rules"
"golang.org/x/exp/slices"
@@ -44,23 +47,57 @@ func initBlockedServices() {
log.Debug("filtering: initialized %d services", l)
}
-// BlockedSvcKnown returns true if a blocked service ID is known.
-func BlockedSvcKnown(s string) (ok bool) {
- _, ok = serviceRules[s]
+// BlockedServices is the configuration of blocked services.
+type BlockedServices struct {
+ // Schedule is blocked services schedule for every day of the week.
+ Schedule *schedule.Weekly `yaml:"schedule"`
- return ok
+ // IDs is the names of blocked services.
+ IDs []string `yaml:"ids"`
+}
+
+// Clone returns a deep copy of blocked services.
+func (s *BlockedServices) Clone() (c *BlockedServices) {
+ if s == nil {
+ return nil
+ }
+
+ return &BlockedServices{
+ Schedule: s.Schedule.Clone(),
+ IDs: slices.Clone(s.IDs),
+ }
+}
+
+// Validate returns an error if blocked services contain unknown service ID. s
+// must not be nil.
+func (s *BlockedServices) Validate() (err error) {
+ for _, id := range s.IDs {
+ _, ok := serviceRules[id]
+ if !ok {
+ return fmt.Errorf("unknown blocked-service %q", id)
+ }
+ }
+
+ return nil
}
// ApplyBlockedServices - set blocked services settings for this DNS request
-func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
+func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
+ d.confLock.RLock()
+ defer d.confLock.RUnlock()
+
setts.ServicesRules = []ServiceEntry{}
- if list == nil {
- d.confLock.RLock()
- defer d.confLock.RUnlock()
- list = d.Config.BlockedServices
+ bsvc := d.BlockedServices
+
+ // TODO(s.chzhen): Use startTime from [dnsforward.dnsContext].
+ if !bsvc.Schedule.Contains(time.Now()) {
+ d.ApplyBlockedServicesList(setts, bsvc.IDs)
}
+}
+// ApplyBlockedServicesList appends filtering rules to the settings.
+func (d *DNSFilter) ApplyBlockedServicesList(setts *Settings, list []string) {
for _, name := range list {
rules, ok := serviceRules[name]
if !ok {
@@ -90,7 +127,7 @@ func (d *DNSFilter) handleBlockedServicesAll(w http.ResponseWriter, r *http.Requ
func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
d.confLock.RLock()
- list := d.Config.BlockedServices
+ list := d.Config.BlockedServices.IDs
d.confLock.RUnlock()
_ = aghhttp.WriteJSONResponse(w, r, list)
@@ -106,7 +143,7 @@ func (d *DNSFilter) handleBlockedServicesSet(w http.ResponseWriter, r *http.Requ
}
d.confLock.Lock()
- d.Config.BlockedServices = list
+ d.Config.BlockedServices.IDs = list
d.confLock.Unlock()
log.Debug("Updated blocked services list: %d", len(list))
diff --git a/internal/filtering/filtering.go b/internal/filtering/filtering.go
index 5c30c645..e67c3a39 100644
--- a/internal/filtering/filtering.go
+++ b/internal/filtering/filtering.go
@@ -103,9 +103,9 @@ type Config struct {
Rewrites []*LegacyRewrite `yaml:"rewrites"`
- // Names of services to block (globally).
+ // BlockedServices is the configuration of blocked services.
// Per-client settings can override this configuration.
- BlockedServices []string `yaml:"blocked_services"`
+ BlockedServices *BlockedServices `yaml:"blocked_services"`
// EtcHosts is a container of IP-hostname pairs taken from the operating
// system configuration files (e.g. /etc/hosts).
@@ -298,12 +298,12 @@ func (d *DNSFilter) SetEnabled(enabled bool) {
atomic.StoreUint32(&d.enabled, mathutil.BoolToNumber[uint32](enabled))
}
-// GetConfig - get configuration
-func (d *DNSFilter) GetConfig() (s Settings) {
+// Settings returns filtering settings.
+func (d *DNSFilter) Settings() (s *Settings) {
d.confLock.RLock()
defer d.confLock.RUnlock()
- return Settings{
+ return &Settings{
FilteringEnabled: atomic.LoadUint32(&d.Config.enabled) != 0,
SafeSearchEnabled: d.Config.SafeSearchConf.Enabled,
SafeBrowsingEnabled: d.Config.SafeBrowsingEnabled,
@@ -519,7 +519,7 @@ func (d *DNSFilter) matchSysHosts(
dnsres, _ := d.EtcHosts.MatchRequest(&urlfilter.DNSRequest{
Hostname: host,
SortedClientTags: setts.ClientTags,
- // TODO(e.burkov): Wait for urlfilter update to pass net.IP.
+ // TODO(e.burkov): Wait for urlfilter update to pass netip.Addr.
ClientIP: setts.ClientIP.String(),
ClientName: setts.ClientName,
DNSType: qtype,
@@ -987,16 +987,13 @@ func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) {
return nil, fmt.Errorf("rewrites: preparing: %s", err)
}
- bsvcs := []string{}
- for _, s := range d.BlockedServices {
- if !BlockedSvcKnown(s) {
- log.Debug("skipping unknown blocked-service %q", s)
+ if d.BlockedServices != nil {
+ err = d.BlockedServices.Validate()
- continue
+ if err != nil {
+ return nil, fmt.Errorf("filtering: %w", err)
}
- bsvcs = append(bsvcs, s)
}
- d.BlockedServices = bsvcs
if blockFilters != nil {
err = d.initFiltering(nil, blockFilters)
diff --git a/internal/filtering/http.go b/internal/filtering/http.go
index e114be33..4aef0409 100644
--- a/internal/filtering/http.go
+++ b/internal/filtering/http.go
@@ -169,7 +169,7 @@ func (d *DNSFilter) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Requ
deleted = (*filters)[delIdx]
p := deleted.Path(d.DataDir)
err = os.Rename(p, p+".old")
- if err != nil {
+ if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)
return
@@ -416,12 +416,12 @@ type checkHostResp struct {
func (d *DNSFilter) handleCheckHost(w http.ResponseWriter, r *http.Request) {
host := r.URL.Query().Get("name")
- setts := d.GetConfig()
+ setts := d.Settings()
setts.FilteringEnabled = true
setts.ProtectionEnabled = true
- d.ApplyBlockedServices(&setts, nil)
- result, err := d.CheckHost(host, dns.TypeA, &setts)
+ d.ApplyBlockedServices(setts)
+ result, err := d.CheckHost(host, dns.TypeA, setts)
if err != nil {
aghhttp.Error(
r,
@@ -555,6 +555,7 @@ func (d *DNSFilter) RegisterFilteringHandlers() {
registerHTTP(http.MethodGet, "/control/rewrite/list", d.handleRewriteList)
registerHTTP(http.MethodPost, "/control/rewrite/add", d.handleRewriteAdd)
+ registerHTTP(http.MethodPut, "/control/rewrite/update", d.handleRewriteUpdate)
registerHTTP(http.MethodPost, "/control/rewrite/delete", d.handleRewriteDelete)
registerHTTP(http.MethodGet, "/control/blocked_services/services", d.handleBlockedServicesIDs)
diff --git a/internal/filtering/rewrite/storage.go b/internal/filtering/rewrite/storage.go
index 0afb8b6e..31b2e094 100644
--- a/internal/filtering/rewrite/storage.go
+++ b/internal/filtering/rewrite/storage.go
@@ -84,7 +84,7 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules.
return nil
}
- // TODO(a.garipov): Check cnames for cycles on initialisation.
+ // TODO(a.garipov): Check cnames for cycles on initialization.
cnames := stringutil.NewSet()
host := dReq.Hostname
for len(rrules) > 0 && rrules[0].DNSRewrite != nil && rrules[0].DNSRewrite.NewCNAME != "" {
diff --git a/internal/filtering/rewritehttp.go b/internal/filtering/rewritehttp.go
index 752979fe..fea5a650 100644
--- a/internal/filtering/rewritehttp.go
+++ b/internal/filtering/rewritehttp.go
@@ -6,6 +6,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
"github.com/AdguardTeam/golibs/log"
+ "golang.org/x/exp/slices"
)
// TODO(d.kolyshev): Use [rewrite.Item] instead.
@@ -91,3 +92,62 @@ func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request)
d.Config.ConfigModified()
}
+
+// rewriteUpdateJSON is a struct for JSON object with rewrite rule update info.
+type rewriteUpdateJSON struct {
+ Target rewriteEntryJSON `json:"target"`
+ Update rewriteEntryJSON `json:"update"`
+}
+
+// handleRewriteUpdate is the handler for the PUT /control/rewrite/update HTTP
+// API.
+func (d *DNSFilter) handleRewriteUpdate(w http.ResponseWriter, r *http.Request) {
+ updateJSON := rewriteUpdateJSON{}
+ err := json.NewDecoder(r.Body).Decode(&updateJSON)
+ if err != nil {
+ aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
+
+ return
+ }
+
+ rwDel := &LegacyRewrite{
+ Domain: updateJSON.Target.Domain,
+ Answer: updateJSON.Target.Answer,
+ }
+
+ rwAdd := &LegacyRewrite{
+ Domain: updateJSON.Update.Domain,
+ Answer: updateJSON.Update.Answer,
+ }
+
+ err = rwAdd.normalize()
+ if err != nil {
+ // Shouldn't happen currently, since normalize only returns a non-nil
+ // error when a rewrite is nil, but be change-proof.
+ aghhttp.Error(r, w, http.StatusBadRequest, "normalizing: %s", err)
+
+ return
+ }
+
+ index := -1
+ defer func() {
+ if index >= 0 {
+ d.Config.ConfigModified()
+ }
+ }()
+
+ d.confLock.Lock()
+ defer d.confLock.Unlock()
+
+ index = slices.IndexFunc(d.Config.Rewrites, rwDel.equal)
+ if index == -1 {
+ aghhttp.Error(r, w, http.StatusBadRequest, "target rule not found")
+
+ return
+ }
+
+ d.Config.Rewrites = slices.Replace(d.Config.Rewrites, index, index+1, rwAdd)
+
+ log.Debug("rewrite: removed element: %s -> %s", rwDel.Domain, rwDel.Answer)
+ log.Debug("rewrite: added element: %s -> %s", rwAdd.Domain, rwAdd.Answer)
+}
diff --git a/internal/filtering/rewritehttp_test.go b/internal/filtering/rewritehttp_test.go
new file mode 100644
index 00000000..93eef85a
--- /dev/null
+++ b/internal/filtering/rewritehttp_test.go
@@ -0,0 +1,237 @@
+package filtering_test
+
+import (
+ "bytes"
+ "encoding/json"
+ "io"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/internal/filtering"
+ "github.com/AdguardTeam/golibs/testutil"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+// TODO(d.kolyshev): Use [rewrite.Item] instead.
+type rewriteJSON struct {
+ Domain string `json:"domain"`
+ Answer string `json:"answer"`
+}
+
+type rewriteUpdateJSON struct {
+ Target rewriteJSON `json:"target"`
+ Update rewriteJSON `json:"update"`
+}
+
+const (
+ // testTimeout is the common timeout for tests.
+ testTimeout = 100 * time.Millisecond
+
+ listURL = "/control/rewrite/list"
+ addURL = "/control/rewrite/add"
+ deleteURL = "/control/rewrite/delete"
+ updateURL = "/control/rewrite/update"
+
+ decodeErrorMsg = "json.Decode: json: cannot unmarshal string into Go value of type" +
+ " filtering.rewriteEntryJSON\n"
+)
+
+func TestDNSFilter_handleRewriteHTTP(t *testing.T) {
+ confModCh := make(chan struct{})
+ reqCh := make(chan struct{})
+ testRewrites := []*rewriteJSON{
+ {Domain: "example.local", Answer: "example.rewrite"},
+ {Domain: "one.local", Answer: "one.rewrite"},
+ }
+
+ testRewritesJSON, mErr := json.Marshal(testRewrites)
+ require.NoError(t, mErr)
+
+ testCases := []struct {
+ reqData any
+ name string
+ url string
+ method string
+ wantList []*rewriteJSON
+ wantBody string
+ wantConfMod bool
+ wantStatus int
+ }{{
+ name: "list",
+ url: listURL,
+ method: http.MethodGet,
+ reqData: nil,
+ wantConfMod: false,
+ wantStatus: http.StatusOK,
+ wantBody: string(testRewritesJSON) + "\n",
+ wantList: testRewrites,
+ }, {
+ name: "add",
+ url: addURL,
+ method: http.MethodPost,
+ reqData: rewriteJSON{Domain: "add.local", Answer: "add.rewrite"},
+ wantConfMod: true,
+ wantStatus: http.StatusOK,
+ wantBody: "",
+ wantList: append(
+ testRewrites,
+ &rewriteJSON{Domain: "add.local", Answer: "add.rewrite"},
+ ),
+ }, {
+ name: "add_error",
+ url: addURL,
+ method: http.MethodPost,
+ reqData: "invalid_json",
+ wantConfMod: false,
+ wantStatus: http.StatusBadRequest,
+ wantBody: decodeErrorMsg,
+ wantList: testRewrites,
+ }, {
+ name: "delete",
+ url: deleteURL,
+ method: http.MethodPost,
+ reqData: rewriteJSON{Domain: "one.local", Answer: "one.rewrite"},
+ wantConfMod: true,
+ wantStatus: http.StatusOK,
+ wantBody: "",
+ wantList: []*rewriteJSON{{Domain: "example.local", Answer: "example.rewrite"}},
+ }, {
+ name: "delete_error",
+ url: deleteURL,
+ method: http.MethodPost,
+ reqData: "invalid_json",
+ wantConfMod: false,
+ wantStatus: http.StatusBadRequest,
+ wantBody: decodeErrorMsg,
+ wantList: testRewrites,
+ }, {
+ name: "update",
+ url: updateURL,
+ method: http.MethodPut,
+ reqData: rewriteUpdateJSON{
+ Target: rewriteJSON{Domain: "one.local", Answer: "one.rewrite"},
+ Update: rewriteJSON{Domain: "upd.local", Answer: "upd.rewrite"},
+ },
+ wantConfMod: true,
+ wantStatus: http.StatusOK,
+ wantBody: "",
+ wantList: []*rewriteJSON{
+ {Domain: "example.local", Answer: "example.rewrite"},
+ {Domain: "upd.local", Answer: "upd.rewrite"},
+ },
+ }, {
+ name: "update_error",
+ url: updateURL,
+ method: http.MethodPut,
+ reqData: "invalid_json",
+ wantConfMod: false,
+ wantStatus: http.StatusBadRequest,
+ wantBody: "json.Decode: json: cannot unmarshal string into Go value of type" +
+ " filtering.rewriteUpdateJSON\n",
+ wantList: testRewrites,
+ }, {
+ name: "update_error_target",
+ url: updateURL,
+ method: http.MethodPut,
+ reqData: rewriteUpdateJSON{
+ Target: rewriteJSON{Domain: "inv.local", Answer: "inv.rewrite"},
+ Update: rewriteJSON{Domain: "upd.local", Answer: "upd.rewrite"},
+ },
+ wantConfMod: false,
+ wantStatus: http.StatusBadRequest,
+ wantBody: "target rule not found\n",
+ wantList: testRewrites,
+ }}
+
+ for _, tc := range testCases {
+ onConfModified := func() {
+ if !tc.wantConfMod {
+ panic("config modified has been fired")
+ }
+
+ testutil.RequireSend(testutil.PanicT{}, confModCh, struct{}{}, testTimeout)
+ }
+
+ t.Run(tc.name, func(t *testing.T) {
+ handlers := make(map[string]http.Handler)
+
+ d, err := filtering.New(&filtering.Config{
+ ConfigModified: onConfModified,
+ HTTPRegister: func(_, url string, handler http.HandlerFunc) {
+ handlers[url] = handler
+ },
+ Rewrites: rewriteEntriesToLegacyRewrites(testRewrites),
+ }, nil)
+ require.NoError(t, err)
+ t.Cleanup(d.Close)
+
+ d.RegisterFilteringHandlers()
+ require.NotEmpty(t, handlers)
+ require.Contains(t, handlers, listURL)
+ require.Contains(t, handlers, tc.url)
+
+ var body io.Reader
+ if tc.reqData != nil {
+ data, rErr := json.Marshal(tc.reqData)
+ require.NoError(t, rErr)
+
+ body = bytes.NewReader(data)
+ }
+
+ r := httptest.NewRequest(tc.method, tc.url, body)
+ w := httptest.NewRecorder()
+
+ go func() {
+ handlers[tc.url].ServeHTTP(w, r)
+
+ testutil.RequireSend(testutil.PanicT{}, reqCh, struct{}{}, testTimeout)
+ }()
+
+ if tc.wantConfMod {
+ testutil.RequireReceive(t, confModCh, testTimeout)
+ }
+
+ testutil.RequireReceive(t, reqCh, testTimeout)
+ assert.Equal(t, tc.wantStatus, w.Code)
+
+ respBody, err := io.ReadAll(w.Body)
+ require.NoError(t, err)
+ assert.Equal(t, []byte(tc.wantBody), respBody)
+
+ assertRewritesList(t, handlers[listURL], tc.wantList)
+ })
+ }
+}
+
+// assertRewritesList checks if rewrites list equals the list received from the
+// handler by listURL.
+func assertRewritesList(t *testing.T, handler http.Handler, wantList []*rewriteJSON) {
+ t.Helper()
+
+ r := httptest.NewRequest(http.MethodGet, listURL, nil)
+ w := httptest.NewRecorder()
+
+ handler.ServeHTTP(w, r)
+ require.Equal(t, http.StatusOK, w.Code)
+
+ var actual []*rewriteJSON
+ err := json.NewDecoder(w.Body).Decode(&actual)
+ require.NoError(t, err)
+
+ assert.Equal(t, wantList, actual)
+}
+
+// rewriteEntriesToLegacyRewrites gets legacy rewrites from json entries.
+func rewriteEntriesToLegacyRewrites(entries []*rewriteJSON) (rw []*filtering.LegacyRewrite) {
+ for _, entry := range entries {
+ rw = append(rw, &filtering.LegacyRewrite{
+ Domain: entry.Domain,
+ Answer: entry.Answer,
+ })
+ }
+
+ return rw
+}
diff --git a/internal/filtering/safesearch/safesearch.go b/internal/filtering/safesearch/safesearch.go
index 880f406c..9d5b5121 100644
--- a/internal/filtering/safesearch/safesearch.go
+++ b/internal/filtering/safesearch/safesearch.go
@@ -161,12 +161,8 @@ func (ss *Default) resetEngine(
// type check
var _ filtering.SafeSearch = (*Default)(nil)
-// CheckHost implements the [filtering.SafeSearch] interface for
-// *DefaultSafeSearch.
-func (ss *Default) CheckHost(
- host string,
- qtype rules.RRType,
-) (res filtering.Result, err error) {
+// CheckHost implements the [filtering.SafeSearch] interface for *Default.
+func (ss *Default) CheckHost(host string, qtype rules.RRType) (res filtering.Result, err error) {
start := time.Now()
defer func() {
ss.log(log.DEBUG, "lookup for %q finished in %s", host, time.Since(start))
@@ -196,14 +192,10 @@ func (ss *Default) CheckHost(
return filtering.Result{}, err
}
- if fltRes != nil {
- res = *fltRes
- ss.setCacheResult(host, qtype, res)
+ res = *fltRes
+ ss.setCacheResult(host, qtype, res)
- return res, nil
- }
-
- return filtering.Result{}, fmt.Errorf("no ipv4 addresses for %q", host)
+ return res, nil
}
// searchHost looks up DNS rewrites in the internal DNS filtering engine.
@@ -229,7 +221,11 @@ func (ss *Default) searchHost(host string, qtype rules.RRType) (res *rules.DNSRe
}
// newResult creates Result object from rewrite rule. qtype must be either
-// [dns.TypeA] or [dns.TypeAAAA].
+// [dns.TypeA] or [dns.TypeAAAA]. If err is nil, res is never nil, so that the
+// empty result is converted into a NODATA response.
+//
+// TODO(a.garipov): Use the main rewrite result mechanism used in
+// [dnsforward.Server.filterDNSRequest].
func (ss *Default) newResult(
rewrite *rules.DNSRewrite,
qtype rules.RRType,
@@ -243,9 +239,10 @@ func (ss *Default) newResult(
}
if rewrite.RRType == qtype {
- ip, ok := rewrite.Value.(net.IP)
+ v := rewrite.Value
+ ip, ok := v.(net.IP)
if !ok || ip == nil {
- return nil, nil
+ return nil, fmt.Errorf("expected ip rewrite value, got %T(%[1]v)", v)
}
res.Rules[0].IP = ip
@@ -255,14 +252,14 @@ func (ss *Default) newResult(
host := rewrite.NewCNAME
if host == "" {
- return nil, nil
+ return res, nil
}
ss.log(log.DEBUG, "resolving %q", host)
ips, err := ss.resolver.LookupIP(context.Background(), qtypeToProto(qtype), host)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("resolving cname: %w", err)
}
ss.log(log.DEBUG, "resolved %s", ips)
@@ -276,11 +273,9 @@ func (ss *Default) newResult(
}
res.Rules[0].IP = ip
-
- return res, nil
}
- return nil, nil
+ return res, nil
}
// qtypeToProto returns "ip4" for [dns.TypeA] and "ip6" for [dns.TypeAAAA].
diff --git a/internal/filtering/safesearch/safesearch_test.go b/internal/filtering/safesearch/safesearch_test.go
index 8e1aea2e..12860c5d 100644
--- a/internal/filtering/safesearch/safesearch_test.go
+++ b/internal/filtering/safesearch/safesearch_test.go
@@ -1,6 +1,7 @@
package safesearch_test
import (
+ "context"
"net"
"testing"
"time"
@@ -71,6 +72,25 @@ func TestDefault_CheckHost_yandex(t *testing.T) {
}
}
+func TestDefault_CheckHost_yandexAAAA(t *testing.T) {
+ conf := testConf
+ ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
+ require.NoError(t, err)
+
+ res, err := ss.CheckHost("www.yandex.ru", dns.TypeAAAA)
+ require.NoError(t, err)
+
+ assert.True(t, res.IsFiltered)
+
+ // TODO(a.garipov): Currently, the safe-search filter returns a single rule
+ // with a nil IP address. This isn't really necessary and should be changed
+ // once the TODO in [safesearch.Default.newResult] is resolved.
+ require.Len(t, res.Rules, 1)
+
+ assert.Nil(t, res.Rules[0].IP)
+ assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
+}
+
func TestDefault_CheckHost_google(t *testing.T) {
resolver := &aghtest.TestResolver{}
ip, _ := resolver.HostToIPs("forcesafesearch.google.com")
@@ -105,6 +125,56 @@ func TestDefault_CheckHost_google(t *testing.T) {
}
}
+// testResolver is a [filtering.Resolver] for tests.
+//
+// TODO(a.garipov): Move to aghtest and use everywhere.
+type testResolver struct {
+ OnLookupIP func(ctx context.Context, network, host string) (ips []net.IP, err error)
+}
+
+// type check
+var _ filtering.Resolver = (*testResolver)(nil)
+
+// LookupIP implements the [filtering.Resolver] interface for *testResolver.
+func (r *testResolver) LookupIP(
+ ctx context.Context,
+ network string,
+ host string,
+) (ips []net.IP, err error) {
+ return r.OnLookupIP(ctx, network, host)
+}
+
+func TestDefault_CheckHost_duckduckgoAAAA(t *testing.T) {
+ conf := testConf
+ conf.CustomResolver = &testResolver{
+ OnLookupIP: func(_ context.Context, network, host string) (ips []net.IP, err error) {
+ assert.Equal(t, "ip6", network)
+ assert.Equal(t, "safe.duckduckgo.com", host)
+
+ return nil, nil
+ },
+ }
+
+ ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
+ require.NoError(t, err)
+
+ // The DuckDuckGo safe-search addresses are resolved through CNAMEs, but
+ // DuckDuckGo doesn't have a safe-search IPv6 address. The result should be
+ // the same as the one for Yandex IPv6. That is, a NODATA response.
+ res, err := ss.CheckHost("www.duckduckgo.com", dns.TypeAAAA)
+ require.NoError(t, err)
+
+ assert.True(t, res.IsFiltered)
+
+ // TODO(a.garipov): Currently, the safe-search filter returns a single rule
+ // with a nil IP address. This isn't really necessary and should be changed
+ // once the TODO in [safesearch.Default.newResult] is resolved.
+ require.Len(t, res.Rules, 1)
+
+ assert.Nil(t, res.Rules[0].IP)
+ assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
+}
+
func TestDefault_Update(t *testing.T) {
conf := testConf
ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go
index 8bff3638..66acb108 100644
--- a/internal/filtering/servicelist.go
+++ b/internal/filtering/servicelist.go
@@ -27,6 +27,25 @@ var blockedServices = []blockedService{{
"||9cache.com^",
"||9gag.com^",
},
+}, {
+ ID: "activision_blizzard",
+ Name: "Activision Blizzard",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||activision.com^",
+ "||activisionblizzard.com^",
+ "||demonware.net^",
+ },
+}, {
+ ID: "aliexpress",
+ Name: "AliExpress",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||ae-rus.net^",
+ "||ae-rus.ru^",
+ "||aliexpress.com^",
+ "||aliexpress.ru^",
+ },
}, {
ID: "amazon",
Name: "Amazon",
@@ -234,6 +253,16 @@ var blockedServices = []blockedService{{
"||z.cn^",
"||zappos^",
},
+}, {
+ ID: "battle_net",
+ Name: "Battle.net",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||battle.net^",
+ "||battlenet.com.cn^",
+ "||bnet.163.com^",
+ "||bnet.cn^",
+ },
}, {
ID: "bilibili",
Name: "Bilibili",
@@ -283,6 +312,21 @@ var blockedServices = []blockedService{{
"||mincdn.com^",
"||yo9.com^",
},
+}, {
+ ID: "blizzard_entertainment",
+ Name: "Blizzard Entertainment",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||battle.net^",
+ "||battlenet.com.cn^",
+ "||blizzard.cn^",
+ "||blizzardgames.cn^",
+ "||blz-contentstack.com^",
+ "||blzstatic.cn^",
+ "||bnet.163.com^",
+ "||bnet.cn^",
+ "||lizzard.com^",
+ },
}, {
ID: "cloudflare",
Name: "CloudFlare",
@@ -319,6 +363,14 @@ var blockedServices = []blockedService{{
"||warp.plus^",
"||workers.dev^",
},
+}, {
+ ID: "clubhouse",
+ Name: "Clubhouse",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||clubhouse.com^",
+ "||clubhouseapi.com^",
+ },
}, {
ID: "crunchyroll",
Name: "Crunchyroll",
@@ -726,6 +778,18 @@ var blockedServices = []blockedService{{
"||xxbay.com^",
"||yibei.org^",
},
+}, {
+ ID: "electronic_arts",
+ Name: "Electronic Arts",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||ea.com^",
+ "||eamobile.com^",
+ "||easports.com^",
+ "||nearpolar.com^",
+ "||swtor.com^",
+ "||tnt-ea.com^",
+ },
}, {
ID: "epic_games",
Name: "Epic Games",
@@ -1390,11 +1454,39 @@ var blockedServices = []blockedService{{
"||line-apps.com^",
"||line-cdn.net^",
"||line-scdn.net^",
+ "||line.biz^",
"||line.me^",
"||line.naver.jp^",
"||linecorp.com^",
+ "||linefriends.com.tw^",
+ "||linefriends.com^",
+ "||linegame.jp^",
+ "||linemobile.com^",
"||linemyshop.com^",
"||lineshoppingseller.com^",
+ "||linetv.tw^",
+ },
+}, {
+ ID: "linkedin",
+ Name: "LinkedIn",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||bizographics.com^",
+ "||cs1404.wpc.epsiloncdn.net^",
+ "||cs767.wpc.epsiloncdn.net^",
+ "||l-0005.dc-msedge.net^",
+ "||l-0005.l-dc-msedge.net^",
+ "||l-0005.l-msedge.net^",
+ "||l-0015.l-msedge.net^",
+ "||licdn.cn^",
+ "||licdn.com^",
+ "||linkedin.at^",
+ "||linkedin.be^",
+ "||linkedin.cn^",
+ "||linkedin.com^",
+ "||linkedin.nl^",
+ "||linkedin.qtlcdn.com^",
+ "||lnkd.in^",
},
}, {
ID: "mail_ru",
@@ -1438,7 +1530,6 @@ var blockedServices = []blockedService{{
"||masto.pt^",
"||mastodon.au^",
"||mastodon.bida.im^",
- "||mastodon.com.tr^",
"||mastodon.eus^",
"||mastodon.green^",
"||mastodon.ie^",
@@ -1454,7 +1545,7 @@ var blockedServices = []blockedService{{
"||mastodon.social^",
"||mastodon.uno^",
"||mastodon.world^",
- "||mastodon.xyz^",
+ "||mastodon.zaclys.com^",
"||mastodonapp.uk^",
"||mastodonners.nl^",
"||mastodont.cat^",
@@ -1465,12 +1556,12 @@ var blockedServices = []blockedService{{
"||metalhead.club^",
"||mindly.social^",
"||mstdn.ca^",
- "||mstdn.jp^",
"||mstdn.party^",
"||mstdn.plus^",
"||mstdn.social^",
"||muenchen.social^",
- "||newsie.social^",
+ "||muenster.im^",
+ "||nerdculture.de^",
"||noc.social^",
"||norden.social^",
"||nrw.social^",
@@ -1498,16 +1589,17 @@ var blockedServices = []blockedService{{
"||techhub.social^",
"||theblower.au^",
"||tkz.one^",
+ "||todon.eu^",
"||toot.aquilenet.fr^",
"||toot.community^",
"||toot.funami.tech^",
"||toot.io^",
"||toot.wales^",
"||troet.cafe^",
- "||twingyeo.kr^",
"||union.place^",
"||universeodon.com^",
"||urbanists.social^",
+ "||wien.rocks^",
"||wxw.moe^",
},
}, {
@@ -1550,6 +1642,44 @@ var blockedServices = []blockedService{{
"||nflxso.net^",
"||nflxvideo.net^",
},
+}, {
+ ID: "nintendo",
+ Name: "Nintendo",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||nintendo-europe.com^",
+ "||nintendo.be^",
+ "||nintendo.co.jp^",
+ "||nintendo.co.uk^",
+ "||nintendo.com.au^",
+ "||nintendo.com^",
+ "||nintendo.de^",
+ "||nintendo.es^",
+ "||nintendo.eu^",
+ "||nintendo.fr^",
+ "||nintendo.it^",
+ "||nintendo.jp^",
+ "||nintendo.net^",
+ "||nintendo.nl^",
+ "||nintendoswitch.cn^",
+ "||nintendowifi.net^",
+ },
+}, {
+ ID: "nvidia",
+ Name: "Nvidia",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||geforce.com^",
+ "||geforcenow.com^",
+ "||nvidia.cn^",
+ "||nvidia.com.global.ogslb.com^",
+ "||nvidia.com^",
+ "||nvidia.eu^",
+ "||nvidia.partners^",
+ "||nvidiagrid.net^",
+ "||nvidianews.com^",
+ "||tegrazone.com^",
+ },
}, {
ID: "ok",
Name: "OK.ru",
@@ -1704,6 +1834,14 @@ var blockedServices = []blockedService{{
"||robloxcdn.com^",
"||robloxdev.cn^",
},
+}, {
+ ID: "rockstar_games",
+ Name: "Rockstar games",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||rockstargames.com^",
+ "||rsg.sc^",
+ },
}, {
ID: "shopee",
Name: "Shopee",
@@ -1940,6 +2078,16 @@ var blockedServices = []blockedService{{
"||twvid.com^",
"||vine.co^",
},
+}, {
+ ID: "ubisoft",
+ Name: "Ubisoft",
+ IconSVG: []byte(""),
+ Rules: []string{
+ "||ubi.com^",
+ "||ubisoft.com^",
+ "||ubisoft.org^",
+ "||ubisoftconnect.com^",
+ },
}, {
ID: "valorant",
Name: "Valorant",
diff --git a/internal/home/client.go b/internal/home/client.go
index 1aee021e..c0d39dad 100644
--- a/internal/home/client.go
+++ b/internal/home/client.go
@@ -7,6 +7,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/stringutil"
)
@@ -22,12 +23,14 @@ type Client struct {
safeSearchConf filtering.SafeSearchConfig
SafeSearch filtering.SafeSearch
+ // BlockedServices is the configuration of blocked services of a client.
+ BlockedServices *filtering.BlockedServices
+
Name string
- IDs []string
- Tags []string
- BlockedServices []string
- Upstreams []string
+ IDs []string
+ Tags []string
+ Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
@@ -43,9 +46,9 @@ type Client struct {
func (c *Client) ShallowClone() (sh *Client) {
clone := *c
+ clone.BlockedServices = c.BlockedServices.Clone()
clone.IDs = stringutil.CloneSlice(c.IDs)
clone.Tags = stringutil.CloneSlice(c.Tags)
- clone.BlockedServices = stringutil.CloneSlice(c.BlockedServices)
clone.Upstreams = stringutil.CloneSlice(c.Upstreams)
return &clone
@@ -127,14 +130,13 @@ func (cs clientSource) MarshalText() (text []byte, err error) {
// RuntimeClient is a client information about which has been obtained using the
// source described in the Source field.
type RuntimeClient struct {
- WHOISInfo *RuntimeClientWHOISInfo
- Host string
- Source clientSource
-}
+ // WHOIS is the filtered WHOIS data of a client.
+ WHOIS *whois.Info
-// RuntimeClientWHOISInfo is the filtered WHOIS data for a runtime client.
-type RuntimeClientWHOISInfo struct {
- City string `json:"city,omitempty"`
- Country string `json:"country,omitempty"`
- Orgname string `json:"orgname,omitempty"`
+ // Host is the host name of a client.
+ Host string
+
+ // Source is the source from which the information about the client has
+ // been obtained.
+ Source clientSource
}
diff --git a/internal/home/clients.go b/internal/home/clients.go
index d2e4194b..1cd3add0 100644
--- a/internal/home/clients.go
+++ b/internal/home/clients.go
@@ -11,9 +11,11 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
+ "github.com/AdguardTeam/AdGuardHome/internal/dhcpsvc"
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/errors"
@@ -23,6 +25,23 @@ import (
"golang.org/x/exp/slices"
)
+// DHCP is an interface for accessing DHCP lease data the [clientsContainer]
+// needs.
+type DHCP interface {
+ // Leases returns all the DHCP leases.
+ Leases() (leases []*dhcpsvc.Lease)
+
+ // HostByIP returns the hostname of the DHCP client with the given IP
+ // address. The address will be netip.Addr{} if there is no such client,
+ // due to an assumption that a DHCP client must always have an IP address.
+ HostByIP(ip netip.Addr) (host string)
+
+ // MACByIP returns the MAC address for the given IP address leased. It
+ // returns nil if there is no such client, due to an assumption that a DHCP
+ // client must always have a MAC address.
+ MACByIP(ip netip.Addr) (mac net.HardwareAddr)
+}
+
// clientsContainer is the storage of all runtime and persistent clients.
type clientsContainer struct {
// TODO(a.garipov): Perhaps use a number of separate indices for different
@@ -77,7 +96,7 @@ func (clients *clientsContainer) Init(
etcHosts *aghnet.HostsContainer,
arpdb aghnet.ARPDB,
filteringConf *filtering.Config,
-) {
+) (err error) {
if clients.list != nil {
log.Fatal("clients.list != nil")
}
@@ -91,23 +110,29 @@ func (clients *clientsContainer) Init(
clients.dhcpServer = dhcpServer
clients.etcHosts = etcHosts
clients.arpdb = arpdb
- clients.addFromConfig(objects, filteringConf)
+ err = clients.addFromConfig(objects, filteringConf)
+ if err != nil {
+ // Don't wrap the error, because it's informative enough as is.
+ return err
+ }
clients.safeSearchCacheSize = filteringConf.SafeSearchCacheSize
clients.safeSearchCacheTTL = time.Minute * time.Duration(filteringConf.CacheTime)
if clients.testing {
- return
+ return nil
}
- clients.updateFromDHCP(true)
if clients.dhcpServer != nil {
clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
+ clients.onDHCPLeaseChanged(dhcpd.LeaseChangedAdded)
}
if clients.etcHosts != nil {
go clients.handleHostsUpdates()
}
+
+ return nil
}
func (clients *clientsContainer) handleHostsUpdates() {
@@ -147,12 +172,14 @@ func (clients *clientsContainer) reloadARP() {
type clientObject struct {
SafeSearchConf filtering.SafeSearchConfig `yaml:"safe_search"`
+ // BlockedServices is the configuration of blocked services of a client.
+ BlockedServices *filtering.BlockedServices `yaml:"blocked_services"`
+
Name string `yaml:"name"`
- Tags []string `yaml:"tags"`
- IDs []string `yaml:"ids"`
- BlockedServices []string `yaml:"blocked_services"`
- Upstreams []string `yaml:"upstreams"`
+ IDs []string `yaml:"ids"`
+ Tags []string `yaml:"tags"`
+ Upstreams []string `yaml:"upstreams"`
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
@@ -166,7 +193,10 @@ type clientObject struct {
// addFromConfig initializes the clients container with objects from the
// configuration file.
-func (clients *clientsContainer) addFromConfig(objects []*clientObject, filteringConf *filtering.Config) {
+func (clients *clientsContainer) addFromConfig(
+ objects []*clientObject,
+ filteringConf *filtering.Config,
+) (err error) {
for _, o := range objects {
cli := &Client{
Name: o.Name,
@@ -187,7 +217,7 @@ func (clients *clientsContainer) addFromConfig(objects []*clientObject, filterin
if o.SafeSearchConf.Enabled {
o.SafeSearchConf.CustomResolver = safeSearchResolver{}
- err := cli.setSafeSearch(
+ err = cli.setSafeSearch(
o.SafeSearchConf,
filteringConf.SafeSearchCacheSize,
time.Minute*time.Duration(filteringConf.CacheTime),
@@ -199,14 +229,13 @@ func (clients *clientsContainer) addFromConfig(objects []*clientObject, filterin
}
}
- for _, s := range o.BlockedServices {
- if filtering.BlockedSvcKnown(s) {
- cli.BlockedServices = append(cli.BlockedServices, s)
- } else {
- log.Info("clients: skipping unknown blocked service %q", s)
- }
+ err = o.BlockedServices.Validate()
+ if err != nil {
+ return fmt.Errorf("clients: init client blocked services %q: %w", cli.Name, err)
}
+ cli.BlockedServices = o.BlockedServices.Clone()
+
for _, t := range o.Tags {
if clients.allTags.Has(t) {
cli.Tags = append(cli.Tags, t)
@@ -217,11 +246,13 @@ func (clients *clientsContainer) addFromConfig(objects []*clientObject, filterin
slices.Sort(cli.Tags)
- _, err := clients.Add(cli)
+ _, err = clients.Add(cli)
if err != nil {
log.Error("clients: adding clients %s: %s", cli.Name, err)
}
}
+
+ return nil
}
// forConfig returns all currently known persistent clients as objects for the
@@ -235,10 +266,11 @@ func (clients *clientsContainer) forConfig() (objs []*clientObject) {
o := &clientObject{
Name: cli.Name,
- Tags: stringutil.CloneSlice(cli.Tags),
- IDs: stringutil.CloneSlice(cli.IDs),
- BlockedServices: stringutil.CloneSlice(cli.BlockedServices),
- Upstreams: stringutil.CloneSlice(cli.Upstreams),
+ BlockedServices: cli.BlockedServices.Clone(),
+
+ IDs: stringutil.CloneSlice(cli.IDs),
+ Tags: stringutil.CloneSlice(cli.Tags),
+ Upstreams: stringutil.CloneSlice(cli.Upstreams),
UseGlobalSettings: !cli.UseOwnSettings,
FilteringEnabled: cli.FilteringEnabled,
@@ -276,15 +308,38 @@ func (clients *clientsContainer) periodicUpdate() {
}
}
+// onDHCPLeaseChanged is a callback for the DHCP server. It updates the list of
+// runtime clients using the DHCP server's leases.
+//
+// TODO(e.burkov): Remove when switched to dhcpsvc.
func (clients *clientsContainer) onDHCPLeaseChanged(flags int) {
- switch flags {
- case dhcpd.LeaseChangedAdded,
- dhcpd.LeaseChangedAddedStatic,
- dhcpd.LeaseChangedRemovedStatic:
- clients.updateFromDHCP(true)
- case dhcpd.LeaseChangedRemovedAll:
- clients.updateFromDHCP(false)
+ if clients.dhcpServer == nil || !config.Clients.Sources.DHCP {
+ return
}
+
+ clients.lock.Lock()
+ defer clients.lock.Unlock()
+
+ clients.rmHostsBySrc(ClientSourceDHCP)
+
+ if flags == dhcpd.LeaseChangedRemovedAll {
+ return
+ }
+
+ leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
+ n := 0
+ for _, l := range leases {
+ if l.Hostname == "" {
+ continue
+ }
+
+ ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP)
+ if ok {
+ n++
+ }
+ }
+
+ log.Debug("clients: added %d client aliases from dhcp", n)
}
// clientSource checks if client with this IP address already exists and returns
@@ -300,23 +355,11 @@ func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource)
}
rc, ok := clients.ipToRC[ip]
- if !ok {
- return ClientSourceNone
+ if ok {
+ return rc.Source
}
- return rc.Source
-}
-
-func toQueryLogWHOIS(wi *RuntimeClientWHOISInfo) (cw *querylog.ClientWHOIS) {
- if wi == nil {
- return &querylog.ClientWHOIS{}
- }
-
- return &querylog.ClientWHOIS{
- City: wi.City,
- Country: wi.Country,
- Orgname: wi.Orgname,
- }
+ return ClientSourceNone
}
// findMultiple is a wrapper around Find to make it a valid client finder for
@@ -352,7 +395,7 @@ func (clients *clientsContainer) clientOrArtificial(
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
- c.WHOIS = &querylog.ClientWHOIS{}
+ c.WHOIS = &whois.Info{}
}
}()
@@ -369,7 +412,7 @@ func (clients *clientsContainer) clientOrArtificial(
if ok {
return &querylog.Client{
Name: rc.Host,
- WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
+ WHOIS: rc.WHOIS,
}, false
}
@@ -477,11 +520,11 @@ func (clients *clientsContainer) findLocked(id string) (c *Client, ok bool) {
}
}
- if clients.dhcpServer == nil {
- return nil, false
+ if clients.dhcpServer != nil {
+ return clients.findDHCP(ip)
}
- return clients.findDHCP(ip)
+ return nil, false
}
// findDHCP searches for a client by its MAC, if the DHCP server is active and
@@ -701,35 +744,34 @@ func (clients *clientsContainer) Update(prev, c *Client) (err error) {
}
// setWHOISInfo sets the WHOIS information for a client.
-func (clients *clientsContainer) setWHOISInfo(ip netip.Addr, wi *RuntimeClientWHOISInfo) {
+func (clients *clientsContainer) setWHOISInfo(ip netip.Addr, wi *whois.Info) {
clients.lock.Lock()
defer clients.lock.Unlock()
_, ok := clients.findLocked(ip.String())
if ok {
log.Debug("clients: client for %s is already created, ignore whois info", ip)
+
return
}
+ // TODO(e.burkov): Consider storing WHOIS information separately and
+ // potentially get rid of [RuntimeClient].
rc, ok := clients.ipToRC[ip]
- if ok {
- rc.WHOISInfo = wi
+ if !ok {
+ // Create a RuntimeClient implicitly so that we don't do this check
+ // again.
+ rc = &RuntimeClient{
+ Source: ClientSourceWHOIS,
+ }
+ clients.ipToRC[ip] = rc
+
+ log.Debug("clients: set whois info for runtime client with ip %s: %+v", ip, wi)
+ } else {
log.Debug("clients: set whois info for runtime client %s: %+v", rc.Host, wi)
-
- return
}
- // Create a RuntimeClient implicitly so that we don't do this check
- // again.
- rc = &RuntimeClient{
- Source: ClientSourceWHOIS,
- }
-
- rc.WHOISInfo = wi
-
- clients.ipToRC[ip] = rc
-
- log.Debug("clients: set whois info for runtime client with ip %s: %+v", ip, wi)
+ rc.WHOIS = wi
}
// AddHost adds a new IP-hostname pairing. The priorities of the sources are
@@ -753,23 +795,19 @@ func (clients *clientsContainer) addHostLocked(
src clientSource,
) (ok bool) {
rc, ok := clients.ipToRC[ip]
- if ok {
- if rc.Source > src {
- return false
- }
-
- rc.Host = host
- rc.Source = src
- } else {
+ if !ok {
rc = &RuntimeClient{
- Host: host,
- Source: src,
- WHOISInfo: &RuntimeClientWHOISInfo{},
+ WHOIS: &whois.Info{},
}
clients.ipToRC[ip] = rc
+ } else if src < rc.Source {
+ return false
}
+ rc.Host = host
+ rc.Source = src
+
log.Debug("clients: added %s -> %q [%d]", ip, host, len(clients.ipToRC))
return true
@@ -838,38 +876,6 @@ func (clients *clientsContainer) addFromSystemARP() {
log.Debug("clients: added %d client aliases from arp neighborhood", added)
}
-// updateFromDHCP adds the clients that have a non-empty hostname from the DHCP
-// server.
-func (clients *clientsContainer) updateFromDHCP(add bool) {
- if clients.dhcpServer == nil || !config.Clients.Sources.DHCP {
- return
- }
-
- clients.lock.Lock()
- defer clients.lock.Unlock()
-
- clients.rmHostsBySrc(ClientSourceDHCP)
-
- if !add {
- return
- }
-
- leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
- n := 0
- for _, l := range leases {
- if l.Hostname == "" {
- continue
- }
-
- ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP)
- if ok {
- n++
- }
- }
-
- log.Debug("clients: added %d client aliases from dhcp", n)
-}
-
// close gracefully closes all the client-specific upstream configurations of
// the persistent clients.
func (clients *clientsContainer) close() (err error) {
diff --git a/internal/home/clients_test.go b/internal/home/clients_test.go
index 8361528a..9ad819ec 100644
--- a/internal/home/clients_test.go
+++ b/internal/home/clients_test.go
@@ -9,25 +9,26 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// newClientsContainer is a helper that creates a new clients container for
// tests.
-func newClientsContainer() (c *clientsContainer) {
+func newClientsContainer(t *testing.T) (c *clientsContainer) {
c = &clientsContainer{
testing: true,
}
- c.Init(nil, nil, nil, nil, &filtering.Config{})
+ err := c.Init(nil, nil, nil, nil, &filtering.Config{})
+ require.NoError(t, err)
return c
}
func TestClients(t *testing.T) {
- clients := newClientsContainer()
+ clients := newClientsContainer(t)
t.Run("add_success", func(t *testing.T) {
var (
@@ -198,8 +199,8 @@ func TestClients(t *testing.T) {
}
func TestClientsWHOIS(t *testing.T) {
- clients := newClientsContainer()
- whois := &RuntimeClientWHOISInfo{
+ clients := newClientsContainer(t)
+ whois := &whois.Info{
Country: "AU",
Orgname: "Example Org",
}
@@ -210,7 +211,7 @@ func TestClientsWHOIS(t *testing.T) {
rc := clients.ipToRC[ip]
require.NotNil(t, rc)
- assert.Equal(t, rc.WHOISInfo, whois)
+ assert.Equal(t, rc.WHOIS, whois)
})
t.Run("existing_auto-client", func(t *testing.T) {
@@ -222,7 +223,7 @@ func TestClientsWHOIS(t *testing.T) {
rc := clients.ipToRC[ip]
require.NotNil(t, rc)
- assert.Equal(t, rc.WHOISInfo, whois)
+ assert.Equal(t, rc.WHOIS, whois)
})
t.Run("can't_set_manually-added", func(t *testing.T) {
@@ -244,7 +245,7 @@ func TestClientsWHOIS(t *testing.T) {
}
func TestClientsAddExisting(t *testing.T) {
- clients := newClientsContainer()
+ clients := newClientsContainer(t)
t.Run("simple", func(t *testing.T) {
ip := netip.MustParseAddr("1.1.1.1")
@@ -316,7 +317,7 @@ func TestClientsAddExisting(t *testing.T) {
}
func TestClientsCustomUpstream(t *testing.T) {
- clients := newClientsContainer()
+ clients := newClientsContainer(t)
// Add client with upstreams.
ok, err := clients.Add(&Client{
diff --git a/internal/home/clientshttp.go b/internal/home/clientshttp.go
index 6425f941..38ea666d 100644
--- a/internal/home/clientshttp.go
+++ b/internal/home/clientshttp.go
@@ -9,6 +9,8 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
+ "github.com/AdguardTeam/AdGuardHome/internal/schedule"
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
)
// clientJSON is a common structure used by several handlers to deal with
@@ -28,7 +30,8 @@ type clientJSON struct {
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
- WHOISInfo *RuntimeClientWHOISInfo `json:"whois_info,omitempty"`
+ // WHOIS is the filtered WHOIS data of a client.
+ WHOIS *whois.Info `json:"whois_info,omitempty"`
SafeSearchConf *filtering.SafeSearchConfig `json:"safe_search"`
Name string `json:"name"`
@@ -51,7 +54,7 @@ type clientJSON struct {
}
type runtimeClientJSON struct {
- WHOISInfo *RuntimeClientWHOISInfo `json:"whois_info"`
+ WHOIS *whois.Info `json:"whois_info"`
IP netip.Addr `json:"ip"`
Name string `json:"name"`
@@ -78,7 +81,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http
for ip, rc := range clients.ipToRC {
cj := runtimeClientJSON{
- WHOISInfo: rc.WHOISInfo,
+ WHOIS: rc.WHOIS,
Name: rc.Host,
Source: rc.Source,
@@ -116,15 +119,24 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
}
}
+ weekly := schedule.EmptyWeekly()
+ if prev != nil {
+ weekly = prev.BlockedServices.Schedule.Clone()
+ }
+
c = &Client{
safeSearchConf: safeSearchConf,
Name: cj.Name,
- IDs: cj.IDs,
- Tags: cj.Tags,
- BlockedServices: cj.BlockedServices,
- Upstreams: cj.Upstreams,
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: weekly,
+ IDs: cj.BlockedServices,
+ },
+
+ IDs: cj.IDs,
+ Tags: cj.Tags,
+ Upstreams: cj.Upstreams,
UseOwnSettings: !cj.UseGlobalSettings,
FilteringEnabled: cj.FilteringEnabled,
@@ -178,7 +190,8 @@ func clientToJSON(c *Client) (cj *clientJSON) {
SafeBrowsingEnabled: c.SafeBrowsingEnabled,
UseGlobalBlockedServices: !c.UseOwnBlockedServices,
- BlockedServices: c.BlockedServices,
+
+ BlockedServices: c.BlockedServices.IDs,
Upstreams: c.Upstreams,
@@ -344,16 +357,16 @@ func (clients *clientsContainer) findRuntime(ip netip.Addr, idStr string) (cj *c
IDs: []string{idStr},
Disallowed: &disallowed,
DisallowedRule: &rule,
- WHOISInfo: &RuntimeClientWHOISInfo{},
+ WHOIS: &whois.Info{},
}
return cj
}
cj = &clientJSON{
- Name: rc.Host,
- IDs: []string{idStr},
- WHOISInfo: rc.WHOISInfo,
+ Name: rc.Host,
+ IDs: []string{idStr},
+ WHOIS: rc.WHOIS,
}
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
diff --git a/internal/home/config.go b/internal/home/config.go
index 8d9fa422..b7ac5bcc 100644
--- a/internal/home/config.go
+++ b/internal/home/config.go
@@ -14,6 +14,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
+ "github.com/AdguardTeam/AdGuardHome/internal/schedule"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/dnsproxy/fastip"
"github.com/AdguardTeam/golibs/errors"
@@ -90,18 +91,17 @@ type clientSourcesConfig struct {
HostsFile bool `yaml:"hosts"`
}
-// configuration is loaded from YAML
-// field ordering is important -- yaml fields will mirror ordering from here
+// configuration is loaded from YAML.
+//
+// Field ordering is important, YAML fields better not to be reordered, if it's
+// not absolutely necessary.
type configuration struct {
// Raw file data to avoid re-reading of configuration file
// It's reset after config is parsed
fileData []byte
- // BindHost is the address for the web interface server to listen on.
- BindHost netip.Addr `yaml:"bind_host"`
- // BindPort is the port for the web interface server to listen on.
- BindPort int `yaml:"bind_port"`
-
+ // HTTPConfig is the block with http conf.
+ HTTPConfig httpConfig `yaml:"http"`
// Users are the clients capable for accessing the web interface.
Users []webUser `yaml:"users"`
// AuthAttempts is the maximum number of failed login attempts a user
@@ -119,10 +119,6 @@ type configuration struct {
// DebugPProf defines if the profiling HTTP handler will listen on :6060.
DebugPProf bool `yaml:"debug_pprof"`
- // TTL for a web session (in hours)
- // An active session is automatically refreshed once a day.
- WebSessionTTLHours uint32 `yaml:"web_session_ttl"`
-
DNS dnsConfig `yaml:"dns"`
TLS tlsConfigSettings `yaml:"tls"`
QueryLog queryLogConfig `yaml:"querylog"`
@@ -155,7 +151,23 @@ type configuration struct {
SchemaVersion int `yaml:"schema_version"` // keeping last so that users will be less tempted to change it -- used when upgrading between versions
}
-// field ordering is important -- yaml fields will mirror ordering from here
+// httpConfig is a block with HTTP configuration params.
+//
+// Field ordering is important, YAML fields better not to be reordered, if it's
+// not absolutely necessary.
+type httpConfig struct {
+ // Address is the address to serve the web UI on.
+ Address netip.AddrPort
+
+ // SessionTTL for a web session.
+ // An active session is automatically refreshed once a day.
+ SessionTTL timeutil.Duration `yaml:"session_ttl"`
+}
+
+// dnsConfig is a block with DNS configuration params.
+//
+// Field ordering is important, YAML fields better not to be reordered, if it's
+// not absolutely necessary.
type dnsConfig struct {
BindHosts []netip.Addr `yaml:"bind_hosts"`
Port int `yaml:"port"`
@@ -260,11 +272,12 @@ type statsConfig struct {
//
// TODO(a.garipov, e.burkov): This global is awful and must be removed.
var config = &configuration{
- BindPort: 3000,
- BindHost: netip.IPv4Unspecified(),
- AuthAttempts: 5,
- AuthBlockMin: 15,
- WebSessionTTLHours: 30 * 24,
+ AuthAttempts: 5,
+ AuthBlockMin: 15,
+ HTTPConfig: httpConfig{
+ Address: netip.AddrPortFrom(netip.IPv4Unspecified(), 3000),
+ SessionTTL: timeutil.Duration{Duration: 30 * timeutil.Day},
+ },
DNS: dnsConfig{
BindHosts: []netip.Addr{netip.IPv4Unspecified()},
Port: defaultPortDNS,
@@ -316,6 +329,11 @@ var config = &configuration{
Yandex: true,
YouTube: true,
},
+
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ IDs: []string{},
+ },
},
UpstreamTimeout: timeutil.Duration{Duration: dnsforward.DefaultTimeout},
UsePrivateRDNS: true,
@@ -421,8 +439,8 @@ func readLogSettings() (ls *logSettings) {
// validateBindHosts returns error if any of binding hosts from configuration is
// not a valid IP address.
func validateBindHosts(conf *configuration) (err error) {
- if !conf.BindHost.IsValid() {
- return errors.Error("bind_host is not a valid ip address")
+ if !conf.HTTPConfig.Address.IsValid() {
+ return errors.Error("http.address is not a valid ip address")
}
for i, addr := range conf.DNS.BindHosts {
@@ -456,7 +474,7 @@ func parseConfig() (err error) {
}
tcpPorts := aghalg.UniqChecker[tcpPort]{}
- addPorts(tcpPorts, tcpPort(config.BindPort))
+ addPorts(tcpPorts, tcpPort(config.HTTPConfig.Address.Port()))
udpPorts := aghalg.UniqChecker[udpPort]{}
addPorts(udpPorts, udpPort(config.DNS.Port))
diff --git a/internal/home/control.go b/internal/home/control.go
index ae83507c..48afcf71 100644
--- a/internal/home/control.go
+++ b/internal/home/control.go
@@ -103,7 +103,7 @@ type statusResponse struct {
Language string `json:"language"`
DNSAddrs []string `json:"dns_addresses"`
DNSPort int `json:"dns_port"`
- HTTPPort int `json:"http_port"`
+ HTTPPort uint16 `json:"http_port"`
// ProtectionDisabledDuration is the duration of the protection pause in
// milliseconds.
@@ -158,7 +158,7 @@ func handleStatus(w http.ResponseWriter, r *http.Request) {
Language: config.Language,
DNSAddrs: dnsAddrs,
DNSPort: config.DNS.Port,
- HTTPPort: config.BindPort,
+ HTTPPort: config.HTTPConfig.Address.Port(),
ProtectionDisabledDuration: protectionDisabledDuration,
ProtectionEnabled: protectionEnabled,
IsRunning: isRunning(),
diff --git a/internal/home/controlinstall.go b/internal/home/controlinstall.go
index faf62237..c9503fa0 100644
--- a/internal/home/controlinstall.go
+++ b/internal/home/controlinstall.go
@@ -96,8 +96,9 @@ type checkConfResp struct {
func (req *checkConfReq) validateWeb(tcpPorts aghalg.UniqChecker[tcpPort]) (err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
- portInt := req.Web.Port
- port := tcpPort(portInt)
+ // TODO(a.garipov): Declare all port variables anywhere as uint16.
+ reqPort := uint16(req.Web.Port)
+ port := tcpPort(reqPort)
addPorts(tcpPorts, port)
if err = tcpPorts.Validate(); err != nil {
// Reset the value for the port to 1 to make sure that validateDNS
@@ -108,15 +109,15 @@ func (req *checkConfReq) validateWeb(tcpPorts aghalg.UniqChecker[tcpPort]) (err
return err
}
- switch portInt {
- case 0, config.BindPort:
+ switch reqPort {
+ case 0, config.HTTPConfig.Address.Port():
return nil
default:
// Go on and check the port binding only if it's not zero or won't be
// unbound after install.
}
- return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(portInt)))
+ return aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, reqPort))
}
// validateDNS returns error if the DNS part of the initial configuration can't
@@ -127,11 +128,11 @@ func (req *checkConfReq) validateDNS(
) (canAutofix bool, err error) {
defer func() { err = errors.Annotate(err, "validating ports: %w") }()
- port := req.DNS.Port
+ port := uint16(req.DNS.Port)
switch port {
case 0:
return false, nil
- case config.BindPort:
+ case config.HTTPConfig.Address.Port():
// Go on and only check the UDP port since the TCP one is already bound
// by AdGuard Home for web interface.
default:
@@ -318,8 +319,7 @@ type applyConfigReq struct {
// copyInstallSettings copies the installation parameters between two
// configuration structures.
func copyInstallSettings(dst, src *configuration) {
- dst.BindHost = src.BindHost
- dst.BindPort = src.BindPort
+ dst.HTTPConfig = src.HTTPConfig
dst.DNS.BindHosts = src.DNS.BindHosts
dst.DNS.Port = src.DNS.Port
}
@@ -413,8 +413,7 @@ func (web *webAPI) handleInstallConfigure(w http.ResponseWriter, r *http.Request
copyInstallSettings(curConfig, config)
Context.firstRun = false
- config.BindHost = req.Web.IP
- config.BindPort = req.Web.Port
+ config.HTTPConfig.Address = netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port))
config.DNS.BindHosts = []netip.Addr{req.DNS.IP}
config.DNS.Port = req.DNS.Port
@@ -487,7 +486,8 @@ func decodeApplyConfigReq(r io.Reader) (req *applyConfigReq, restartHTTP bool, e
return nil, false, errors.Error("ports cannot be 0")
}
- restartHTTP = config.BindHost != req.Web.IP || config.BindPort != req.Web.Port
+ addrPort := config.HTTPConfig.Address
+ restartHTTP = addrPort.Addr() != req.Web.IP || int(addrPort.Port()) != req.Web.Port
if restartHTTP {
err = aghnet.CheckPort("tcp", netip.AddrPortFrom(req.Web.IP, uint16(req.Web.Port)))
if err != nil {
diff --git a/internal/home/controlupdate.go b/internal/home/controlupdate.go
index f7e56208..434286ba 100644
--- a/internal/home/controlupdate.go
+++ b/internal/home/controlupdate.go
@@ -157,7 +157,9 @@ func (vr *versionResponse) setAllowedToAutoUpdate() (err error) {
Context.tls.WriteDiskConfig(tlsConf)
canUpdate := true
- if tlsConfUsesPrivilegedPorts(tlsConf) || config.BindPort < 1024 || config.DNS.Port < 1024 {
+ if tlsConfUsesPrivilegedPorts(tlsConf) ||
+ config.HTTPConfig.Address.Port() < 1024 ||
+ config.DNS.Port < 1024 {
canUpdate, err = aghnet.CanBindPrivilegedPorts()
if err != nil {
return fmt.Errorf("checking ability to bind privileged ports: %w", err)
diff --git a/internal/home/dns.go b/internal/home/dns.go
index 9c3b03cc..3a37f751 100644
--- a/internal/home/dns.go
+++ b/internal/home/dns.go
@@ -8,6 +8,7 @@ import (
"net/url"
"os"
"path/filepath"
+ "time"
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
@@ -17,6 +18,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/log"
@@ -25,7 +27,7 @@ import (
yaml "gopkg.in/yaml.v3"
)
-// Default ports.
+// Default listening ports.
const (
defaultPortDNS = 53
defaultPortHTTP = 80
@@ -169,13 +171,72 @@ func initDNSServer(
Context.rdns = NewRDNS(Context.dnsServer, &Context.clients, config.DNS.UsePrivateRDNS)
}
- if config.Clients.Sources.WHOIS {
- Context.whois = initWHOIS(&Context.clients)
- }
+ initWHOIS()
return nil
}
+// initWHOIS initializes the WHOIS.
+//
+// TODO(s.chzhen): Consider making configurable.
+func initWHOIS() {
+ const (
+ // defaultQueueSize is the size of queue of IPs for WHOIS processing.
+ defaultQueueSize = 255
+
+ // defaultTimeout is the timeout for WHOIS requests.
+ defaultTimeout = 5 * time.Second
+
+ // defaultCacheSize is the maximum size of the cache. If it's zero,
+ // cache size is unlimited.
+ defaultCacheSize = 10_000
+
+ // defaultMaxConnReadSize is an upper limit in bytes for reading from
+ // net.Conn.
+ defaultMaxConnReadSize = 64 * 1024
+
+ // defaultMaxRedirects is the maximum redirects count.
+ defaultMaxRedirects = 5
+
+ // defaultMaxInfoLen is the maximum length of whois.Info fields.
+ defaultMaxInfoLen = 250
+
+ // defaultIPTTL is the Time to Live duration for cached IP addresses.
+ defaultIPTTL = 1 * time.Hour
+ )
+
+ Context.whoisCh = make(chan netip.Addr, defaultQueueSize)
+
+ var w whois.Interface
+
+ if config.Clients.Sources.WHOIS {
+ w = whois.New(&whois.Config{
+ DialContext: customDialContext,
+ ServerAddr: whois.DefaultServer,
+ Port: whois.DefaultPort,
+ Timeout: defaultTimeout,
+ CacheSize: defaultCacheSize,
+ MaxConnReadSize: defaultMaxConnReadSize,
+ MaxRedirects: defaultMaxRedirects,
+ MaxInfoLen: defaultMaxInfoLen,
+ CacheTTL: defaultIPTTL,
+ })
+ } else {
+ w = whois.Empty{}
+ }
+
+ go func() {
+ defer log.OnPanic("whois")
+
+ for ip := range Context.whoisCh {
+ info, changed := w.Process(context.Background(), ip)
+ if info != nil && changed {
+ Context.clients.setWHOISInfo(ip, info)
+ }
+ }
+ }()
+}
+
// parseSubnetSet parses a slice of subnets. If the slice is empty, it returns
// a subnet set that matches all locally served networks, see
// [netutil.IsLocallyServed].
@@ -218,9 +279,7 @@ func onDNSRequest(pctx *proxy.DNSContext) {
Context.rdns.Begin(ip)
}
- if srcs.WHOIS && !netutil.IsSpecialPurposeAddr(ip) {
- Context.whois.Begin(ip)
- }
+ Context.whoisCh <- ip
}
func ipsToTCPAddrs(ips []netip.Addr, port int) (tcpAddrs []*net.TCPAddr) {
@@ -390,7 +449,7 @@ func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering
// pref is a prefix for logging messages around the scope.
const pref = "applying filters"
- Context.filters.ApplyBlockedServices(setts, nil)
+ Context.filters.ApplyBlockedServices(setts)
log.Debug("%s: looking for client with ip %s and clientid %q", pref, clientIP, clientID)
@@ -414,12 +473,12 @@ func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering
if c.UseOwnBlockedServices {
// TODO(e.burkov): Get rid of this crutch.
- svcs := c.BlockedServices
- if svcs == nil {
- svcs = []string{}
+ setts.ServicesRules = nil
+ svcs := c.BlockedServices.IDs
+ if !c.BlockedServices.Schedule.Contains(time.Now()) {
+ Context.filters.ApplyBlockedServicesList(setts, svcs)
+ log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)
}
- Context.filters.ApplyBlockedServices(setts, svcs)
- log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)
}
setts.ClientName = c.Name
@@ -463,9 +522,7 @@ func startDNSServer() error {
Context.rdns.Begin(ip)
}
- if srcs.WHOIS && !netutil.IsSpecialPurposeAddr(ip) {
- Context.whois.Begin(ip)
- }
+ Context.whoisCh <- ip
}
return nil
diff --git a/internal/home/dns_internal_test.go b/internal/home/dns_internal_test.go
new file mode 100644
index 00000000..8ba988f2
--- /dev/null
+++ b/internal/home/dns_internal_test.go
@@ -0,0 +1,176 @@
+package home
+
+import (
+ "net"
+ "testing"
+
+ "github.com/AdguardTeam/AdGuardHome/internal/filtering"
+ "github.com/AdguardTeam/AdGuardHome/internal/schedule"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestApplyAdditionalFiltering(t *testing.T) {
+ var err error
+
+ Context.filters, err = filtering.New(&filtering.Config{
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ },
+ }, nil)
+ require.NoError(t, err)
+
+ Context.clients.idIndex = map[string]*Client{
+ "default": {
+ UseOwnSettings: false,
+ safeSearchConf: filtering.SafeSearchConfig{Enabled: false},
+ FilteringEnabled: false,
+ SafeBrowsingEnabled: false,
+ ParentalEnabled: false,
+ },
+ "custom_filtering": {
+ UseOwnSettings: true,
+ safeSearchConf: filtering.SafeSearchConfig{Enabled: true},
+ FilteringEnabled: true,
+ SafeBrowsingEnabled: true,
+ ParentalEnabled: true,
+ },
+ "partial_custom_filtering": {
+ UseOwnSettings: true,
+ safeSearchConf: filtering.SafeSearchConfig{Enabled: true},
+ FilteringEnabled: true,
+ SafeBrowsingEnabled: false,
+ ParentalEnabled: false,
+ },
+ }
+
+ testCases := []struct {
+ name string
+ id string
+ FilteringEnabled assert.BoolAssertionFunc
+ SafeSearchEnabled assert.BoolAssertionFunc
+ SafeBrowsingEnabled assert.BoolAssertionFunc
+ ParentalEnabled assert.BoolAssertionFunc
+ }{{
+ name: "global_settings",
+ id: "default",
+ FilteringEnabled: assert.False,
+ SafeSearchEnabled: assert.False,
+ SafeBrowsingEnabled: assert.False,
+ ParentalEnabled: assert.False,
+ }, {
+ name: "custom_settings",
+ id: "custom_filtering",
+ FilteringEnabled: assert.True,
+ SafeSearchEnabled: assert.True,
+ SafeBrowsingEnabled: assert.True,
+ ParentalEnabled: assert.True,
+ }, {
+ name: "partial",
+ id: "partial_custom_filtering",
+ FilteringEnabled: assert.True,
+ SafeSearchEnabled: assert.True,
+ SafeBrowsingEnabled: assert.False,
+ ParentalEnabled: assert.False,
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ setts := &filtering.Settings{}
+
+ applyAdditionalFiltering(net.IP{1, 2, 3, 4}, tc.id, setts)
+ tc.FilteringEnabled(t, setts.FilteringEnabled)
+ tc.SafeSearchEnabled(t, setts.SafeSearchEnabled)
+ tc.SafeBrowsingEnabled(t, setts.SafeBrowsingEnabled)
+ tc.ParentalEnabled(t, setts.ParentalEnabled)
+ })
+ }
+}
+
+func TestApplyAdditionalFiltering_blockedServices(t *testing.T) {
+ filtering.InitModule()
+
+ var (
+ globalBlockedServices = []string{"ok"}
+ clientBlockedServices = []string{"ok", "mail_ru", "vk"}
+ invalidBlockedServices = []string{"invalid"}
+
+ err error
+ )
+
+ Context.filters, err = filtering.New(&filtering.Config{
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ IDs: globalBlockedServices,
+ },
+ }, nil)
+ require.NoError(t, err)
+
+ Context.clients.idIndex = map[string]*Client{
+ "default": {
+ UseOwnBlockedServices: false,
+ },
+ "no_services": {
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ },
+ UseOwnBlockedServices: true,
+ },
+ "services": {
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ IDs: clientBlockedServices,
+ },
+ UseOwnBlockedServices: true,
+ },
+ "invalid_services": {
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.EmptyWeekly(),
+ IDs: invalidBlockedServices,
+ },
+ UseOwnBlockedServices: true,
+ },
+ "allow_all": {
+ BlockedServices: &filtering.BlockedServices{
+ Schedule: schedule.FullWeekly(),
+ IDs: clientBlockedServices,
+ },
+ UseOwnBlockedServices: true,
+ },
+ }
+
+ testCases := []struct {
+ name string
+ id string
+ wantLen int
+ }{{
+ name: "global_settings",
+ id: "default",
+ wantLen: len(globalBlockedServices),
+ }, {
+ name: "custom_settings",
+ id: "no_services",
+ wantLen: 0,
+ }, {
+ name: "custom_settings_block",
+ id: "services",
+ wantLen: len(clientBlockedServices),
+ }, {
+ name: "custom_settings_invalid",
+ id: "invalid_services",
+ wantLen: 0,
+ }, {
+ name: "custom_settings_inactive_schedule",
+ id: "allow_all",
+ wantLen: 0,
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ setts := &filtering.Settings{}
+
+ applyAdditionalFiltering(net.IP{1, 2, 3, 4}, tc.id, setts)
+ require.Len(t, setts.ServicesRules, tc.wantLen)
+ })
+ }
+}
diff --git a/internal/home/home.go b/internal/home/home.go
index 5f1dd6f2..572168fd 100644
--- a/internal/home/home.go
+++ b/internal/home/home.go
@@ -57,7 +57,6 @@ type homeContext struct {
queryLog querylog.QueryLog // query log module
dnsServer *dnsforward.Server // DNS module
rdns *RDNS // rDNS module
- whois *WHOIS // WHOIS module
dhcpServer dhcpd.Interface // DHCP module
auth *Auth // HTTP authentication module
filters *filtering.DNSFilter // DNS filtering module
@@ -84,6 +83,9 @@ type homeContext struct {
client *http.Client
appSignalChannel chan os.Signal // Channel for receiving OS signals by the console app
+ // whoisCh is the channel for receiving IPs for WHOIS processing.
+ whoisCh chan netip.Addr
+
// tlsCipherIDs are the ID of the cipher suites that AdGuard Home must use.
tlsCipherIDs []uint16
@@ -353,21 +355,43 @@ func initContextClients() (err error) {
arpdb = aghnet.NewARPDB()
}
- Context.clients.Init(
+ err = Context.clients.Init(
config.Clients.Persistent,
Context.dhcpServer,
Context.etcHosts,
arpdb,
config.DNS.DnsfilterConf,
)
+ if err != nil {
+ // Don't wrap the error, because it's informative enough as is.
+ return err
+ }
return nil
}
// setupBindOpts overrides bind host/port from the opts.
func setupBindOpts(opts options) (err error) {
+ bindAddr := opts.bindAddr
+ if bindAddr != (netip.AddrPort{}) {
+ config.HTTPConfig.Address = bindAddr
+
+ if config.HTTPConfig.Address.Port() != 0 {
+ err = checkPorts()
+ if err != nil {
+ // Don't wrap the error, because it's informative enough as is.
+ return err
+ }
+ }
+
+ return nil
+ }
+
if opts.bindPort != 0 {
- config.BindPort = opts.bindPort
+ config.HTTPConfig.Address = netip.AddrPortFrom(
+ config.HTTPConfig.Address.Addr(),
+ uint16(opts.bindPort),
+ )
err = checkPorts()
if err != nil {
@@ -377,7 +401,10 @@ func setupBindOpts(opts options) (err error) {
}
if opts.bindHost.IsValid() {
- config.BindHost = opts.bindHost
+ config.HTTPConfig.Address = netip.AddrPortFrom(
+ opts.bindHost,
+ config.HTTPConfig.Address.Port(),
+ )
}
return nil
@@ -461,7 +488,7 @@ func setupDNSFilteringConf(conf *filtering.Config) (err error) {
// checkPorts is a helper for ports validation in config.
func checkPorts() (err error) {
tcpPorts := aghalg.UniqChecker[tcpPort]{}
- addPorts(tcpPorts, tcpPort(config.BindPort))
+ addPorts(tcpPorts, tcpPort(config.HTTPConfig.Address.Port()))
udpPorts := aghalg.UniqChecker[udpPort]{}
addPorts(udpPorts, udpPort(config.DNS.Port))
@@ -501,8 +528,8 @@ func initWeb(opts options, clientBuildFS fs.FS) (web *webAPI, err error) {
webConf := webConfig{
firstRun: Context.firstRun,
- BindHost: config.BindHost,
- BindPort: config.BindPort,
+ BindHost: config.HTTPConfig.Address.Addr(),
+ BindPort: int(config.HTTPConfig.Address.Port()),
ReadTimeout: readTimeout,
ReadHeaderTimeout: readHdrTimeout,
@@ -638,8 +665,8 @@ func initUsers() (auth *Auth, err error) {
log.Info("authratelimiter is disabled")
}
- sessionTTL := config.WebSessionTTLHours * 60 * 60
- auth = InitAuth(sessFilename, config.Users, sessionTTL, rateLimiter)
+ sessionTTL := config.HTTPConfig.SessionTTL.Seconds()
+ auth = InitAuth(sessFilename, config.Users, uint32(sessionTTL), rateLimiter)
if auth == nil {
return nil, errors.Error("initializing auth module failed")
}
@@ -917,7 +944,7 @@ func printHTTPAddresses(proto string) {
Context.tls.WriteDiskConfig(&tlsConf)
}
- port := config.BindPort
+ port := int(config.HTTPConfig.Address.Port())
if proto == aghhttp.SchemeHTTPS {
port = tlsConf.PortHTTPS
}
@@ -929,9 +956,9 @@ func printHTTPAddresses(proto string) {
return
}
- bindhost := config.BindHost
- if !bindhost.IsUnspecified() {
- printWebAddrs(proto, bindhost.String(), port)
+ bindHost := config.HTTPConfig.Address.Addr()
+ if !bindHost.IsUnspecified() {
+ printWebAddrs(proto, bindHost.String(), port)
return
}
@@ -942,14 +969,14 @@ func printHTTPAddresses(proto string) {
// That's weird, but we'll ignore it.
//
// TODO(e.burkov): Find out when it happens.
- printWebAddrs(proto, bindhost.String(), port)
+ printWebAddrs(proto, bindHost.String(), port)
return
}
for _, iface := range ifaces {
for _, addr := range iface.Addresses {
- printWebAddrs(proto, addr.String(), config.BindPort)
+ printWebAddrs(proto, addr.String(), port)
}
}
}
diff --git a/internal/home/options.go b/internal/home/options.go
index 1cfac3d9..e6e21c84 100644
--- a/internal/home/options.go
+++ b/internal/home/options.go
@@ -35,11 +35,18 @@ type options struct {
serviceControlAction string
// bindHost is the address on which to serve the HTTP UI.
+ //
+ // Deprecated: Use bindAddr.
bindHost netip.Addr
// bindPort is the port on which to serve the HTTP UI.
+ //
+ // Deprecated: Use bindAddr.
bindPort int
+ // bindAddr is the address to serve the web UI on.
+ bindAddr netip.AddrPort
+
// checkConfig is true if the current invocation is only required to check
// the configuration file and exit.
checkConfig bool
@@ -147,9 +154,10 @@ var cmdLineOpts = []cmdLineOpt{{
return o.bindHost.String(), true
},
- description: "Host address to bind HTTP server on.",
- longName: "host",
- shortName: "h",
+ description: "Deprecated. Host address to bind HTTP server on. Use --web-addr. " +
+ "The short -h will work as --help in the future.",
+ longName: "host",
+ shortName: "h",
}, {
updateWithValue: func(o options, v string) (options, error) {
var err error
@@ -174,9 +182,23 @@ var cmdLineOpts = []cmdLineOpt{{
return strconv.Itoa(o.bindPort), true
},
- description: "Port to serve HTTP pages on.",
+ description: "Deprecated. Port to serve HTTP pages on. Use --web-addr.",
longName: "port",
shortName: "p",
+}, {
+ updateWithValue: func(o options, v string) (oo options, err error) {
+ o.bindAddr, err = netip.ParseAddrPort(v)
+
+ return o, err
+ },
+ updateNoValue: nil,
+ effect: nil,
+ serialize: func(o options) (val string, ok bool) {
+ return o.bindAddr.String(), o.bindAddr.IsValid()
+ },
+ description: "Address to serve the web UI on, in the host:port format.",
+ longName: "web-addr",
+ shortName: "",
}, {
updateWithValue: func(o options, v string) (options, error) {
o.serviceControlAction = v
diff --git a/internal/home/options_test.go b/internal/home/options_test.go
index 2b507535..f5dc1c75 100644
--- a/internal/home/options_test.go
+++ b/internal/home/options_test.go
@@ -82,6 +82,23 @@ func TestParseBindPort(t *testing.T) {
testParseErr(t, "port too high", "-p", "18446744073709551617") // 2^64 + 1
}
+func TestParseBindAddr(t *testing.T) {
+ wantAddrPort := netip.MustParseAddrPort("1.2.3.4:8089")
+
+ assert.Zero(t, testParseOK(t).bindAddr, "empty is not web-addr")
+
+ assert.Equal(t, wantAddrPort, testParseOK(t, "--web-addr", "1.2.3.4:8089").bindAddr)
+ assert.Equal(t, netip.MustParseAddrPort("1.2.3.4:0"), testParseOK(t, "--web-addr", "1.2.3.4:0").bindAddr)
+ testParseParamMissing(t, "-web-addr")
+
+ testParseErr(t, "not an int", "--web-addr", "1.2.3.4:x")
+ testParseErr(t, "hex not supported", "--web-addr", "1.2.3.4:0x100")
+ testParseErr(t, "port negative", "--web-addr", "1.2.3.4:-1")
+ testParseErr(t, "port too high", "--web-addr", "1.2.3.4:65536")
+ testParseErr(t, "port too high", "--web-addr", "1.2.3.4:4294967297") // 2^32 + 1
+ testParseErr(t, "port too high", "--web-addr", "1.2.3.4:18446744073709551617") // 2^64 + 1
+}
+
func TestParseLogfile(t *testing.T) {
assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
@@ -162,6 +179,10 @@ func TestOptsToArgs(t *testing.T) {
name: "bind_port",
args: []string{"-p", "666"},
opts: options{bindPort: 666},
+ }, {
+ name: "web-addr",
+ args: []string{"--web-addr", "1.2.3.4:8080"},
+ opts: options{bindAddr: netip.MustParseAddrPort("1.2.3.4:8080")},
}, {
name: "log_file",
args: []string{"-l", "path"},
diff --git a/internal/home/rdns_test.go b/internal/home/rdns_test.go
index 4e424273..5582bf5b 100644
--- a/internal/home/rdns_test.go
+++ b/internal/home/rdns_test.go
@@ -228,12 +228,7 @@ func TestRDNS_WorkerLoop(t *testing.T) {
for _, tc := range testCases {
w.Reset()
- cc := &clientsContainer{
- list: map[string]*Client{},
- idIndex: map[string]*Client{},
- ipToRC: map[netip.Addr]*RuntimeClient{},
- allTags: stringutil.NewSet(),
- }
+ cc := newClientsContainer(t)
ch := make(chan netip.Addr)
rdns := &RDNS{
exchanger: &rDNSExchanger{
diff --git a/internal/home/tls.go b/internal/home/tls.go
index 84af6eae..c42d5175 100644
--- a/internal/home/tls.go
+++ b/internal/home/tls.go
@@ -320,7 +320,7 @@ func (m *tlsManager) handleTLSValidate(w http.ResponseWriter, r *http.Request) {
if setts.Enabled {
err = validatePorts(
- tcpPort(config.BindPort),
+ tcpPort(config.HTTPConfig.Address.Port()),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
tcpPort(setts.PortDNSCrypt),
@@ -407,7 +407,7 @@ func (m *tlsManager) handleTLSConfigure(w http.ResponseWriter, r *http.Request)
if req.Enabled {
err = validatePorts(
- tcpPort(config.BindPort),
+ tcpPort(config.HTTPConfig.Address.Port()),
tcpPort(req.PortHTTPS),
tcpPort(req.PortDNSOverTLS),
tcpPort(req.PortDNSCrypt),
diff --git a/internal/home/upgrade.go b/internal/home/upgrade.go
index e429eb41..b6df4cad 100644
--- a/internal/home/upgrade.go
+++ b/internal/home/upgrade.go
@@ -3,6 +3,7 @@ package home
import (
"bytes"
"fmt"
+ "net/netip"
"net/url"
"os"
"path"
@@ -22,7 +23,7 @@ import (
)
// currentSchemaVersion is the current schema version.
-const currentSchemaVersion = 20
+const currentSchemaVersion = 23
// These aliases are provided for convenience.
type (
@@ -94,6 +95,9 @@ func upgradeConfigSchema(oldVersion int, diskConf yobj) (err error) {
upgradeSchema17to18,
upgradeSchema18to19,
upgradeSchema19to20,
+ upgradeSchema20to21,
+ upgradeSchema21to22,
+ upgradeSchema22to23,
}
n := 0
@@ -1128,6 +1132,199 @@ func upgradeSchema19to20(diskConf yobj) (err error) {
return nil
}
+// upgradeSchema20to21 performs the following changes:
+//
+// # BEFORE:
+// 'dns':
+// 'blocked_services':
+// - 'svc_name'
+//
+// # AFTER:
+// 'dns':
+// 'blocked_services':
+// 'ids':
+// - 'svc_name'
+// 'schedule':
+// 'time_zone': 'Local'
+func upgradeSchema20to21(diskConf yobj) (err error) {
+ log.Printf("Upgrade yaml: 20 to 21")
+ diskConf["schema_version"] = 21
+
+ const field = "blocked_services"
+
+ dnsVal, ok := diskConf["dns"]
+ if !ok {
+ return nil
+ }
+
+ dns, ok := dnsVal.(yobj)
+ if !ok {
+ return fmt.Errorf("unexpected type of dns: %T", dnsVal)
+ }
+
+ blockedVal, ok := dns[field]
+ if !ok {
+ return nil
+ }
+
+ services, ok := blockedVal.(yarr)
+ if !ok {
+ return fmt.Errorf("unexpected type of blocked: %T", blockedVal)
+ }
+
+ dns[field] = yobj{
+ "ids": services,
+ "schedule": yobj{
+ "time_zone": "Local",
+ },
+ }
+
+ return nil
+}
+
+// upgradeSchema21to22 performs the following changes:
+//
+// # BEFORE:
+// 'persistent':
+// - 'name': 'client_name'
+// 'blocked_services':
+// - 'svc_name'
+//
+// # AFTER:
+// 'persistent':
+// - 'name': 'client_name'
+// 'blocked_services':
+// 'ids':
+// - 'svc_name'
+// 'schedule':
+// 'time_zone': 'Local'
+func upgradeSchema21to22(diskConf yobj) (err error) {
+ log.Println("Upgrade yaml: 21 to 22")
+ diskConf["schema_version"] = 22
+
+ const field = "blocked_services"
+
+ clientsVal, ok := diskConf["clients"]
+ if !ok {
+ return nil
+ }
+
+ clients, ok := clientsVal.(yobj)
+ if !ok {
+ return fmt.Errorf("unexpected type of clients: %T", clientsVal)
+ }
+
+ persistentVal, ok := clients["persistent"]
+ if !ok {
+ return nil
+ }
+
+ persistent, ok := persistentVal.([]any)
+ if !ok {
+ return fmt.Errorf("unexpected type of persistent clients: %T", persistentVal)
+ }
+
+ for i, val := range persistent {
+ var c yobj
+ c, ok = val.(yobj)
+ if !ok {
+ return fmt.Errorf("persistent client at index %d: unexpected type %T", i, val)
+ }
+
+ var blockedVal any
+ blockedVal, ok = c[field]
+ if !ok {
+ continue
+ }
+
+ var services yarr
+ services, ok = blockedVal.(yarr)
+ if !ok {
+ return fmt.Errorf(
+ "persistent client at index %d: unexpected type of blocked services: %T",
+ i,
+ blockedVal,
+ )
+ }
+
+ c[field] = yobj{
+ "ids": services,
+ "schedule": yobj{
+ "time_zone": "Local",
+ },
+ }
+ }
+
+ return nil
+}
+
+// upgradeSchema22to23 performs the following changes:
+//
+// # BEFORE:
+// 'bind_host': '1.2.3.4'
+// 'bind_port': 8080
+// 'web_session_ttl': 720
+//
+// # AFTER:
+// 'http':
+// 'address': '1.2.3.4:8080'
+// 'session_ttl': '720h'
+func upgradeSchema22to23(diskConf yobj) (err error) {
+ log.Printf("Upgrade yaml: 22 to 23")
+ diskConf["schema_version"] = 23
+
+ bindHostVal, ok := diskConf["bind_host"]
+ if !ok {
+ return nil
+ }
+
+ bindHost, ok := bindHostVal.(string)
+ if !ok {
+ return fmt.Errorf("unexpected type of bind_host: %T", bindHostVal)
+ }
+
+ bindHostAddr, err := netip.ParseAddr(bindHost)
+ if err != nil {
+ return fmt.Errorf("invalid bind_host value: %s", bindHost)
+ }
+
+ bindPortVal, ok := diskConf["bind_port"]
+ if !ok {
+ return nil
+ }
+
+ bindPort, ok := bindPortVal.(int)
+ if !ok {
+ return fmt.Errorf("unexpected type of bind_port: %T", bindPortVal)
+ }
+
+ sessionTTLVal, ok := diskConf["web_session_ttl"]
+ if !ok {
+ return nil
+ }
+
+ sessionTTL, ok := sessionTTLVal.(int)
+ if !ok {
+ return fmt.Errorf("unexpected type of web_session_ttl: %T", sessionTTLVal)
+ }
+
+ addr := netip.AddrPortFrom(bindHostAddr, uint16(bindPort))
+ if !addr.IsValid() {
+ return fmt.Errorf("invalid address: %s", addr)
+ }
+
+ diskConf["http"] = yobj{
+ "address": addr.String(),
+ "session_ttl": timeutil.Duration{Duration: time.Duration(sessionTTL) * time.Hour}.String(),
+ }
+
+ delete(diskConf, "bind_host")
+ delete(diskConf, "bind_port")
+ delete(diskConf, "web_session_ttl")
+
+ return nil
+}
+
// TODO(a.garipov): Replace with log.Output when we port it to our logging
// package.
func funcName() string {
diff --git a/internal/home/upgrade_test.go b/internal/home/upgrade_test.go
index 11820be0..9f3f54dd 100644
--- a/internal/home/upgrade_test.go
+++ b/internal/home/upgrade_test.go
@@ -1140,3 +1140,169 @@ func TestUpgradeSchema19to20(t *testing.T) {
assert.Equal(t, 24*time.Hour, ivlVal.Duration)
})
}
+
+func TestUpgradeSchema20to21(t *testing.T) {
+ const newSchemaVer = 21
+
+ testCases := []struct {
+ in yobj
+ want yobj
+ name string
+ }{{
+ name: "nothing",
+ in: yobj{},
+ want: yobj{
+ "schema_version": newSchemaVer,
+ },
+ }, {
+ name: "no_clients",
+ in: yobj{
+ "dns": yobj{
+ "blocked_services": yarr{"ok"},
+ },
+ },
+ want: yobj{
+ "dns": yobj{
+ "blocked_services": yobj{
+ "ids": yarr{"ok"},
+ "schedule": yobj{
+ "time_zone": "Local",
+ },
+ },
+ },
+ "schema_version": newSchemaVer,
+ },
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := upgradeSchema20to21(tc.in)
+ require.NoError(t, err)
+
+ assert.Equal(t, tc.want, tc.in)
+ })
+ }
+}
+
+func TestUpgradeSchema21to22(t *testing.T) {
+ const newSchemaVer = 22
+
+ testCases := []struct {
+ in yobj
+ want yobj
+ name string
+ }{{
+ in: yobj{
+ "clients": yobj{},
+ },
+ want: yobj{
+ "clients": yobj{},
+ "schema_version": newSchemaVer,
+ },
+ name: "nothing",
+ }, {
+ in: yobj{
+ "clients": yobj{
+ "persistent": []any{yobj{"name": "localhost", "blocked_services": yarr{}}},
+ },
+ },
+ want: yobj{
+ "clients": yobj{
+ "persistent": []any{yobj{
+ "name": "localhost",
+ "blocked_services": yobj{
+ "ids": yarr{},
+ "schedule": yobj{
+ "time_zone": "Local",
+ },
+ },
+ }},
+ },
+ "schema_version": newSchemaVer,
+ },
+ name: "no_services",
+ }, {
+ in: yobj{
+ "clients": yobj{
+ "persistent": []any{yobj{"name": "localhost", "blocked_services": yarr{"ok"}}},
+ },
+ },
+ want: yobj{
+ "clients": yobj{
+ "persistent": []any{yobj{
+ "name": "localhost",
+ "blocked_services": yobj{
+ "ids": yarr{"ok"},
+ "schedule": yobj{
+ "time_zone": "Local",
+ },
+ },
+ }},
+ },
+ "schema_version": newSchemaVer,
+ },
+ name: "services",
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := upgradeSchema21to22(tc.in)
+ require.NoError(t, err)
+
+ assert.Equal(t, tc.want, tc.in)
+ })
+ }
+}
+
+func TestUpgradeSchema22to23(t *testing.T) {
+ const newSchemaVer = 23
+
+ testCases := []struct {
+ in yobj
+ want yobj
+ name string
+ }{{
+ name: "empty",
+ in: yobj{},
+ want: yobj{
+ "schema_version": newSchemaVer,
+ },
+ }, {
+ name: "ok",
+ in: yobj{
+ "bind_host": "1.2.3.4",
+ "bind_port": 8081,
+ "web_session_ttl": 720,
+ },
+ want: yobj{
+ "http": yobj{
+ "address": "1.2.3.4:8081",
+ "session_ttl": "720h",
+ },
+ "schema_version": newSchemaVer,
+ },
+ }, {
+ name: "v6_address",
+ in: yobj{
+ "bind_host": "2001:db8::1",
+ "bind_port": 8081,
+ "web_session_ttl": 720,
+ },
+ want: yobj{
+ "http": yobj{
+ "address": "[2001:db8::1]:8081",
+ "session_ttl": "720h",
+ },
+ "schema_version": newSchemaVer,
+ },
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := upgradeSchema22to23(tc.in)
+ require.NoError(t, err)
+
+ assert.Equal(t, tc.want, tc.in)
+ })
+ }
+}
diff --git a/internal/home/web.go b/internal/home/web.go
index e0b45fe5..d53c946b 100644
--- a/internal/home/web.go
+++ b/internal/home/web.go
@@ -119,7 +119,9 @@ func webCheckPortAvailable(port int) (ok bool) {
return true
}
- return aghnet.CheckPort("tcp", netip.AddrPortFrom(config.BindHost, uint16(port))) == nil
+ addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), uint16(port))
+
+ return aghnet.CheckPort("tcp", addrPort) == nil
}
// tlsConfigChanged updates the TLS configuration and restarts the HTTPS server
diff --git a/internal/home/whois.go b/internal/home/whois.go
deleted file mode 100644
index 9ffee9e0..00000000
--- a/internal/home/whois.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package home
-
-import (
- "context"
- "encoding/binary"
- "fmt"
- "io"
- "net"
- "net/netip"
- "strings"
- "time"
-
- "github.com/AdguardTeam/AdGuardHome/internal/aghio"
- "github.com/AdguardTeam/golibs/cache"
- "github.com/AdguardTeam/golibs/errors"
- "github.com/AdguardTeam/golibs/log"
- "github.com/AdguardTeam/golibs/stringutil"
-)
-
-const (
- defaultServer = "whois.arin.net"
- defaultPort = "43"
- maxValueLength = 250
- whoisTTL = 1 * 60 * 60 // 1 hour
-)
-
-// WHOIS - module context
-type WHOIS struct {
- clients *clientsContainer
- ipChan chan netip.Addr
-
- // dialContext specifies the dial function for creating unencrypted TCP
- // connections.
- dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
-
- // Contains IP addresses of clients
- // An active IP address is resolved once again after it expires.
- // If IP address couldn't be resolved, it stays here for some time to prevent further attempts to resolve the same IP.
- ipAddrs cache.Cache
-
- // TODO(a.garipov): Rewrite to use time.Duration. Like, seriously, why?
- timeoutMsec uint
-}
-
-// initWHOIS creates the WHOIS module context.
-func initWHOIS(clients *clientsContainer) *WHOIS {
- w := WHOIS{
- timeoutMsec: 5000,
- clients: clients,
- ipAddrs: cache.New(cache.Config{
- EnableLRU: true,
- MaxCount: 10000,
- }),
- dialContext: customDialContext,
- ipChan: make(chan netip.Addr, 255),
- }
-
- go w.workerLoop()
-
- return &w
-}
-
-// If the value is too large - cut it and append "..."
-func trimValue(s string) string {
- if len(s) <= maxValueLength {
- return s
- }
- return s[:maxValueLength-3] + "..."
-}
-
-// isWHOISComment returns true if the string is empty or is a WHOIS comment.
-func isWHOISComment(s string) (ok bool) {
- return len(s) == 0 || s[0] == '#' || s[0] == '%'
-}
-
-// strmap is an alias for convenience.
-type strmap = map[string]string
-
-// whoisParse parses a subset of plain-text data from the WHOIS response into
-// a string map.
-func whoisParse(data string) (m strmap) {
- m = strmap{}
-
- var orgname string
- lines := strings.Split(data, "\n")
- for _, l := range lines {
- if isWHOISComment(l) {
- continue
- }
-
- kv := strings.SplitN(l, ":", 2)
- if len(kv) != 2 {
- continue
- }
-
- k := strings.ToLower(strings.TrimSpace(kv[0]))
- v := strings.TrimSpace(kv[1])
- if v == "" {
- continue
- }
-
- switch k {
- case "orgname", "org-name":
- k = "orgname"
- v = trimValue(v)
- orgname = v
- case "city", "country":
- v = trimValue(v)
- case "descr", "netname":
- k = "orgname"
- v = stringutil.Coalesce(orgname, v)
- orgname = v
- case "whois":
- k = "whois"
- case "referralserver":
- k = "whois"
- v = strings.TrimPrefix(v, "whois://")
- default:
- continue
- }
-
- m[k] = v
- }
-
- return m
-}
-
-// MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
-const MaxConnReadSize = 64 * 1024
-
-// Send request to a server and receive the response
-func (w *WHOIS) query(ctx context.Context, target, serverAddr string) (data string, err error) {
- addr, _, _ := net.SplitHostPort(serverAddr)
- if addr == "whois.arin.net" {
- target = "n + " + target
- }
-
- conn, err := w.dialContext(ctx, "tcp", serverAddr)
- if err != nil {
- return "", err
- }
- defer func() { err = errors.WithDeferred(err, conn.Close()) }()
-
- r, err := aghio.LimitReader(conn, MaxConnReadSize)
- if err != nil {
- return "", err
- }
-
- _ = conn.SetReadDeadline(time.Now().Add(time.Duration(w.timeoutMsec) * time.Millisecond))
- _, err = conn.Write([]byte(target + "\r\n"))
- if err != nil {
- return "", err
- }
-
- // This use of ReadAll is now safe, because we limited the conn Reader.
- var whoisData []byte
- whoisData, err = io.ReadAll(r)
- if err != nil {
- return "", err
- }
-
- return string(whoisData), nil
-}
-
-// Query WHOIS servers (handle redirects)
-func (w *WHOIS) queryAll(ctx context.Context, target string) (string, error) {
- server := net.JoinHostPort(defaultServer, defaultPort)
- const maxRedirects = 5
- for i := 0; i != maxRedirects; i++ {
- resp, err := w.query(ctx, target, server)
- if err != nil {
- return "", err
- }
- log.Debug("whois: received response (%d bytes) from %s IP:%s", len(resp), server, target)
-
- m := whoisParse(resp)
- redir, ok := m["whois"]
- if !ok {
- return resp, nil
- }
- redir = strings.ToLower(redir)
-
- _, _, err = net.SplitHostPort(redir)
- if err != nil {
- server = net.JoinHostPort(redir, defaultPort)
- } else {
- server = redir
- }
-
- log.Debug("whois: redirected to %s IP:%s", redir, target)
- }
- return "", fmt.Errorf("whois: redirect loop")
-}
-
-// Request WHOIS information
-func (w *WHOIS) process(ctx context.Context, ip netip.Addr) (wi *RuntimeClientWHOISInfo) {
- resp, err := w.queryAll(ctx, ip.String())
- if err != nil {
- log.Debug("whois: error: %s IP:%s", err, ip)
-
- return nil
- }
-
- log.Debug("whois: IP:%s response: %d bytes", ip, len(resp))
-
- m := whoisParse(resp)
-
- wi = &RuntimeClientWHOISInfo{
- City: m["city"],
- Country: m["country"],
- Orgname: m["orgname"],
- }
-
- // Don't return an empty struct so that the frontend doesn't get
- // confused.
- if *wi == (RuntimeClientWHOISInfo{}) {
- return nil
- }
-
- return wi
-}
-
-// Begin - begin requesting WHOIS info
-func (w *WHOIS) Begin(ip netip.Addr) {
- ipBytes := ip.AsSlice()
- now := uint64(time.Now().Unix())
- expire := w.ipAddrs.Get(ipBytes)
- if len(expire) != 0 {
- exp := binary.BigEndian.Uint64(expire)
- if exp > now {
- return
- }
- }
-
- expire = make([]byte, 8)
- binary.BigEndian.PutUint64(expire, now+whoisTTL)
- _ = w.ipAddrs.Set(ipBytes, expire)
-
- log.Debug("whois: adding %s", ip)
-
- select {
- case w.ipChan <- ip:
- default:
- log.Debug("whois: queue is full")
- }
-}
-
-// workerLoop processes the IP addresses it got from the channel and associates
-// the retrieving WHOIS info with a client.
-func (w *WHOIS) workerLoop() {
- for ip := range w.ipChan {
- info := w.process(context.Background(), ip)
- if info == nil {
- continue
- }
-
- w.clients.setWHOISInfo(ip, info)
- }
-}
diff --git a/internal/home/whois_test.go b/internal/home/whois_test.go
deleted file mode 100644
index f05bd670..00000000
--- a/internal/home/whois_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package home
-
-import (
- "context"
- "io"
- "net"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
-)
-
-// fakeConn is a mock implementation of net.Conn to simplify testing.
-//
-// TODO(e.burkov): Search for other places in code where it may be used. Move
-// into aghtest then.
-type fakeConn struct {
- // Conn is embedded here simply to make *fakeConn a net.Conn without
- // actually implementing all methods.
- net.Conn
- data []byte
-}
-
-// Write implements net.Conn interface for *fakeConn. It always returns 0 and a
-// nil error without mutating the slice.
-func (c *fakeConn) Write(_ []byte) (n int, err error) {
- return 0, nil
-}
-
-// Read implements net.Conn interface for *fakeConn. It puts the content of
-// c.data field into b up to the b's capacity.
-func (c *fakeConn) Read(b []byte) (n int, err error) {
- return copy(b, c.data), io.EOF
-}
-
-// Close implements net.Conn interface for *fakeConn. It always returns nil.
-func (c *fakeConn) Close() (err error) {
- return nil
-}
-
-// SetReadDeadline implements net.Conn interface for *fakeConn. It always
-// returns nil.
-func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
- return nil
-}
-
-// fakeDial is a mock implementation of customDialContext to simplify testing.
-func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
- return c, nil
-}
-
-func TestWHOIS(t *testing.T) {
- const (
- nl = "\n"
- data = `OrgName: FakeOrg LLC` + nl +
- `City: Nonreal` + nl +
- `Country: Imagiland` + nl
- )
-
- fc := &fakeConn{
- data: []byte(data),
- }
-
- w := WHOIS{
- timeoutMsec: 5000,
- dialContext: fc.fakeDial,
- }
- resp, err := w.queryAll(context.Background(), "1.2.3.4")
- assert.NoError(t, err)
-
- m := whoisParse(resp)
- require.NotEmpty(t, m)
-
- assert.Equal(t, "FakeOrg LLC", m["orgname"])
- assert.Equal(t, "Imagiland", m["country"])
- assert.Equal(t, "Nonreal", m["city"])
-}
-
-func TestWHOISParse(t *testing.T) {
- const (
- city = "Nonreal"
- country = "Imagiland"
- orgname = "FakeOrgLLC"
- whois = "whois.example.net"
- )
-
- testCases := []struct {
- want strmap
- name string
- in string
- }{{
- want: strmap{},
- name: "empty",
- in: ``,
- }, {
- want: strmap{},
- name: "comments",
- in: "%\n#",
- }, {
- want: strmap{},
- name: "no_colon",
- in: "city",
- }, {
- want: strmap{},
- name: "no_value",
- in: "city:",
- }, {
- want: strmap{"city": city},
- name: "city",
- in: `city: ` + city,
- }, {
- want: strmap{"country": country},
- name: "country",
- in: `country: ` + country,
- }, {
- want: strmap{"orgname": orgname},
- name: "orgname",
- in: `orgname: ` + orgname,
- }, {
- want: strmap{"orgname": orgname},
- name: "orgname_hyphen",
- in: `org-name: ` + orgname,
- }, {
- want: strmap{"orgname": orgname},
- name: "orgname_descr",
- in: `descr: ` + orgname,
- }, {
- want: strmap{"orgname": orgname},
- name: "orgname_netname",
- in: `netname: ` + orgname,
- }, {
- want: strmap{"whois": whois},
- name: "whois",
- in: `whois: ` + whois,
- }, {
- want: strmap{"whois": whois},
- name: "referralserver",
- in: `referralserver: whois://` + whois,
- }, {
- want: strmap{},
- name: "other",
- in: `other: value`,
- }}
-
- for _, tc := range testCases {
- t.Run(tc.name, func(t *testing.T) {
- got := whoisParse(tc.in)
- assert.Equal(t, tc.want, got)
- })
- }
-}
diff --git a/internal/next/agh/agh.go b/internal/next/agh/agh.go
new file mode 100644
index 00000000..52855524
--- /dev/null
+++ b/internal/next/agh/agh.go
@@ -0,0 +1,63 @@
+// Package agh contains common entities and interfaces of AdGuard Home.
+package agh
+
+import "context"
+
+// Service is the interface for API servers.
+//
+// TODO(a.garipov): Consider adding a context to Start.
+//
+// TODO(a.garipov): Consider adding a Wait method or making an extension
+// interface for that.
+type Service interface {
+ // Start starts the service. It does not block.
+ Start() (err error)
+
+ // Shutdown gracefully stops the service. ctx is used to determine
+ // a timeout before trying to stop the service less gracefully.
+ Shutdown(ctx context.Context) (err error)
+}
+
+// type check
+var _ Service = EmptyService{}
+
+// EmptyService is a [Service] that does nothing.
+//
+// TODO(a.garipov): Remove if unnecessary.
+type EmptyService struct{}
+
+// Start implements the [Service] interface for EmptyService.
+func (EmptyService) Start() (err error) { return nil }
+
+// Shutdown implements the [Service] interface for EmptyService.
+func (EmptyService) Shutdown(_ context.Context) (err error) { return nil }
+
+// ServiceWithConfig is an extension of the [Service] interface for services
+// that can return their configuration.
+//
+// TODO(a.garipov): Consider removing this generic interface if we figure out
+// how to make it testable in a better way.
+type ServiceWithConfig[ConfigType any] interface {
+ Service
+
+ Config() (c ConfigType)
+}
+
+// type check
+var _ ServiceWithConfig[struct{}] = (*EmptyServiceWithConfig[struct{}])(nil)
+
+// EmptyServiceWithConfig is a ServiceWithConfig that does nothing. Its Config
+// method returns Conf.
+//
+// TODO(a.garipov): Remove if unnecessary.
+type EmptyServiceWithConfig[ConfigType any] struct {
+ EmptyService
+
+ Conf ConfigType
+}
+
+// Config implements the [ServiceWithConfig] interface for
+// *EmptyServiceWithConfig.
+func (s *EmptyServiceWithConfig[ConfigType]) Config() (conf ConfigType) {
+ return s.Conf
+}
diff --git a/internal/querylog/client.go b/internal/querylog/client.go
index f25440cc..b12313d6 100644
--- a/internal/querylog/client.go
+++ b/internal/querylog/client.go
@@ -1,23 +1,15 @@
package querylog
+import "github.com/AdguardTeam/AdGuardHome/internal/whois"
+
// Client is the information required by the query log to match against clients
// during searches.
type Client struct {
- WHOIS *ClientWHOIS `json:"whois,omitempty"`
- Name string `json:"name"`
- DisallowedRule string `json:"disallowed_rule"`
- Disallowed bool `json:"disallowed"`
- IgnoreQueryLog bool `json:"-"`
-}
-
-// ClientWHOIS is the filtered WHOIS data for the client.
-//
-// TODO(a.garipov): Merge with home.RuntimeClientWHOISInfo after the
-// refactoring is done.
-type ClientWHOIS struct {
- City string `json:"city,omitempty"`
- Country string `json:"country,omitempty"`
- Orgname string `json:"orgname,omitempty"`
+ WHOIS *whois.Info `json:"whois,omitempty"`
+ Name string `json:"name"`
+ DisallowedRule string `json:"disallowed_rule"`
+ Disallowed bool `json:"disallowed"`
+ IgnoreQueryLog bool `json:"-"`
}
// clientCacheKey is the key by which a cached client information is found.
diff --git a/internal/querylog/qlog.go b/internal/querylog/qlog.go
index 4d543587..1607fd72 100644
--- a/internal/querylog/qlog.go
+++ b/internal/querylog/qlog.go
@@ -161,12 +161,15 @@ func (l *queryLog) clear() {
// newLogEntry creates an instance of logEntry from parameters.
func newLogEntry(params *AddParams) (entry *logEntry) {
q := params.Question.Question[0]
+ qHost := q.Name
+ if qHost != "." {
+ qHost = strings.ToLower(q.Name[:len(q.Name)-1])
+ }
entry = &logEntry{
// TODO(d.kolyshev): Export this timestamp to func params.
- Time: time.Now(),
-
- QHost: strings.ToLower(q.Name[:len(q.Name)-1]),
+ Time: time.Now(),
+ QHost: qHost,
QType: dns.Type(q.Qtype).String(),
QClass: dns.Class(q.Qclass).String(),
diff --git a/internal/querylog/qlog_test.go b/internal/querylog/qlog_test.go
index 58fcd704..db616ba8 100644
--- a/internal/querylog/qlog_test.go
+++ b/internal/querylog/qlog_test.go
@@ -43,6 +43,7 @@ func TestQueryLog(t *testing.T) {
// Add memory entries.
addEntry(l, "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3))
addEntry(l, "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4))
+ addEntry(l, "", net.IPv4(1, 1, 1, 5), net.IPv4(2, 2, 2, 5))
type tcAssertion struct {
host string
@@ -59,10 +60,11 @@ func TestQueryLog(t *testing.T) {
name: "all",
sCr: []searchCriterion{},
want: []tcAssertion{
- {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
- {num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
- {num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
- {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
+ {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
+ {num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
+ {num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
+ {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
+ {num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
},
}, {
name: "by_domain_strict",
@@ -104,10 +106,11 @@ func TestQueryLog(t *testing.T) {
value: "2.2.2",
}},
want: []tcAssertion{
- {num: 0, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
- {num: 1, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
- {num: 2, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
- {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
+ {num: 0, host: ".", answer: net.IPv4(1, 1, 1, 5), client: net.IPv4(2, 2, 2, 5)},
+ {num: 1, host: "example.com", answer: net.IPv4(1, 1, 1, 4), client: net.IPv4(2, 2, 2, 4)},
+ {num: 2, host: "test.example.org", answer: net.IPv4(1, 1, 1, 3), client: net.IPv4(2, 2, 2, 3)},
+ {num: 3, host: "example.org", answer: net.IPv4(1, 1, 1, 2), client: net.IPv4(2, 2, 2, 2)},
+ {num: 4, host: "example.org", answer: net.IPv4(1, 1, 1, 1), client: net.IPv4(2, 2, 2, 1)},
},
}}
diff --git a/internal/schedule/schedule.go b/internal/schedule/schedule.go
new file mode 100644
index 00000000..1bf96016
--- /dev/null
+++ b/internal/schedule/schedule.go
@@ -0,0 +1,250 @@
+// Package schedule provides types for scheduling.
+package schedule
+
+import (
+ "fmt"
+ "time"
+
+ "github.com/AdguardTeam/golibs/errors"
+ "github.com/AdguardTeam/golibs/timeutil"
+ "gopkg.in/yaml.v3"
+)
+
+// Weekly is a schedule for one week. Each day of the week has one range with
+// a beginning and an end.
+type Weekly struct {
+ // location is used to calculate the offsets of the day ranges.
+ location *time.Location
+
+ // days are the day ranges of this schedule. The indexes of this array are
+ // the [time.Weekday] values.
+ days [7]dayRange
+}
+
+// EmptyWeekly creates empty weekly schedule with local time zone.
+func EmptyWeekly() (w *Weekly) {
+ return &Weekly{
+ location: time.Local,
+ }
+}
+
+// FullWeekly creates full weekly schedule with local time zone.
+//
+// TODO(s.chzhen): Consider moving into tests.
+func FullWeekly() (w *Weekly) {
+ fullDay := dayRange{start: 0, end: maxDayRange}
+
+ return &Weekly{
+ location: time.Local,
+ days: [7]dayRange{
+ time.Sunday: fullDay,
+ time.Monday: fullDay,
+ time.Tuesday: fullDay,
+ time.Wednesday: fullDay,
+ time.Thursday: fullDay,
+ time.Friday: fullDay,
+ time.Saturday: fullDay,
+ },
+ }
+}
+
+// Clone returns a deep copy of a weekly.
+func (w *Weekly) Clone() (c *Weekly) {
+ // NOTE: Do not use time.LoadLocation, because the results will be
+ // different on time zone database update.
+ return &Weekly{
+ location: w.location,
+ days: w.days,
+ }
+}
+
+// Contains returns true if t is within the corresponding day range of the
+// schedule in the schedule's time zone.
+func (w *Weekly) Contains(t time.Time) (ok bool) {
+ t = t.In(w.location)
+ wd := t.Weekday()
+ dr := w.days[wd]
+
+ // Calculate the offset of the day range.
+ //
+ // NOTE: Do not use [time.Truncate] since it requires UTC time zone.
+ y, m, d := t.Date()
+ day := time.Date(y, m, d, 0, 0, 0, 0, w.location)
+ offset := t.Sub(day)
+
+ return dr.contains(offset)
+}
+
+// type check
+var _ yaml.Unmarshaler = (*Weekly)(nil)
+
+// UnmarshalYAML implements the [yaml.Unmarshaler] interface for *Weekly.
+func (w *Weekly) UnmarshalYAML(value *yaml.Node) (err error) {
+ conf := &weeklyConfig{}
+
+ err = value.Decode(conf)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return err
+ }
+
+ weekly := Weekly{}
+
+ weekly.location, err = time.LoadLocation(conf.TimeZone)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return err
+ }
+
+ days := []dayConfig{
+ time.Sunday: conf.Sunday,
+ time.Monday: conf.Monday,
+ time.Tuesday: conf.Tuesday,
+ time.Wednesday: conf.Wednesday,
+ time.Thursday: conf.Thursday,
+ time.Friday: conf.Friday,
+ time.Saturday: conf.Saturday,
+ }
+ for i, d := range days {
+ r := dayRange{
+ start: d.Start.Duration,
+ end: d.End.Duration,
+ }
+
+ err = w.validate(r)
+ if err != nil {
+ return fmt.Errorf("weekday %s: %w", time.Weekday(i), err)
+ }
+
+ weekly.days[i] = r
+ }
+
+ *w = weekly
+
+ return nil
+}
+
+// weeklyConfig is the YAML configuration structure of Weekly.
+type weeklyConfig struct {
+ // TimeZone is the local time zone.
+ TimeZone string `yaml:"time_zone"`
+
+ // Days of the week.
+
+ Sunday dayConfig `yaml:"sun,omitempty"`
+ Monday dayConfig `yaml:"mon,omitempty"`
+ Tuesday dayConfig `yaml:"tue,omitempty"`
+ Wednesday dayConfig `yaml:"wed,omitempty"`
+ Thursday dayConfig `yaml:"thu,omitempty"`
+ Friday dayConfig `yaml:"fri,omitempty"`
+ Saturday dayConfig `yaml:"sat,omitempty"`
+}
+
+// dayConfig is the YAML configuration structure of dayRange.
+type dayConfig struct {
+ Start timeutil.Duration `yaml:"start"`
+ End timeutil.Duration `yaml:"end"`
+}
+
+// maxDayRange is the maximum value for day range end.
+const maxDayRange = 24 * time.Hour
+
+// validate returns the day range rounding errors, if any.
+func (w *Weekly) validate(r dayRange) (err error) {
+ defer func() { err = errors.Annotate(err, "bad day range: %w") }()
+
+ err = r.validate()
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return err
+ }
+
+ start := r.start.Truncate(time.Minute)
+ end := r.end.Truncate(time.Minute)
+
+ switch {
+ case start != r.start:
+ return fmt.Errorf("start %s isn't rounded to minutes", r.start)
+ case end != r.end:
+ return fmt.Errorf("end %s isn't rounded to minutes", r.end)
+ default:
+ return nil
+ }
+}
+
+// type check
+var _ yaml.Marshaler = (*Weekly)(nil)
+
+// MarshalYAML implements the [yaml.Marshaler] interface for *Weekly.
+func (w *Weekly) MarshalYAML() (v any, err error) {
+ return weeklyConfig{
+ TimeZone: w.location.String(),
+ Sunday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Sunday].start},
+ End: timeutil.Duration{Duration: w.days[time.Sunday].end},
+ },
+ Monday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Monday].start},
+ End: timeutil.Duration{Duration: w.days[time.Monday].end},
+ },
+ Tuesday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Tuesday].start},
+ End: timeutil.Duration{Duration: w.days[time.Tuesday].end},
+ },
+ Wednesday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Wednesday].start},
+ End: timeutil.Duration{Duration: w.days[time.Wednesday].end},
+ },
+ Thursday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Thursday].start},
+ End: timeutil.Duration{Duration: w.days[time.Thursday].end},
+ },
+ Friday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Friday].start},
+ End: timeutil.Duration{Duration: w.days[time.Friday].end},
+ },
+ Saturday: dayConfig{
+ Start: timeutil.Duration{Duration: w.days[time.Saturday].start},
+ End: timeutil.Duration{Duration: w.days[time.Saturday].end},
+ },
+ }, nil
+}
+
+// dayRange represents a single interval within a day. The interval begins at
+// start and ends before end. That is, it contains a time point T if start <=
+// T < end.
+type dayRange struct {
+ // start is an offset from the beginning of the day. It must be greater
+ // than or equal to zero and less than 24h.
+ start time.Duration
+
+ // end is an offset from the beginning of the day. It must be greater than
+ // or equal to zero and less than or equal to 24h.
+ end time.Duration
+}
+
+// validate returns the day range validation errors, if any.
+func (r dayRange) validate() (err error) {
+ switch {
+ case r == dayRange{}:
+ return nil
+ case r.start < 0:
+ return fmt.Errorf("start %s is negative", r.start)
+ case r.end < 0:
+ return fmt.Errorf("end %s is negative", r.end)
+ case r.start >= r.end:
+ return fmt.Errorf("start %s is greater or equal to end %s", r.start, r.end)
+ case r.start >= maxDayRange:
+ return fmt.Errorf("start %s is greater or equal to %s", r.start, maxDayRange)
+ case r.end > maxDayRange:
+ return fmt.Errorf("end %s is greater than %s", r.end, maxDayRange)
+ default:
+ return nil
+ }
+}
+
+// contains returns true if start <= offset < end, where offset is the time
+// duration from the beginning of the day.
+func (r *dayRange) contains(offset time.Duration) (ok bool) {
+ return r.start <= offset && offset < r.end
+}
diff --git a/internal/schedule/schedule_internal_test.go b/internal/schedule/schedule_internal_test.go
new file mode 100644
index 00000000..f500524e
--- /dev/null
+++ b/internal/schedule/schedule_internal_test.go
@@ -0,0 +1,371 @@
+package schedule
+
+import (
+ "testing"
+ "time"
+
+ "github.com/AdguardTeam/golibs/testutil"
+ "github.com/AdguardTeam/golibs/timeutil"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "gopkg.in/yaml.v3"
+)
+
+func TestWeekly_Contains(t *testing.T) {
+ baseTime := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
+ otherTime := baseTime.Add(1 * timeutil.Day)
+
+ // NOTE: In the Etc area the sign of the offsets is flipped. So, Etc/GMT-3
+ // is actually UTC+03:00.
+ otherTZ := time.FixedZone("Etc/GMT-3", 3*60*60)
+
+ // baseSchedule, 12:00 to 14:00.
+ baseSchedule := &Weekly{
+ days: [7]dayRange{
+ time.Friday: {start: 12 * time.Hour, end: 14 * time.Hour},
+ },
+ location: time.UTC,
+ }
+
+ // allDaySchedule, 00:00 to 24:00.
+ allDaySchedule := &Weekly{
+ days: [7]dayRange{
+ time.Friday: {start: 0, end: 24 * time.Hour},
+ },
+ location: time.UTC,
+ }
+
+ // oneMinSchedule, 00:00 to 00:01.
+ oneMinSchedule := &Weekly{
+ days: [7]dayRange{
+ time.Friday: {start: 0, end: 1 * time.Minute},
+ },
+ location: time.UTC,
+ }
+
+ testCases := []struct {
+ schedule *Weekly
+ assert assert.BoolAssertionFunc
+ t time.Time
+ name string
+ }{{
+ schedule: EmptyWeekly(),
+ assert: assert.False,
+ t: baseTime,
+ name: "empty",
+ }, {
+ schedule: allDaySchedule,
+ assert: assert.True,
+ t: baseTime,
+ name: "same_day_all_day",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.True,
+ t: baseTime.Add(13 * time.Hour),
+ name: "same_day_inside",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.False,
+ t: baseTime.Add(11 * time.Hour),
+ name: "same_day_outside",
+ }, {
+ schedule: allDaySchedule,
+ assert: assert.True,
+ t: baseTime.Add(24*time.Hour - time.Second),
+ name: "same_day_last_second",
+ }, {
+ schedule: allDaySchedule,
+ assert: assert.False,
+ t: otherTime,
+ name: "other_day_all_day",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.False,
+ t: otherTime.Add(13 * time.Hour),
+ name: "other_day_inside",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.False,
+ t: otherTime.Add(11 * time.Hour),
+ name: "other_day_outside",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.True,
+ t: baseTime.Add(13 * time.Hour).In(otherTZ),
+ name: "same_day_inside_other_tz",
+ }, {
+ schedule: baseSchedule,
+ assert: assert.False,
+ t: baseTime.Add(11 * time.Hour).In(otherTZ),
+ name: "same_day_outside_other_tz",
+ }, {
+ schedule: oneMinSchedule,
+ assert: assert.True,
+ t: baseTime,
+ name: "one_minute_beginning",
+ }, {
+ schedule: oneMinSchedule,
+ assert: assert.True,
+ t: baseTime.Add(1*time.Minute - 1),
+ name: "one_minute_end",
+ }, {
+ schedule: oneMinSchedule,
+ assert: assert.False,
+ t: baseTime.Add(1 * time.Minute),
+ name: "one_minute_past_end",
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ tc.assert(t, tc.schedule.Contains(tc.t))
+ })
+ }
+}
+
+const brusselsSunday = `
+sun:
+ start: 12h
+ end: 14h
+time_zone: Europe/Brussels
+`
+
+func TestWeekly_UnmarshalYAML(t *testing.T) {
+ const (
+ sameTime = `
+sun:
+ start: 9h
+ end: 9h
+`
+ negativeStart = `
+sun:
+ start: -1h
+ end: 1h
+`
+ badTZ = `
+time_zone: "bad_timezone"
+`
+ badYAML = `
+yaml: "bad"
+yaml: "bad"
+`
+ )
+
+ brusseltsTZ, err := time.LoadLocation("Europe/Brussels")
+ require.NoError(t, err)
+
+ brusselsWeekly := &Weekly{
+ days: [7]dayRange{{
+ start: time.Hour * 12,
+ end: time.Hour * 14,
+ }},
+ location: brusseltsTZ,
+ }
+
+ testCases := []struct {
+ name string
+ wantErrMsg string
+ data []byte
+ want *Weekly
+ }{{
+ name: "empty",
+ wantErrMsg: "",
+ data: []byte(""),
+ want: &Weekly{},
+ }, {
+ name: "null",
+ wantErrMsg: "",
+ data: []byte("null"),
+ want: &Weekly{},
+ }, {
+ name: "brussels_sunday",
+ wantErrMsg: "",
+ data: []byte(brusselsSunday),
+ want: brusselsWeekly,
+ }, {
+ name: "start_equal_end",
+ wantErrMsg: "weekday Sunday: bad day range: start 9h0m0s is greater or equal to end 9h0m0s",
+ data: []byte(sameTime),
+ want: &Weekly{},
+ }, {
+ name: "start_negative",
+ wantErrMsg: "weekday Sunday: bad day range: start -1h0m0s is negative",
+ data: []byte(negativeStart),
+ want: &Weekly{},
+ }, {
+ name: "bad_time_zone",
+ wantErrMsg: "unknown time zone bad_timezone",
+ data: []byte(badTZ),
+ want: &Weekly{},
+ }, {
+ name: "bad_yaml",
+ wantErrMsg: "yaml: unmarshal errors:\n line 3: mapping key \"yaml\" already defined at line 2",
+ data: []byte(badYAML),
+ want: &Weekly{},
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ w := &Weekly{}
+ err = yaml.Unmarshal(tc.data, w)
+ testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
+
+ assert.Equal(t, tc.want, w)
+ })
+ }
+}
+
+func TestWeekly_MarshalYAML(t *testing.T) {
+ brusselsTZ, err := time.LoadLocation("Europe/Brussels")
+ require.NoError(t, err)
+
+ brusselsWeekly := &Weekly{
+ days: [7]dayRange{time.Sunday: {
+ start: time.Hour * 12,
+ end: time.Hour * 14,
+ }},
+ location: brusselsTZ,
+ }
+
+ testCases := []struct {
+ name string
+ data []byte
+ want *Weekly
+ }{{
+ name: "empty",
+ data: []byte(""),
+ want: &Weekly{},
+ }, {
+ name: "null",
+ data: []byte("null"),
+ want: &Weekly{},
+ }, {
+ name: "brussels_sunday",
+ data: []byte(brusselsSunday),
+ want: brusselsWeekly,
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ var data []byte
+ data, err = yaml.Marshal(brusselsWeekly)
+ require.NoError(t, err)
+
+ w := &Weekly{}
+ err = yaml.Unmarshal(data, w)
+ require.NoError(t, err)
+
+ assert.Equal(t, brusselsWeekly, w)
+ })
+ }
+}
+
+func TestWeekly_Validate(t *testing.T) {
+ testCases := []struct {
+ name string
+ in dayRange
+ wantErrMsg string
+ }{{
+ name: "empty",
+ wantErrMsg: "",
+ in: dayRange{},
+ }, {
+ name: "start_seconds",
+ wantErrMsg: "bad day range: start 1s isn't rounded to minutes",
+ in: dayRange{
+ start: time.Second,
+ end: time.Hour,
+ },
+ }, {
+ name: "end_seconds",
+ wantErrMsg: "bad day range: end 1s isn't rounded to minutes",
+ in: dayRange{
+ start: 0,
+ end: time.Second,
+ },
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ w := &Weekly{}
+ err := w.validate(tc.in)
+
+ testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
+ })
+ }
+}
+
+func TestDayRange_Validate(t *testing.T) {
+ testCases := []struct {
+ name string
+ in dayRange
+ wantErrMsg string
+ }{{
+ name: "empty",
+ wantErrMsg: "",
+ in: dayRange{},
+ }, {
+ name: "valid",
+ wantErrMsg: "",
+ in: dayRange{
+ start: time.Hour,
+ end: time.Hour * 2,
+ },
+ }, {
+ name: "valid_end_max",
+ wantErrMsg: "",
+ in: dayRange{
+ start: 0,
+ end: time.Hour * 24,
+ },
+ }, {
+ name: "start_negative",
+ wantErrMsg: "start -1h0m0s is negative",
+ in: dayRange{
+ start: time.Hour * -1,
+ end: time.Hour * 2,
+ },
+ }, {
+ name: "end_negative",
+ wantErrMsg: "end -1h0m0s is negative",
+ in: dayRange{
+ start: 0,
+ end: time.Hour * -1,
+ },
+ }, {
+ name: "start_equal_end",
+ wantErrMsg: "start 1h0m0s is greater or equal to end 1h0m0s",
+ in: dayRange{
+ start: time.Hour,
+ end: time.Hour,
+ },
+ }, {
+ name: "start_greater_end",
+ wantErrMsg: "start 2h0m0s is greater or equal to end 1h0m0s",
+ in: dayRange{
+ start: time.Hour * 2,
+ end: time.Hour,
+ },
+ }, {
+ name: "start_equal_max",
+ wantErrMsg: "start 24h0m0s is greater or equal to 24h0m0s",
+ in: dayRange{
+ start: time.Hour * 24,
+ end: time.Hour * 48,
+ },
+ }, {
+ name: "end_greater_max",
+ wantErrMsg: "end 48h0m0s is greater than 24h0m0s",
+ in: dayRange{
+ start: 0,
+ end: time.Hour * 48,
+ },
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := tc.in.validate()
+
+ testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
+ })
+ }
+}
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
index bf6a766d..540064a7 100644
--- a/internal/tools/go.mod
+++ b/internal/tools/go.mod
@@ -4,20 +4,21 @@ go 1.19
require (
github.com/fzipp/gocyclo v0.6.0
- github.com/golangci/misspell v0.4.0
- github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
+ github.com/golangci/misspell v0.4.1
+ github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601
github.com/kisielk/errcheck v1.6.3
github.com/kyoh86/looppointer v0.2.1
github.com/securego/gosec/v2 v2.16.0
- golang.org/x/tools v0.9.3
- golang.org/x/vuln v0.1.0
+ github.com/uudashr/gocognit v1.0.6
+ golang.org/x/tools v0.10.0
+ golang.org/x/vuln v0.2.0
honnef.co/go/tools v0.4.3
mvdan.cc/gofumpt v0.5.0
- mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8
+ mvdan.cc/unparam v0.0.0-20230610194454-9ea02bef9868
)
require (
- github.com/BurntSushi/toml v1.3.1 // indirect
+ github.com/BurntSushi/toml v1.3.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gookit/color v1.5.3 // indirect
@@ -25,9 +26,9 @@ require (
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
- golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect
- golang.org/x/mod v0.10.0 // indirect
- golang.org/x/sync v0.2.0 // indirect
- golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/exp/typeparams v0.0.0-20230626212559-97b1e661b5df // indirect
+ golang.org/x/mod v0.11.0 // indirect
+ golang.org/x/sync v0.3.0 // indirect
+ golang.org/x/sys v0.9.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/internal/tools/go.sum b/internal/tools/go.sum
index 93724bea..5f85cfa4 100644
--- a/internal/tools/go.sum
+++ b/internal/tools/go.sum
@@ -1,6 +1,5 @@
-github.com/BurntSushi/toml v1.3.1 h1:rHnDkSK+/g6DlREUK73PkmIs60pqrnuduK+JmP++JmU=
-github.com/BurntSushi/toml v1.3.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@@ -8,8 +7,8 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/golangci/misspell v0.4.0 h1:KtVB/hTK4bbL/S6bs64rYyk8adjmh1BygbBiaAiX+a0=
-github.com/golangci/misspell v0.4.0/go.mod h1:W6O/bwV6lGDxUCChm2ykw9NQdd5bYd1Xkjo88UcWyJc=
+github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g=
+github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI=
github.com/google/go-cmdtest v0.4.1-0.20220921163831-55ab3332a786 h1:rcv+Ippz6RAtvaGgKxc+8FQIpxHgsF+HBzPyYL2cyVU=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -19,8 +18,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gookit/color v1.5.3 h1:twfIhZs4QLCtimkP7MOxlF3A0U/5cDPseRT9M/+2SCE=
github.com/gookit/color v1.5.3/go.mod h1:NUzwzeehUfl7GIb36pqId+UGmRfQcU/WiiyTTeNjHtE=
-github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=
-github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
+github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8=
+github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8=
github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -40,6 +39,8 @@ github.com/securego/gosec/v2 v2.16.0 h1:Pi0JKoasQQ3NnoRao/ww/N/XdynIB9NRYYZT5CyO
github.com/securego/gosec/v2 v2.16.0/go.mod h1:xvLcVZqUfo4aAQu56TNv7/Ltz6emAOQAEsrZrt7uGlI=
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y=
+github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -51,25 +52,26 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 h1:pnP8r+W8Fm7XJ8CWtXi4S9oJmPBTrkfYN/dNbaPj6Y4=
-golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/exp/typeparams v0.0.0-20230626212559-97b1e661b5df h1:jfUqBujZx2dktJVEmZpCkyngz7MWrVv1y9kLOqFNsqw=
+golang.org/x/exp/typeparams v0.0.0-20230626212559-97b1e661b5df/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -79,8 +81,9 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -92,10 +95,11 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
-golang.org/x/vuln v0.1.0 h1:9GRdj6wAIkDrsMevuolY+SXERPjQPp2P1ysYA0jpZe0=
-golang.org/x/vuln v0.1.0/go.mod h1:/YuzZYjGbwB8y19CisAppfyw3uTZnuCz3r+qgx/QRzU=
+golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
+golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/vuln v0.2.0 h1:Dlz47lW0pvPHU7tnb10S8vbMn9GnV2B6eyT7Tem5XBI=
+golang.org/x/vuln v0.2.0/go.mod h1:V0eyhHwaAaHrt42J9bgrN6rd12f6GU4T0Lu0ex2wDg4=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -107,5 +111,5 @@ honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw=
honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E=
mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js=
-mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8 h1:VuJo4Mt0EVPychre4fNlDWDuE5AjXtPJpRUWqZDQhaI=
-mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8/go.mod h1:Oh/d7dEtzsNHGOq1Cdv8aMm3KdKhVvPbRQcM8WFpBR8=
+mvdan.cc/unparam v0.0.0-20230610194454-9ea02bef9868 h1:F4Q7pXcrU9UiU1fq0ZWqSOxKjNAteRuDr7JDk7uVLRQ=
+mvdan.cc/unparam v0.0.0-20230610194454-9ea02bef9868/go.mod h1:6ZaiQyI7Tiq0HQ56g6N8TlkSd80/LyagZeaw8mb7jYE=
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
index 88f55fa9..a1a473ff 100644
--- a/internal/tools/tools.go
+++ b/internal/tools/tools.go
@@ -9,6 +9,7 @@ import (
_ "github.com/kisielk/errcheck"
_ "github.com/kyoh86/looppointer"
_ "github.com/securego/gosec/v2/cmd/gosec"
+ _ "github.com/uudashr/gocognit/cmd/gocognit"
_ "golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness"
_ "golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow"
_ "golang.org/x/vuln/cmd/govulncheck"
diff --git a/internal/version/version.go b/internal/version/version.go
index ca78efff..b553d6f8 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -143,14 +143,7 @@ func Verbose() (v string) {
runtime.Version(),
)
- if committime != "" {
- commitTimeUnix, err := strconv.ParseInt(committime, 10, 64)
- if err != nil {
- stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, fmt.Sprintf("parse error: %s", err))
- } else {
- stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, time.Unix(commitTimeUnix, 0).String())
- }
- }
+ writeCommitTime(b)
stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr)
if goarm != "" {
@@ -179,3 +172,16 @@ func Verbose() (v string) {
return b.String()
}
+
+func writeCommitTime(b *strings.Builder) {
+ if committime == "" {
+ return
+ }
+
+ commitTimeUnix, err := strconv.ParseInt(committime, 10, 64)
+ if err != nil {
+ stringutil.WriteToBuilder(b, "\n", vFmtTimeHdr, fmt.Sprintf("parse error: %s", err))
+ } else {
+ stringutil.WriteToBuilder(b, "\n", vFmtTimeHdr, time.Unix(commitTimeUnix, 0).String())
+ }
+}
diff --git a/internal/whois/whois.go b/internal/whois/whois.go
new file mode 100644
index 00000000..2a64bdd1
--- /dev/null
+++ b/internal/whois/whois.go
@@ -0,0 +1,388 @@
+// Package whois provides WHOIS functionality.
+package whois
+
+import (
+ "bytes"
+ "context"
+ "fmt"
+ "io"
+ "net"
+ "net/netip"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/internal/aghio"
+ "github.com/AdguardTeam/golibs/errors"
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/AdguardTeam/golibs/netutil"
+ "github.com/AdguardTeam/golibs/stringutil"
+ "github.com/bluele/gcache"
+)
+
+const (
+ // DefaultServer is the default WHOIS server.
+ DefaultServer = "whois.arin.net"
+
+ // DefaultPort is the default port for WHOIS requests.
+ DefaultPort = 43
+)
+
+// Interface provides WHOIS functionality.
+type Interface interface {
+ // Process makes WHOIS request and returns WHOIS information or nil.
+ // changed indicates that Info was updated since last request.
+ Process(ctx context.Context, ip netip.Addr) (info *Info, changed bool)
+}
+
+// Empty is an empty [Interface] implementation which does nothing.
+type Empty struct{}
+
+// type check
+var _ Interface = (*Empty)(nil)
+
+// Process implements the [Interface] interface for Empty.
+func (Empty) Process(_ context.Context, _ netip.Addr) (info *Info, changed bool) {
+ return nil, false
+}
+
+// Config is the configuration structure for Default.
+type Config struct {
+ // DialContext specifies the dial function for creating unencrypted TCP
+ // connections.
+ DialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
+
+ // ServerAddr is the address of the WHOIS server.
+ ServerAddr string
+
+ // Timeout is the timeout for WHOIS requests.
+ Timeout time.Duration
+
+ // CacheTTL is the Time to Live duration for cached IP addresses.
+ CacheTTL time.Duration
+
+ // MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
+ MaxConnReadSize int64
+
+ // MaxRedirects is the maximum redirects count.
+ MaxRedirects int
+
+ // MaxInfoLen is the maximum length of Info fields returned by Process.
+ MaxInfoLen int
+
+ // CacheSize is the maximum size of the cache. It must be greater than
+ // zero.
+ CacheSize int
+
+ // Port is the port for WHOIS requests.
+ Port uint16
+}
+
+// Default is the default WHOIS information processor.
+type Default struct {
+ // cache is the cache containing IP addresses of clients. An active IP
+ // address is resolved once again after it expires. If IP address couldn't
+ // be resolved, it stays here for some time to prevent further attempts to
+ // resolve the same IP.
+ cache gcache.Cache
+
+ // dialContext connects to a remote server resolving hostname using our own
+ // DNS server and unecrypted TCP connection.
+ dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
+
+ // serverAddr is the address of the WHOIS server.
+ serverAddr string
+
+ // portStr is the port for WHOIS requests.
+ portStr string
+
+ // timeout is the timeout for WHOIS requests.
+ timeout time.Duration
+
+ // cacheTTL is the Time to Live duration for cached IP addresses.
+ cacheTTL time.Duration
+
+ // maxConnReadSize is an upper limit in bytes for reading from net.Conn.
+ maxConnReadSize int64
+
+ // maxRedirects is the maximum redirects count.
+ maxRedirects int
+
+ // maxInfoLen is the maximum length of Info fields returned by Process.
+ maxInfoLen int
+}
+
+// New returns a new default WHOIS information processor. conf must not be
+// nil.
+func New(conf *Config) (w *Default) {
+ return &Default{
+ serverAddr: conf.ServerAddr,
+ dialContext: conf.DialContext,
+ timeout: conf.Timeout,
+ cache: gcache.New(conf.CacheSize).LRU().Build(),
+ maxConnReadSize: conf.MaxConnReadSize,
+ maxRedirects: conf.MaxRedirects,
+ portStr: strconv.Itoa(int(conf.Port)),
+ maxInfoLen: conf.MaxInfoLen,
+ cacheTTL: conf.CacheTTL,
+ }
+}
+
+// trimValue trims s and replaces the last 3 characters of the cut with "..."
+// to fit into max. max must be greater than 3.
+func trimValue(s string, max int) string {
+ if len(s) <= max {
+ return s
+ }
+
+ return s[:max-3] + "..."
+}
+
+// isWHOISComment returns true if the data is empty or is a WHOIS comment.
+func isWHOISComment(data []byte) (ok bool) {
+ return len(data) == 0 || data[0] == '#' || data[0] == '%'
+}
+
+// whoisParse parses a subset of plain-text data from the WHOIS response into a
+// string map. It trims values of the returned map to maxLen.
+func whoisParse(data []byte, maxLen int) (info map[string]string) {
+ info = map[string]string{}
+
+ var orgname string
+ lines := bytes.Split(data, []byte("\n"))
+ for _, l := range lines {
+ if isWHOISComment(l) {
+ continue
+ }
+
+ before, after, found := bytes.Cut(l, []byte(":"))
+ if !found {
+ continue
+ }
+
+ key := strings.ToLower(string(before))
+ val := strings.TrimSpace(string(after))
+ if val == "" {
+ continue
+ }
+
+ switch key {
+ case "orgname", "org-name":
+ key = "orgname"
+ val = trimValue(val, maxLen)
+ orgname = val
+ case "city", "country":
+ val = trimValue(val, maxLen)
+ case "descr", "netname":
+ key = "orgname"
+ val = stringutil.Coalesce(orgname, val)
+ orgname = val
+ case "whois":
+ key = "whois"
+ case "referralserver":
+ key = "whois"
+ val = strings.TrimPrefix(val, "whois://")
+ default:
+ continue
+ }
+
+ info[key] = val
+ }
+
+ return info
+}
+
+// query sends request to a server and returns the response or error.
+func (w *Default) query(ctx context.Context, target, serverAddr string) (data []byte, err error) {
+ addr, _, _ := net.SplitHostPort(serverAddr)
+ if addr == DefaultServer {
+ // Display type flags for query.
+ //
+ // See https://www.arin.net/resources/registry/whois/rws/api/#nicname-whois-queries.
+ target = "n + " + target
+ }
+
+ conn, err := w.dialContext(ctx, "tcp", serverAddr)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return nil, err
+ }
+ defer func() { err = errors.WithDeferred(err, conn.Close()) }()
+
+ r, err := aghio.LimitReader(conn, w.maxConnReadSize)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return nil, err
+ }
+
+ _ = conn.SetReadDeadline(time.Now().Add(w.timeout))
+ _, err = io.WriteString(conn, target+"\r\n")
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return nil, err
+ }
+
+ // This use of ReadAll is now safe, because we limited the conn Reader.
+ data, err = io.ReadAll(r)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return nil, err
+ }
+
+ return data, nil
+}
+
+// queryAll queries WHOIS server and handles redirects.
+func (w *Default) queryAll(ctx context.Context, target string) (info map[string]string, err error) {
+ server := net.JoinHostPort(w.serverAddr, w.portStr)
+ var data []byte
+
+ for i := 0; i < w.maxRedirects; i++ {
+ data, err = w.query(ctx, target, server)
+ if err != nil {
+ // Don't wrap the error since it's informative enough as is.
+ return nil, err
+ }
+
+ log.Debug("whois: received response (%d bytes) from %q about %q", len(data), server, target)
+
+ info = whoisParse(data, w.maxInfoLen)
+ redir, ok := info["whois"]
+ if !ok {
+ return info, nil
+ }
+
+ redir = strings.ToLower(redir)
+
+ _, _, err = net.SplitHostPort(redir)
+ if err != nil {
+ server = net.JoinHostPort(redir, w.portStr)
+ } else {
+ server = redir
+ }
+
+ log.Debug("whois: redirected to %q about %q", redir, target)
+ }
+
+ return nil, fmt.Errorf("whois: redirect loop")
+}
+
+// type check
+var _ Interface = (*Default)(nil)
+
+// Process makes WHOIS request and returns WHOIS information or nil. changed
+// indicates that Info was updated since last request.
+func (w *Default) Process(ctx context.Context, ip netip.Addr) (wi *Info, changed bool) {
+ if netutil.IsSpecialPurposeAddr(ip) {
+ return nil, false
+ }
+
+ wi, expired := w.findInCache(ip)
+ if wi != nil && !expired {
+ // Don't return an empty struct so that the frontend doesn't get
+ // confused.
+ if (*wi == Info{}) {
+ return nil, false
+ }
+
+ return wi, false
+ }
+
+ return w.requestInfo(ctx, ip, wi)
+}
+
+// requestInfo makes WHOIS request and returns WHOIS info. changed is false if
+// received information is equal to cached.
+func (w *Default) requestInfo(
+ ctx context.Context,
+ ip netip.Addr,
+ cached *Info,
+) (wi *Info, changed bool) {
+ var info Info
+
+ defer func() {
+ item := toCacheItem(info, w.cacheTTL)
+ err := w.cache.Set(ip, item)
+ if err != nil {
+ log.Debug("whois: cache: adding item %q: %s", ip, err)
+ }
+ }()
+
+ kv, err := w.queryAll(ctx, ip.String())
+ if err != nil {
+ log.Debug("whois: quering about %q: %s", ip, err)
+
+ return nil, true
+ }
+
+ info = Info{
+ City: kv["city"],
+ Country: kv["country"],
+ Orgname: kv["orgname"],
+ }
+
+ changed = cached == nil || info != *cached
+
+ // Don't return an empty struct so that the frontend doesn't get confused.
+ if (info == Info{}) {
+ return nil, changed
+ }
+
+ return &info, changed
+}
+
+// findInCache finds Info in the cache. expired indicates that Info is valid.
+func (w *Default) findInCache(ip netip.Addr) (wi *Info, expired bool) {
+ val, err := w.cache.Get(ip)
+ if err != nil {
+ if !errors.Is(err, gcache.KeyNotFoundError) {
+ log.Debug("whois: cache: retrieving info about %q: %s", ip, err)
+ }
+
+ return nil, false
+ }
+
+ item, ok := val.(*cacheItem)
+ if !ok {
+ log.Debug("whois: cache: %q bad type %T", ip, val)
+
+ return nil, false
+ }
+
+ return fromCacheItem(item)
+}
+
+// Info is the filtered WHOIS data for a runtime client.
+type Info struct {
+ City string `json:"city,omitempty"`
+ Country string `json:"country,omitempty"`
+ Orgname string `json:"orgname,omitempty"`
+}
+
+// cacheItem represents an item that we will store in the cache.
+type cacheItem struct {
+ // expiry is the time when cacheItem will expire.
+ expiry time.Time
+
+ // info is the WHOIS data for a runtime client.
+ info *Info
+}
+
+// toCacheItem creates a cached item from a WHOIS info and Time to Live
+// duration.
+func toCacheItem(info Info, ttl time.Duration) (item *cacheItem) {
+ return &cacheItem{
+ expiry: time.Now().Add(ttl),
+ info: &info,
+ }
+}
+
+// fromCacheItem creates a WHOIS info from the cached item. expired indicates
+// that WHOIS info is valid. item must not be nil.
+func fromCacheItem(item *cacheItem) (info *Info, expired bool) {
+ if time.Now().After(item.expiry) {
+ return item.info, true
+ }
+
+ return item.info, false
+}
diff --git a/internal/whois/whois_test.go b/internal/whois/whois_test.go
new file mode 100644
index 00000000..2fe32255
--- /dev/null
+++ b/internal/whois/whois_test.go
@@ -0,0 +1,155 @@
+package whois_test
+
+import (
+ "context"
+ "io"
+ "net"
+ "net/netip"
+ "testing"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/internal/whois"
+ "github.com/AdguardTeam/golibs/testutil/fakenet"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestDefault_Process(t *testing.T) {
+ const (
+ nl = "\n"
+ city = "Nonreal"
+ country = "Imagiland"
+ orgname = "FakeOrgLLC"
+ referralserver = "whois.example.net"
+ )
+
+ ip := netip.MustParseAddr("1.2.3.4")
+
+ testCases := []struct {
+ want *whois.Info
+ name string
+ data string
+ }{{
+ want: nil,
+ name: "empty",
+ data: "",
+ }, {
+ want: nil,
+ name: "comments",
+ data: "%\n#",
+ }, {
+ want: nil,
+ name: "no_colon",
+ data: "city",
+ }, {
+ want: nil,
+ name: "no_value",
+ data: "city:",
+ }, {
+ want: &whois.Info{
+ City: city,
+ },
+ name: "city",
+ data: "city: " + city,
+ }, {
+ want: &whois.Info{
+ Country: country,
+ },
+ name: "country",
+ data: "country: " + country,
+ }, {
+ want: &whois.Info{
+ Orgname: orgname,
+ },
+ name: "orgname",
+ data: "orgname: " + orgname,
+ }, {
+ want: &whois.Info{
+ Orgname: orgname,
+ },
+ name: "orgname_hyphen",
+ data: "org-name: " + orgname,
+ }, {
+ want: &whois.Info{
+ Orgname: orgname,
+ },
+ name: "orgname_descr",
+ data: "descr: " + orgname,
+ }, {
+ want: &whois.Info{
+ Orgname: orgname,
+ },
+ name: "orgname_netname",
+ data: "netname: " + orgname,
+ }, {
+ want: &whois.Info{
+ City: city,
+ Country: country,
+ Orgname: orgname,
+ },
+ name: "full",
+ data: "OrgName: " + orgname + nl + "City: " + city + nl + "Country: " + country,
+ }, {
+ want: nil,
+ name: "whois",
+ data: "whois: " + referralserver,
+ }, {
+ want: nil,
+ name: "referralserver",
+ data: "referralserver: whois://" + referralserver,
+ }, {
+ want: nil,
+ name: "other",
+ data: "other: value",
+ }}
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ hit := 0
+
+ fakeConn := &fakenet.Conn{
+ OnRead: func(b []byte) (n int, err error) {
+ hit++
+
+ return copy(b, tc.data), io.EOF
+ },
+ OnWrite: func(b []byte) (n int, err error) {
+ return len(b), nil
+ },
+ OnClose: func() (err error) {
+ return nil
+ },
+ OnSetReadDeadline: func(t time.Time) (err error) {
+ return nil
+ },
+ }
+
+ w := whois.New(&whois.Config{
+ Timeout: 5 * time.Second,
+ DialContext: func(_ context.Context, _, addr string) (_ net.Conn, _ error) {
+ hit = 0
+
+ return fakeConn, nil
+ },
+ MaxConnReadSize: 1024,
+ MaxRedirects: 3,
+ MaxInfoLen: 250,
+ CacheSize: 100,
+ CacheTTL: time.Hour,
+ })
+
+ got, changed := w.Process(context.Background(), ip)
+ require.True(t, changed)
+
+ assert.Equal(t, tc.want, got)
+ assert.Equal(t, 1, hit)
+
+ // From cache.
+ got, changed = w.Process(context.Background(), ip)
+ require.False(t, changed)
+
+ assert.Equal(t, tc.want, got)
+ assert.Equal(t, 1, hit)
+ })
+ }
+}
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index 6d74d4fd..b1519843 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1061,6 +1061,17 @@
'responses':
'200':
'description': 'OK.'
+ '/rewrite/update':
+ 'put':
+ 'tags':
+ - 'rewrite'
+ 'operationId': 'rewriteUpdate'
+ 'summary': 'Update a Rewrite rule'
+ 'requestBody':
+ '$ref': '#/components/requestBodies/RewriteUpdate'
+ 'responses':
+ '200':
+ 'description': 'OK.'
'/i18n/change_language':
'post':
'deprecated': true
@@ -1311,6 +1322,12 @@
'schema':
'$ref': '#/components/schemas/RewriteEntry'
'required': true
+ 'RewriteUpdate':
+ 'content':
+ 'application/json':
+ 'schema':
+ '$ref': '#/components/schemas/RewriteUpdate'
+ 'required': true
'schemas':
'ServerStatus':
'type': 'object'
@@ -2702,6 +2719,14 @@
'items':
'$ref': '#/components/schemas/RewriteEntry'
'description': 'Rewrite rules array'
+ 'RewriteUpdate':
+ 'type': 'object'
+ 'description': 'Rewrite rule update object'
+ 'properties':
+ 'target':
+ '$ref': '#/components/schemas/RewriteEntry'
+ 'update':
+ '$ref': '#/components/schemas/RewriteEntry'
'RewriteEntry':
'type': 'object'
'description': 'Rewrite rule'
diff --git a/scripts/README.md b/scripts/README.md
index cc823a99..579ee08a 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -2,7 +2,7 @@
## `hooks/`: Git Hooks
- ### Usage
+ ### Usage
Run `make init` from the project root.
@@ -10,7 +10,7 @@ Run `make init` from the project root.
## `querylog/`: Query Log Helpers
- ### Usage
+ ### Usage
* `npm install`: install dependencies. Run this first.
* `npm run anonymize `: read the query log from the ``
@@ -26,157 +26,215 @@ don't print anything, and `1`, be verbose.
- ### `build-docker.sh`: Build A Multi-Architecture Docker Image
+ ### `build-docker.sh`: Build A Multi-Architecture Docker Image
Required environment:
* `CHANNEL`: release channel, see above.
+
* `COMMIT`: current Git revision.
+
* `DIST_DIR`: the directory where a release has previously been built.
+
* `VERSION`: release version.
Optional environment:
* `DOCKER_IMAGE_NAME`: the name of the resulting Docker container. By default
it's `adguardhome-dev`.
+
* `DOCKER_OUTPUT`: the `--output` parameters. By default they are
`type=image,name=${DOCKER_IMAGE_NAME},push=false`.
+
* `SUDO`: allow users to use `sudo` or `doas` with `docker`. By default none
is used.
- ### `build-release.sh`: Build A Release For All Platforms
+ ### `build-release.sh`: Build A Release For All Platforms
Required environment:
+
* `CHANNEL`: release channel, see above.
+
* `GPG_KEY` and `GPG_KEY_PASSPHRASE`: data for `gpg`. Only required if `SIGN`
is `1`.
Optional environment:
+
* `ARCH` and `OS`: space-separated list of architectures and operating systems
for which to build a release. For example, to build only for 64-bit ARM and
AMD on Linux and Darwin:
+
```sh
make ARCH='amd64 arm64' OS='darwin linux' … build-release
```
The default value is `''`, which means build everything.
- * `BUILD_SNAP`: `0` to not build Snapcraft packages, `1` to build. The
- default value is `1`.
+
* `DIST_DIR`: the directory to build a release into. The default value is
`dist`.
+
* `GO`: set an alternative name for the Go compiler.
+
* `SIGN`: `0` to not sign the resulting packages, `1` to sign. The default
value is `1`.
+
* `VERBOSE`: `1` to be verbose, `2` to also print environment. This script
calls `go-build.sh` with the verbosity level one level lower, so to get
verbosity level `2` in `go-build.sh`, set this to `3` when calling
`build-release.sh`.
+
* `VERSION`: release version. Will be set by `version.sh` if it is unset or
if it has the default `Makefile` value of `v0.0.0`.
- ### `clean.sh`: Cleanup
+ ### `clean.sh`: Cleanup
Optional environment:
+
* `GO`: set an alternative name for the Go compiler.
Required environment:
+
* `DIST_DIR`: the directory where a release has previously been built.
- ### `go-build.sh`: Build The Backend
+ ### `go-build.sh`: Build The Backend
Optional environment:
+
* `GOARM`: ARM processor options for the Go compiler.
+
* `GOMIPS`: ARM processor options for the Go compiler.
+
* `GO`: set an alternative name for the Go compiler.
+
* `OUT`: output binary name.
+
* `PARALLELISM`: set the maximum number of concurrently run build commands
(that is, compiler, linker, etc.).
+
* `SOURCE_DATE_EPOCH`: the [standardized][repr] environment variable for the
Unix epoch time of the latest commit in the repository. If set, overrides
the default obtained from Git. Useful for reproducible builds.
+
* `VERBOSE`: verbosity level. `1` shows every command that is run and every
Go package that is processed. `2` also shows subcommands and environment.
The default value is `0`, don't be verbose.
+
* `VERSION`: release version. Will be set by `version.sh` if it is unset or
if it has the default `Makefile` value of `v0.0.0`.
Required environment:
+
* `CHANNEL`: release channel, see above.
[repr]: https://reproducible-builds.org/docs/source-date-epoch/
- ### `go-deps.sh`: Install Backend Dependencies
+ ### `go-deps.sh`: Install Backend Dependencies
Optional environment:
+
* `GO`: set an alternative name for the Go compiler.
+
* `VERBOSE`: verbosity level. `1` shows every command that is run and every
Go package that is processed. `2` also shows subcommands and environment.
The default value is `0`, don't be verbose.
- ### `go-lint.sh`: Run Backend Static Analyzers
+ ### `go-lint.sh`: Run Backend Static Analyzers
Don't forget to run `make go-tools` once first!
Optional environment:
+
* `EXIT_ON_ERROR`: if set to `0`, don't exit the script after the first
encountered error. The default value is `1`.
+
* `GO`: set an alternative name for the Go compiler.
+
* `VERBOSE`: verbosity level. `1` shows every command that is run. `2` also
shows subcommands. The default value is `0`, don't be verbose.
- ### `go-test.sh`: Run Backend Tests
+ ### `go-test.sh`: Run Backend Tests
Optional environment:
+
* `GO`: set an alternative name for the Go compiler.
+
* `RACE`: set to `0` to not use the Go race detector. The default value is
`1`, use the race detector.
+
* `TIMEOUT_FLAGS`: set timeout flags for tests. The default value is
`--timeout 30s`.
+
* `VERBOSE`: verbosity level. `1` shows every command that is run and every
Go package that is processed. `2` also shows subcommands. The default
value is `0`, don't be verbose.
- ### `go-tools.sh`: Install Backend Tooling
+ ### `go-tools.sh`: Install Backend Tooling
Installs the Go static analysis and other tools into `${PWD}/bin`. Either add
`${PWD}/bin` to your `$PATH` before all other entries, or use the commands
directly, or use the commands through `make` (for example, `make go-lint`).
Optional environment:
+
* `GO`: set an alternative name for the Go compiler.
- ### `version.sh`: Generate And Print The Current Version
+ ### `version.sh`: Generate And Print The Current Version
Required environment:
+
* `CHANNEL`: release channel, see above.
-## `snap/`: Snap GUI Files
+## `snap/`: Snapcraft scripts
-App icons (see https://github.com/AdguardTeam/AdGuardHome/pull/1836), Snap
-manifest file templates, and helper scripts.
+ ### `build.sh`
+
+Builds the Snapcraft packages from the binaries created by `download.sh`.
+
+ ### `download.sh`
+
+Downloads the binaries to pack them into Snapcraft packages.
+
+Required environment:
+
+ * `CHANNEL`: release channel, see above.
+
+ ### `upload.sh`
+
+Uploads the Snapcraft packages created by `build.sh`.
+
+Required environment:
+
+ * `SNAPCRAFT_CHANNEL`: Snapcraft release channel: `edge`, `beta`, or
+ `candidate`.
+
+ * `SNAPCRAFT_STORE_CREDENTIALS`: Credentials for Snapcraft store.
+
+Optional environment:
+
+ * `SNAPCRAFT_CMD`: Overrides the Snapcraft command. Default: `snapcraft`.
## `translations/`: Twosky Integration Script
- ### Usage
+ ### Usage
* `go run main.go help`: print usage.
@@ -211,7 +269,7 @@ Optional environment:
A simple script that downloads and updates the companies DB in the `client`
code from [the repo][companiesrepo].
- ### Usage
+ ### Usage
```sh
sh ./scripts/companiesdb/download.sh
@@ -231,7 +289,7 @@ Optional environment:
* `URL`: the URL of the index file. By default it's
`https://adguardteam.github.io/HostlistsRegistry/assets/services.json`.
- ### Usage
+ ### Usage
```sh
go run ./scripts/blocked-services/main.go
@@ -251,7 +309,7 @@ Optional environment:
* `URL`: the URL of the index file. By default it's
`https://adguardteam.github.io/HostlistsRegistry/assets/filters.json`.
- ### Usage
+ ### Usage
```sh
go run ./scripts/vetted-filters/main.go
diff --git a/scripts/make/build-docker.sh b/scripts/make/build-docker.sh
index 14fd515b..971017a2 100644
--- a/scripts/make/build-docker.sh
+++ b/scripts/make/build-docker.sh
@@ -5,11 +5,12 @@ verbose="${VERBOSE:-0}"
if [ "$verbose" -gt '0' ]
then
set -x
- debug_flags='-D'
+ debug_flags='--debug=1'
else
set +x
- debug_flags=''
+ debug_flags='--debug=0'
fi
+readonly debug_flags
set -e -f -u
@@ -61,21 +62,22 @@ readonly docker_output
case "$channel"
in
('release')
- docker_image_full_name="${docker_image_name}:${version}"
- docker_tags="--tag ${docker_image_name}:latest"
+ docker_version_tag="--tag=${docker_image_name}:${version}"
+ docker_channel_tag="--tag=${docker_image_name}:latest"
;;
('beta')
- docker_image_full_name="${docker_image_name}:${version}"
- docker_tags="--tag ${docker_image_name}:beta"
+ docker_version_tag="--tag=${docker_image_name}:${version}"
+ docker_channel_tag="--tag=${docker_image_name}:beta"
;;
('edge')
- # Don't set the version tag when pushing to the edge channel.
- docker_image_full_name="${docker_image_name}:edge"
- docker_tags=''
+ # Set the version tag to an empty string when pushing to the edge channel.
+ docker_version_tag=''
+ docker_channel_tag="--tag=${docker_image_name}:edge"
;;
('development')
- docker_image_full_name="${docker_image_name}"
- docker_tags=''
+ # Set both tags to an empty string for development builds.
+ docker_version_tag=''
+ docker_channel_tag=''
;;
(*)
echo "invalid channel '$channel', supported values are\
@@ -83,7 +85,7 @@ in
exit 1
;;
esac
-readonly docker_image_full_name docker_tags
+readonly docker_version_tag docker_channel_tag
# Copy the binaries into a new directory under new names, so that it's easier to
# COPY them later. DO NOT remove the trailing underscores. See file
@@ -117,10 +119,13 @@ cp "./docker/web-bind.awk"\
cp "./docker/healthcheck.sh"\
"${dist_docker_scripts}/healthcheck.sh"
-# Don't use quotes with $docker_tags and $debug_flags because we want word
-# splitting and or an empty space if tags are empty.
+# Don't use quotes with $docker_version_tag and $docker_channel_tag, because we
+# want word splitting and or an empty space if tags are empty.
+#
+# TODO(a.garipov): Once flag --tag of docker buildx build supports commas, use
+# them instead.
$sudo_cmd docker\
- $debug_flags\
+ "$debug_flags"\
buildx build\
--build-arg BUILD_DATE="$build_date"\
--build-arg DIST_DIR="$dist_dir"\
@@ -128,7 +133,7 @@ $sudo_cmd docker\
--build-arg VERSION="$version"\
--output "$docker_output"\
--platform "$docker_platforms"\
- $docker_tags\
- -t "$docker_image_full_name"\
+ $docker_version_tag\
+ $docker_channel_tag\
-f ./docker/Dockerfile\
.
diff --git a/scripts/make/build-release.sh b/scripts/make/build-release.sh
index 2884f568..3e556f97 100644
--- a/scripts/make/build-release.sh
+++ b/scripts/make/build-release.sh
@@ -78,14 +78,6 @@ else
fi
readonly oses
-snap_enabled="${BUILD_SNAP:-1}"
-readonly snap_enabled
-
-if [ "$snap_enabled" -eq '0' ]
-then
- log 'snap: disabled'
-fi
-
# Require the gpg key and passphrase to be set if the signing is required.
if [ "$sign" -eq '1' ]
then
@@ -106,7 +98,7 @@ log "checking tools"
# Make sure we fail gracefully if one of the tools we need is missing. Use
# alternatives when available.
use_shasum='0'
-for tool in gpg gzip sed sha256sum snapcraft tar zip
+for tool in gpg gzip sed sha256sum tar zip
do
if ! command -v "$tool" > /dev/null
then
@@ -128,36 +120,36 @@ readonly use_shasum
# Data section. Arrange data into space-separated tables for read -r to read.
# Use a hyphen for missing values.
-# os arch arm mips snap
+# os arch arm mips
platforms="\
-darwin amd64 - - -
-darwin arm64 - - -
-freebsd 386 - - -
-freebsd amd64 - - -
-freebsd arm 5 - -
-freebsd arm 6 - -
-freebsd arm 7 - -
-freebsd arm64 - - -
-linux 386 - - i386
-linux amd64 - - amd64
-linux arm 5 - -
-linux arm 6 - -
-linux arm 7 - armhf
-linux arm64 - - arm64
-linux mips - softfloat -
-linux mips64 - softfloat -
-linux mips64le - softfloat -
-linux mipsle - softfloat -
-linux ppc64le - - -
-openbsd amd64 - - -
-openbsd arm64 - - -
-windows 386 - - -
-windows amd64 - - -
-windows arm64 - - -"
+darwin amd64 - -
+darwin arm64 - -
+freebsd 386 - -
+freebsd amd64 - -
+freebsd arm 5 -
+freebsd arm 6 -
+freebsd arm 7 -
+freebsd arm64 - -
+linux 386 - -
+linux amd64 - -
+linux arm 5 -
+linux arm 6 -
+linux arm 7 -
+linux arm64 - -
+linux mips - softfloat
+linux mips64 - softfloat
+linux mips64le - softfloat
+linux mipsle - softfloat
+linux ppc64le - -
+openbsd amd64 - -
+openbsd arm64 - -
+windows 386 - -
+windows amd64 - -
+windows arm64 - -"
readonly platforms
-# Function build builds the release for one platform. It builds a binary, an
-# archive and, if needed, a snap package.
+# Function build builds the release for one platform. It builds a binary and an
+# archive.
build() {
# Get the arguments. Here and below, use the "build_" prefix for all
# variables local to function build.
@@ -167,7 +159,6 @@ build() {
build_arch="$4"\
build_arm="$5"\
build_mips="$6"\
- build_snap="$7"\
;
# Use the ".exe" filename extension if we build a Windows release.
@@ -229,52 +220,13 @@ build() {
esac
log "$build_archive"
-
- # Exit if we don't need to build the Snap package.
- if [ "$build_snap" = '-' ] || [ "$snap_enabled" -eq '0' ]
- then
- return
- fi
-
- # Prepare the Snap build.
- build_snap_output="./${dist}/AdGuardHome_${build_snap}.snap"
- build_snap_dir="${build_snap_output}.dir"
-
- # Create the meta subdirectory and copy files there.
- mkdir -p "${build_snap_dir}/meta"
- cp "$build_output" './scripts/snap/local/adguard-home-web.sh' "$build_snap_dir"
- cp -r './scripts/snap/gui' "${build_snap_dir}/meta/"
-
- # Create a snap.yaml file, setting the values.
- sed -e 's/%VERSION%/'"$version"'/'\
- -e 's/%ARCH%/'"$build_snap"'/'\
- ./scripts/snap/snap.tmpl.yaml\
- >"${build_snap_dir}/meta/snap.yaml"
-
- # TODO(a.garipov): The snapcraft tool will *always* write everything,
- # including errors, to stdout. And there doesn't seem to be a way to change
- # that. So, save the combined output, but only show it when snapcraft
- # actually fails.
- set +e
- build_snapcraft_output="$(
- snapcraft pack "$build_snap_dir" --output "$build_snap_output" 2>&1
- )"
- build_snapcraft_exit_code="$?"
- set -e
- if [ "$build_snapcraft_exit_code" -ne '0' ]
- then
- log "$build_snapcraft_output"
- exit "$build_snapcraft_exit_code"
- fi
-
- log "$build_snap_output"
}
log "starting builds"
# Go over all platforms defined in the space-separated table above, tweak the
# values where necessary, and feed to build.
-echo "$platforms" | while read -r os arch arm mips snap
+echo "$platforms" | while read -r os arch arm mips
do
# See if the architecture or the OS is in the allowlist. To do so, try
# removing everything that matches the pattern (well, a prefix, but that
@@ -314,7 +266,7 @@ do
;;
esac
- build "$dir" "$ar" "$os" "$arch" "$arm" "$mips" "$snap"
+ build "$dir" "$ar" "$os" "$arch" "$arm" "$mips"
done
log "packing frontend"
@@ -413,14 +365,14 @@ do
platform="$f"
# Remove the prefix.
- platform="${platform#./${dist}/AdGuardHome_}"
+ platform="${platform#"./${dist}/AdGuardHome_"}"
# Remove the filename extensions.
platform="${platform%.zip}"
platform="${platform%.tar.gz}"
# Use the filename's base path.
- filename="${f#./${dist}/}"
+ filename="${f#"./${dist}/"}"
if [ "$i" -eq "$ar_files_len" ]
then
diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh
index 9e23a3a8..3409ed2b 100644
--- a/scripts/make/go-lint.sh
+++ b/scripts/make/go-lint.sh
@@ -130,6 +130,7 @@ underscores() {
-e '_freebsd.go'\
-e '_linux.go'\
-e '_little.go'\
+ -e '_next.go'\
-e '_openbsd.go'\
-e '_others.go'\
-e '_test.go'\
@@ -169,6 +170,18 @@ run_linter govulncheck ./...
run_linter gocyclo --over 10 .
+# TODO(a.garipov): Enable for all.
+run_linter gocognit --over 10\
+ ./internal/aghalg/\
+ ./internal/aghchan/\
+ ./internal/aghhttp/\
+ ./internal/aghio/\
+ ./internal/next/\
+ ./internal/tools/\
+ ./internal/version/\
+ ./internal/whois/\
+ ;
+
run_linter ineffassign ./...
run_linter unparam ./...
@@ -185,8 +198,25 @@ run_linter nilness ./...
run_linter -e shadow --strict ./...
-# TODO(a.garipov): Enable in v0.108.0.
-# run_linter gosec --quiet ./...
+# TODO(a.garipov): Enable for all.
+run_linter gosec --quiet\
+ ./internal/aghalg\
+ ./internal/aghchan\
+ ./internal/aghhttp\
+ ./internal/aghio\
+ ./internal/aghnet\
+ ./internal/aghos\
+ ./internal/aghtest\
+ ./internal/dhcpd\
+ ./internal/dhcpsvc\
+ ./internal/dnsforward\
+ ./internal/next\
+ ./internal/schedule\
+ ./internal/stats\
+ ./internal/tools\
+ ./internal/version\
+ ./internal/whois\
+ ;
# TODO(a.garipov): Enable --blank?
run_linter errcheck --asserts ./...
diff --git a/scripts/make/go-tools.sh b/scripts/make/go-tools.sh
index ba512dc3..f9ccb42f 100644
--- a/scripts/make/go-tools.sh
+++ b/scripts/make/go-tools.sh
@@ -38,6 +38,7 @@ readonly go
rm -f\
bin/errcheck\
bin/fieldalignment\
+ bin/gocognit\
bin/gocyclo\
bin/gofumpt\
bin/gosec\
@@ -69,6 +70,7 @@ env\
github.com/kisielk/errcheck\
github.com/kyoh86/looppointer/cmd/looppointer\
github.com/securego/gosec/v2/cmd/gosec\
+ github.com/uudashr/gocognit/cmd/gocognit\
golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/fieldalignment\
golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness\
golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow\
diff --git a/scripts/snap/build.sh b/scripts/snap/build.sh
new file mode 100644
index 00000000..53f487a1
--- /dev/null
+++ b/scripts/snap/build.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+verbose="${VERBOSE:-0}"
+
+if [ "$verbose" -gt '0' ]
+then
+ set -x
+fi
+
+set -e -f -u
+
+# Function log is an echo wrapper that writes to stderr if the caller requested
+# verbosity level greater than 0. Otherwise, it does nothing.
+#
+# TODO(a.garipov): Add to helpers.sh and use more actively in scripts.
+log() {
+ if [ "$verbose" -gt '0' ]
+ then
+ # Don't use quotes to get word splitting.
+ echo "$1" 1>&2
+ fi
+}
+
+version="$( ./AdGuardHome_amd64 --version | cut -d ' ' -f 4 )"
+if [ "$version" = '' ]
+then
+ log 'empty version from ./AdGuardHome_amd64'
+ exit 1
+fi
+readonly version
+
+log "version '$version'"
+
+for arch in\
+ 'i386'\
+ 'amd64'\
+ 'armhf'\
+ 'arm64'
+do
+ build_output="./AdGuardHome_${arch}"
+ snap_output="./AdGuardHome_${arch}.snap"
+ snap_dir="${snap_output}.dir"
+
+ # Create the meta subdirectory and copy files there.
+ mkdir -p "${snap_dir}/meta"
+ cp "$build_output" "${snap_dir}/AdGuardHome"
+ cp './snap/local/adguard-home-web.sh' "$snap_dir"
+ cp -r './snap/gui' "${snap_dir}/meta/"
+
+ # Create a snap.yaml file, setting the values.
+ sed\
+ -e 's/%VERSION%/'"$version"'/'\
+ -e 's/%ARCH%/'"$arch"'/'\
+ ./snap/snap.tmpl.yaml\
+ > "${snap_dir}/meta/snap.yaml"
+
+ # TODO(a.garipov): The snapcraft tool will *always* write everything,
+ # including errors, to stdout. And there doesn't seem to be a way to change
+ # that. So, save the combined output, but only show it when snapcraft
+ # actually fails.
+ set +e
+ snapcraft_output="$(
+ snapcraft pack "$snap_dir" --output "$snap_output" 2>&1
+ )"
+ snapcraft_exit_code="$?"
+ set -e
+
+ if [ "$snapcraft_exit_code" -ne '0' ]
+ then
+ log "$snapcraft_output"
+ exit "$snapcraft_exit_code"
+ fi
+
+ log "$snap_output"
+
+ rm -f -r "$snap_dir"
+done
diff --git a/scripts/snap/download.sh b/scripts/snap/download.sh
new file mode 100644
index 00000000..7eb03a0e
--- /dev/null
+++ b/scripts/snap/download.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+verbose="${VERBOSE:-0}"
+
+if [ "$verbose" -gt '0' ]
+then
+ set -x
+fi
+
+set -e -f -u
+
+channel="${CHANNEL:?please set CHANNEL}"
+readonly channel
+
+printf '%s %s\n'\
+ '386' 'i386'\
+ 'amd64' 'amd64'\
+ 'armv7' 'armhf'\
+ 'arm64' 'arm64' \
+| while read -r arch snap_arch
+do
+ release_url="https://static.adtidy.org/adguardhome/${channel}/AdGuardHome_linux_${arch}.tar.gz"
+ output="./AdGuardHome_linux_${arch}.tar.gz"
+
+ curl -o "$output" -v "$release_url"
+ tar -f "$output" -v -x -z
+ cp ./AdGuardHome/AdGuardHome "./AdGuardHome_${snap_arch}"
+ rm -f -r "$output" ./AdGuardHome
+done
diff --git a/scripts/snap/local/adguard-home-web.sh b/scripts/snap/local/adguard-home-web.sh
deleted file mode 100755
index 697f0f92..00000000
--- a/scripts/snap/local/adguard-home-web.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Get the admin interface port from the configuration.
-bind_port="$( grep -e 'bind_port' "${SNAP_DATA}/AdGuardHome.yaml" | awk -F ' ' '{print $2}' )"
-readonly bind_port
-
-if [ "$bind_port" = '' ]
-then
- xdg-open 'http://localhost:3000'
-else
- xdg-open "http://localhost:${bind_port}"
-fi
diff --git a/scripts/snap/upload.sh b/scripts/snap/upload.sh
new file mode 100644
index 00000000..35be0a9e
--- /dev/null
+++ b/scripts/snap/upload.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+verbose="${VERBOSE:-0}"
+
+if [ "$verbose" -gt '0' ]
+then
+ set -x
+fi
+
+set -e -f -u
+
+# Function log is an echo wrapper that writes to stderr if the caller requested
+# verbosity level greater than 0. Otherwise, it does nothing.
+log() {
+ if [ "$verbose" -gt '0' ]
+ then
+ # Don't use quotes to get word splitting.
+ echo "$1" 1>&2
+ fi
+}
+
+# Do not set a new lowercase variable, because the snapcraft tool expects the
+# uppercase form.
+if [ "${SNAPCRAFT_STORE_CREDENTIALS:-}" = '' ]
+then
+ log 'please set SNAPCRAFT_STORE_CREDENTIALS'
+
+ exit 1
+fi
+export SNAPCRAFT_STORE_CREDENTIALS
+
+snapcraft_channel="${SNAPCRAFT_CHANNEL:?please set SNAPCRAFT_CHANNEL}"
+readonly snapcraft_channel
+
+# Allow developers to overwrite the command, e.g. for testing.
+snapcraft_cmd="${SNAPCRAFT_CMD:-snapcraft}"
+readonly snapcraft_cmd
+
+default_timeout='90s'
+kill_timeout='120s'
+readonly default_timeout kill_timeout
+
+for arch in\
+ 'i386'\
+ 'amd64'\
+ 'armhf'\
+ 'arm64'
+do
+ snap_file="./AdGuardHome_${arch}.snap"
+
+ # Catch the exit code and the combined output to later inspect it.
+ set +e
+ snapcraft_output="$(
+ # Use timeout(1) to force snapcraft to quit after a certain time. There
+ # seems to be no environment variable or flag to force this behavior.
+ timeout\
+ --preserve-status\
+ -k "$kill_timeout"\
+ -v "$default_timeout"\
+ "$snapcraft_cmd" upload\
+ --release="${snapcraft_channel}"\
+ --quiet\
+ "${snap_file}"\
+ 2>&1
+ )"
+ snapcraft_exit_code="$?"
+ set -e
+
+ if [ "$snapcraft_exit_code" -eq '0' ]
+ then
+ log "successful upload: ${snapcraft_output}"
+
+ continue
+ fi
+
+ # Skip the ones that were failed by a duplicate upload error.
+ case "$snapcraft_output"
+ in
+ (*'A file with this exact same content has already been uploaded'|\
+ 'Error checking upload uniqueness'*)
+
+ log "warning: duplicate upload, skipping"
+ log "snapcraft upload error: ${snapcraft_output}"
+
+ continue
+ ;;
+ (*)
+ echo "unexpected snapcraft upload error: ${snapcraft_output}"
+
+ return "$snapcraft_exit_code"
+ ;;
+ esac
+done
diff --git a/scripts/translations/main.go b/scripts/translations/main.go
index 683f2be7..0d4e7871 100644
--- a/scripts/translations/main.go
+++ b/scripts/translations/main.go
@@ -288,6 +288,7 @@ func downloadWorker(wg *sync.WaitGroup, client *http.Client, uriCh <-chan *url.U
data, err := getTranslation(client, uri.String())
if err != nil {
log.Error("download worker: getting translation: %s", err)
+ log.Info("download worker: error response:\n%s", data)
continue
}
@@ -295,6 +296,11 @@ func downloadWorker(wg *sync.WaitGroup, client *http.Client, uriCh <-chan *url.U
q := uri.Query()
code := q.Get("language")
+ // Fix some TwoSky weirdnesses.
+ //
+ // TODO(a.garipov): Remove when those are fixed.
+ code = strings.ToLower(code)
+
name := filepath.Join(localesDir, code+".json")
err = os.WriteFile(name, data, 0o664)
if err != nil {
@@ -307,7 +313,8 @@ func downloadWorker(wg *sync.WaitGroup, client *http.Client, uriCh <-chan *url.U
}
}
-// getTranslation returns received translation data or error.
+// getTranslation returns received translation data and error. If err is not
+// nil, data may contain a response from server for inspection.
func getTranslation(client *http.Client, url string) (data []byte, err error) {
resp, err := client.Get(url)
if err != nil {
@@ -319,24 +326,19 @@ func getTranslation(client *http.Client, url string) (data []byte, err error) {
if resp.StatusCode != http.StatusOK {
err = fmt.Errorf("url: %q; status code: %s", url, http.StatusText(resp.StatusCode))
- return nil, err
+ // Go on and download the body for inspection.
}
- limitReader, err := aghio.LimitReader(resp.Body, readLimit)
- if err != nil {
- err = fmt.Errorf("limit reading: %w", err)
-
- return nil, err
+ limitReader, lrErr := aghio.LimitReader(resp.Body, readLimit)
+ if lrErr != nil {
+ // Generally shouldn't happen, since the only error returned by
+ // [aghio.LimitReader] is an argument error.
+ panic(fmt.Errorf("limit reading: %w", lrErr))
}
- data, err = io.ReadAll(limitReader)
- if err != nil {
- err = fmt.Errorf("reading all: %w", err)
+ data, readErr := io.ReadAll(limitReader)
- return nil, err
- }
-
- return data, nil
+ return data, errors.WithDeferred(err, readErr)
}
// translationURL returns a new url.URL with provided query parameters.
@@ -344,6 +346,18 @@ func translationURL(oldURL *url.URL, baseFile, projectID string, lang langCode)
uri = &url.URL{}
*uri = *oldURL
+ // Fix some TwoSky weirdnesses.
+ //
+ // TODO(a.garipov): Remove when those are fixed.
+ switch lang {
+ case "si-lk":
+ lang = "si-LK"
+ case "zh-hk":
+ lang = "zh-HK"
+ default:
+ // Go on.
+ }
+
q := uri.Query()
q.Set("format", "json")
q.Set("filename", baseFile)
diff --git a/scripts/snap/gui/adguard-home-web.desktop b/snap/gui/adguard-home-web.desktop
similarity index 100%
rename from scripts/snap/gui/adguard-home-web.desktop
rename to snap/gui/adguard-home-web.desktop
diff --git a/scripts/snap/gui/adguard-home-web.png b/snap/gui/adguard-home-web.png
similarity index 100%
rename from scripts/snap/gui/adguard-home-web.png
rename to snap/gui/adguard-home-web.png
diff --git a/snap/local/adguard-home-web.sh b/snap/local/adguard-home-web.sh
new file mode 100755
index 00000000..3396dd17
--- /dev/null
+++ b/snap/local/adguard-home-web.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+conf_file="${SNAP_DATA}/AdGuardHome.yaml"
+readonly conf_file
+
+if ! [ -f "$conf_file" ]
+then
+ xdg-open 'http://localhost:3000'
+
+ exit
+fi
+
+# Get the admin interface port from the configuration.
+awk_prog='/^[^[:space:]]/ { is_http = /^http:/ };/^[[:space:]]+address:/ { if (is_http) print $2 }'
+readonly awk_prog
+
+bind_port="$( awk "$awk_prog" "$conf_file" | awk -F ':' '{print $NF}' )"
+readonly bind_port
+
+if [ "$bind_port" = '' ]
+then
+ xdg-open 'http://localhost:3000'
+else
+ xdg-open "http://localhost:${bind_port}"
+fi
diff --git a/scripts/snap/snap.tmpl.yaml b/snap/snap.tmpl.yaml
similarity index 100%
rename from scripts/snap/snap.tmpl.yaml
rename to snap/snap.tmpl.yaml
diff --git a/staticcheck.conf b/staticcheck.conf
index 84d08287..3962957c 100644
--- a/staticcheck.conf
+++ b/staticcheck.conf
@@ -4,13 +4,20 @@ initialisms = [
#
# Do not add "PTR" since we use "Ptr" as a suffix.
"inherit"
+, "ASN"
, "DHCP"
+, "DNSSEC"
+ # E.g. SentryDSN.
+, "DSN"
+, "ECS"
, "EDNS"
, "MX"
, "QUIC"
, "RA"
+, "RRSIG"
, "SDNS"
, "SLAAC"
+, "SOA"
, "SVCB"
, "TLD"
, "WHOIS"