Merge 476145e29c into 0f74190ddd

Automated update
- Categories lists update - AdGuard list update - Parsed list update - Unbound list update
2023-11-11 04:02:05 -07:00 · 2023-11-09 09:24:40 +00:00 · 2023-11-09 10:24:24 +01:00 · 2023-11-09 10:24:24 +01:00 · 2023-05-07 11:53:49 +02:00 · 2023-05-07 11:53:49 +02:00
45 changed files with 99 additions and 43 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /.idea
+scripts/.env
--- a/categories/analytics.txt
+++ b/categories/analytics.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Analytics

 0.0.0.0 18.afs.googleadservices.com
--- a/categories/analyticsparsed
+++ b/categories/analyticsparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Analytics

 18.afs.googleadservices.com
--- a/categories/android.txt
+++ b/categories/android.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Android

 0.0.0.0 1-market.android.com
@ -64,6 +64,7 @@
 0.0.0.0 phonedeviceverification-pa.googleapis.com
 0.0.0.0 photos-ugc.l.googleusercontent.com
 0.0.0.0 play-lh.googleusercontent.com
+0.0.0.0 playstoregatewayadapter-pa.googleapis.com
 0.0.0.0 r.android.com
 0.0.0.0 regioinfo-pa.googleapis.com
 0.0.0.0 regioninfo-pa.googleapis.com
--- a/categories/androidparsed
+++ b/categories/androidparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Android

 1-market.android.com
@ -64,6 +64,7 @@ performanceparameters.googleapis.com
 phonedeviceverification-pa.googleapis.com
 photos-ugc.l.googleusercontent.com
 play-lh.googleusercontent.com
+playstoregatewayadapter-pa.googleapis.com
 r.android.com
 regioinfo-pa.googleapis.com
 regioninfo-pa.googleapis.com
--- a/categories/area120.txt
+++ b/categories/area120.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Area120

 0.0.0.0 kormo.com
--- a/categories/area120parsed
+++ b/categories/area120parsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Area120

 kormo.com
--- a/categories/dns.txt
+++ b/categories/dns.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # DNS

 0.0.0.0 014dcb18-dnsotls-ds.metric.gstatic.com
--- a/categories/dnsparsed
+++ b/categories/dnsparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # DNS

 014dcb18-dnsotls-ds.metric.gstatic.com
--- a/categories/domains.txt
+++ b/categories/domains.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Domains

 0.0.0.0 _caldav._tcp.google.com
--- a/categories/domainsparsed
+++ b/categories/domainsparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Domains

 _caldav._tcp.google.com
--- a/categories/doubleclick.txt
+++ b/categories/doubleclick.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Doubleclick

 0.0.0.0 0.fls.doubleclick.net
--- a/categories/doubleclickparsed
+++ b/categories/doubleclickparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Doubleclick

 0.fls.doubleclick.net
--- a/categories/fiber.txt
+++ b/categories/fiber.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fiber

 0.0.0.0 atlanta.speed.googlefiber.net
--- a/categories/fiberparsed
+++ b/categories/fiberparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fiber

 atlanta.speed.googlefiber.net
--- a/categories/firebase.txt
+++ b/categories/firebase.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Firebase

 0.0.0.0 0.firebaseio.com
--- a/categories/firebaseparsed
+++ b/categories/firebaseparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Firebase

 0.firebaseio.com
--- a/categories/fitbit.txt
+++ b/categories/fitbit.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fitbit

 0.0.0.0 000-client.fitbit.com
--- a/categories/fitbitparsed
+++ b/categories/fitbitparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fitbit

 000-client.fitbit.com
--- a/categories/fonts.txt
+++ b/categories/fonts.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fonts

 0.0.0.0 fonts.google.com
--- a/categories/fontsparsed
+++ b/categories/fontsparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Fonts

 fonts.google.com
--- a/categories/general.txt
+++ b/categories/general.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # General

 0.0.0.0 0.chart.apis.google.com
--- a/categories/generalparsed
+++ b/categories/generalparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # General

 0.chart.apis.google.com
--- a/categories/jibemobile.txt
+++ b/categories/jibemobile.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Jibemobile

 0.0.0.0 cdn.jibemobile.com
--- a/categories/jibemobileparsed
+++ b/categories/jibemobileparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Jibemobile

 cdn.jibemobile.com
--- a/categories/mail.txt
+++ b/categories/mail.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Mail

 0.0.0.0 chatenabled.mail.google.com
--- a/categories/mailparsed
+++ b/categories/mailparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Mail

 chatenabled.mail.google.com
--- a/categories/nest.txt
+++ b/categories/nest.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Nest

 0.0.0.0 accounts.ft.nest.com
--- a/categories/nestparsed
+++ b/categories/nestparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Nest

 accounts.ft.nest.com
--- a/categories/pagelink.txt
+++ b/categories/pagelink.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Pagelink

 0.0.0.0 0utlookmxupdates1.page.link
--- a/categories/pagelinkparsed
+++ b/categories/pagelinkparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Pagelink

 0utlookmxupdates1.page.link
--- a/categories/products.txt
+++ b/categories/products.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Products

 0.0.0.0 actions.google.com
--- a/categories/productsparsed
+++ b/categories/productsparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Products

 actions.google.com
--- a/categories/proxies.txt
+++ b/categories/proxies.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Proxies

 0.0.0.0 google-proxy-64-233-172-0.google.com
--- a/categories/proxiesparsed
+++ b/categories/proxiesparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Proxies

 google-proxy-64-233-172-0.google.com
--- a/categories/shortlinks.txt
+++ b/categories/shortlinks.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Short Links

 0.0.0.0 app.goo.gl
--- a/categories/shortlinksparsed
+++ b/categories/shortlinksparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Short Links

 app.goo.gl
--- a/categories/youtube.txt
+++ b/categories/youtube.txt
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Youtube

 0.0.0.0 _domainkey.youtube.com
--- a/categories/youtubeparsed
+++ b/categories/youtubeparsed
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Youtube

 _domainkey.youtube.com
--- a/3
+++ b/3
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09
 # Analytics
 0.0.0.0 18.afs.googleadservices.com
 0.0.0.0 2.afs.googleadservices.com
@ -227,6 +227,7 @@
 0.0.0.0 phonedeviceverification-pa.googleapis.com
 0.0.0.0 photos-ugc.l.googleusercontent.com
 0.0.0.0 play-lh.googleusercontent.com
+0.0.0.0 playstoregatewayadapter-pa.googleapis.com
 0.0.0.0 r.android.com
 0.0.0.0 regioinfo-pa.googleapis.com
 0.0.0.0 regioninfo-pa.googleapis.com
--- a/pihole-google-adguard-important.txt
+++ b/pihole-google-adguard-important.txt
@ -1,5 +1,5 @@
 ! This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-! Last updated: 2023-10-08
+! Last updated: 2023-11-09
 ! Analytics
 ||18.afs.googleadservices.com^$important
 ||2.afs.googleadservices.com^$important
@ -227,6 +227,7 @@
 ||phonedeviceverification-pa.googleapis.com^$important
 ||photos-ugc.l.googleusercontent.com^$important
 ||play-lh.googleusercontent.com^$important
+||playstoregatewayadapter-pa.googleapis.com^$important
 ||r.android.com^$important
 ||regioinfo-pa.googleapis.com^$important
 ||regioninfo-pa.googleapis.com^$important
--- a/pihole-google-adguard.txt
+++ b/pihole-google-adguard.txt
@ -1,5 +1,5 @@
 ! This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-! Last updated: 2023-10-08
+! Last updated: 2023-11-09
 ! Analytics
 ||18.afs.googleadservices.com^
 ||2.afs.googleadservices.com^
@ -227,6 +227,7 @@
 ||phonedeviceverification-pa.googleapis.com^
 ||photos-ugc.l.googleusercontent.com^
 ||play-lh.googleusercontent.com^
+||playstoregatewayadapter-pa.googleapis.com^
 ||r.android.com^
 ||regioinfo-pa.googleapis.com^
 ||regioninfo-pa.googleapis.com^
--- a/pihole-google-unbound.conf
+++ b/pihole-google-unbound.conf
@ -1,5 +1,5 @@
 # This blocklist helps to restrict access to Google and its domains. Contribute at https://github.com/nickspaargaren/no-google
-# Last updated: 2023-10-08
+# Last updated: 2023-11-09

 # Category: Analytics
 local-zone: "18.afs.googleadservices.com" always_refuse
@ -229,6 +229,7 @@ local-zone: "performanceparameters.googleapis.com" always_refuse
 local-zone: "phonedeviceverification-pa.googleapis.com" always_refuse
 local-zone: "photos-ugc.l.googleusercontent.com" always_refuse
 local-zone: "play-lh.googleusercontent.com" always_refuse
+local-zone: "playstoregatewayadapter-pa.googleapis.com" always_refuse
 local-zone: "r.android.com" always_refuse
 local-zone: "regioinfo-pa.googleapis.com" always_refuse
 local-zone: "regioninfo-pa.googleapis.com" always_refuse
--- a/pihole-google.txt
+++ b/pihole-google.txt
@ -225,6 +225,7 @@ performanceparameters.googleapis.com
 phonedeviceverification-pa.googleapis.com
 photos-ugc.l.googleusercontent.com
 play-lh.googleusercontent.com
+playstoregatewayadapter-pa.googleapis.com
 r.android.com
 regioinfo-pa.googleapis.com
 regioninfo-pa.googleapis.com
@ -8183,4 +8184,4 @@ www.tofu.jibemobile.com
 www.tokyo.jibemobile.com
 www.viper.jibemobile.com
 www.watermelon.jibemobile.com
-yellowstone.jibemobile.com
+yellowstone.jibemobile.com
--- a/scripts/domain-check-api.py
+++ b/scripts/domain-check-api.py
@ -0,0 +1,48 @@
+import whois  # pip install python-whois
+import time
+import re
+
+
+def get_domain(url: str) -> str:
+    """
+    A function that extracts the domain name from a `url`
+    """
+    domain = re.findall("(?<=\.)[^.]+\.[^.]+$", url)
+    if domain != []:
+        return domain[0]
+    else:
+        return url
+
+
+def remove_duplicates(mylist: list[str]):
+    return list(dict.fromkeys(mylist))
+
+
+def get_domains():
+    with open('../pihole-google.txt', 'r') as main:
+        for line in main:
+            if not '#' in line and not ':' in line:
+                line = get_domain(line)
+                if line != '\n' and line != []:
+                    line = re.sub(r"\n", "", line)
+                    yield line
+
+
+def is_registered(domain):
+    """
+    A function that checks whether a `domain` is can get whois info
+    """
+    time.sleep(1)
+    try:
+        w = whois.whois(domain, flags=whois.NICClient.WHOIS_QUICK)
+    except Exception:
+        return False
+    else:
+        return [w.domain_name, w.org, w.name_servers]
+
+
+# iterate over domains
+domains = remove_duplicates(get_domains())
+
+for domain in domains:
+    print(domain, is_registered(domain.rstrip("\n")))
Author	SHA1	Message	Date
Nick Spaargaren	1c688baf3e	Merge `476145e29c` into `0f74190ddd`	2023-11-11 04:02:05 -07:00
github-actions[bot]	0f74190ddd	Automated update - Categories lists update - AdGuard list update - Parsed list update - Unbound list update	2023-11-09 09:24:40 +00:00
github-actions[bot]	0f189da553	Automated update - Categories lists update - AdGuard list update - Parsed list update - Unbound list update	2023-11-09 10:24:24 +01:00
QuickJack	7cf6e5f045	Added new Playstore domain (closes #184 )	2023-11-09 10:24:24 +01:00
Nick Spaargaren	476145e29c	Add duplicate removals & fetch whois data	2023-05-07 11:53:49 +02:00
Nick Spaargaren	ff691049ce	Fix regex to get domains correctly	2023-05-07 11:53:49 +02:00
Nick Spaargaren	b827cf9f1f	Update script to single file	2023-05-07 11:53:49 +02:00
Nick Spaargaren	7b4999ead0	Update api without whois api token	2023-05-07 11:53:49 +02:00
Nick Spaargaren	093e901f54	Remove unnecessary line checks	2023-05-07 11:53:49 +02:00
Nick Spaargaren	22bd626c65	Add get nameservers from whois api	2023-05-07 11:53:49 +02:00
Nick Spaargaren	f85402f964	Add script to remove subdomains	2023-05-07 11:53:49 +02:00