internetradiofrontier.com domain, see #5

Author: kimbtech

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,8 @@
+---
+name: Bug Report
+about: A bug report describes an error of Radio-DNS-Server or errors while using it.
+title: ''
+labels: bug
+assignees: kimbtech
+
+---

README.md

@@ -20,6 +20,8 @@ The configuration is done using env variables.
 - `TIME_SERVER` *(optional, default `ntp0.fau.de`)* If the DNS server is queried for `time.wifiradiofrontier.com` it will answer with the `A` record of this domain. So one does not have to host an own NTP server at `RADIO_DOMAIN`. Per default some time server is used.
 - `ENABLE_UPDATE` *(optional, default `false`)* Set to `true` to enable responding to DNS queries for `update.wifiradiofrontier.com` with the `A` record of `update.wifiradiofrontier.com` instead of the ip of Radio-API. (This will allow the radio to do updates. Performing updates is a trade-off between risking changes to the API, that may prevent Radio-API from working, and bug fixes and security implications for the radio's software.)
 
+Besides the domain `wifiradiofrontier.com` also the domain `internetradiofrontier.com` is considered as domain to tamper DNS queries for.
+
 Run using the [**Docker-compose Example**](./docker-compose.yml)!
 
 ## Notice and Used Libraries

VERSION

@@ -1,3 +1,3 @@
 2
-2.1
-2.1.1
+2.2
+2.2.0

dns/hama.py

@@ -8,26 +8,26 @@
 
 class Hama():
 
-	_DOMAIN = "wifiradiofrontier.com."
-	_TIME_DOMAIN = "time.wifiradiofrontier.com."
-	_UPDATE_DOMAIN = "update.wifiradiofrontier.com."
+	_DOMAINS = ("wifiradiofrontier.com.", "internetradiofrontier.com.")
+	_TIME_SUB_DOMAIN = "time.*"
+	_UPDATE_SUB_DOMAIN = "update.*"
 
 	def __init__(self):
 		self.do_lookup = Config["DO_LOOKUP"]
 
 	def match_domain(self, question:DNSQuestion) -> bool:
 		if isinstance(question, DNSQuestion):
-			if question.qname.matchSuffix(self._DOMAIN):
+			if any(question.qname.matchSuffix(domain) for domain in self._DOMAINS):
 				if question.qtype == QTYPE.A:
 					return True
 
 		return False
 
 	def fetch_answer(self, question:DNSQuestion) -> Union[RR, None]:
-		if question.qname.matchSuffix(self._TIME_DOMAIN):
+		if question.qname.matchGlob(self._TIME_SUB_DOMAIN):
 			ip_address = DNSClient.resolve_a(Config["TIME"])
-		elif Config["UPDATE"] and question.qname.matchSuffix(self._UPDATE_DOMAIN):
-			ip_address = DNSClient.resolve_a(self._UPDATE_DOMAIN)
+		elif Config["UPDATE"] and question.qname.matchGlob(self._UPDATE_SUB_DOMAIN):
+			ip_address = DNSClient.resolve_a(str(question.qname))
 		else:
 			ip_address = DNSClient.resolve_a(Config["RADIO"]) if self.do_lookup else Config["RADIO"]
 

docker-compose.dev.yml

@@ -14,7 +14,7 @@ services:
       - SERVER_BIND=0.0.0.0
       - SERVER_UPSTREAM=8.8.8.8
       - SERVER_PORT=53
-      - RADIO_DOMAIN=example.com
+      #- RADIO_DOMAIN=example.com
       - RADIO_IP=192.168.0.41
       - ALLOWED_DOMAIN=all
       - TIME_SERVER=ntp0.fau.de

run.py

@@ -9,7 +9,7 @@
 
 	if Config["DEVMODE"]:
 		print("Devmode enabled, no server will be started!")
-		print("\tAttach to container and start manually.")
+		print("\tAttach to container and start manually, i.e., 'python -m dns.server'")
 
 		while True:
 			time.sleep(1)