Bugfix: PowerDNS bugfixes

.package/docker-compose.yml

@@ -411,7 +411,7 @@ services:
       - 53/tcp
     volumes:
       - dns_lmdb:/var/lib/pdns-lmdb
-      - dns_config:/etc/powerdns
+      - ./pdns.conf:/etc/powerdns/pdns.conf
 
 
   pdns_recursor:

app/ioc.py

@@ -307,10 +307,13 @@ async def get_dns_mngr_settings(
         self,
         dns_state_gateway: DNSStateGateway,
         settings: Settings,
+        root_dse_gw: DomainReadProtocol,
     ) -> AsyncIterator[DNSSettingsDTO]:
         """Get DNS manager's settings."""
+        domain = await root_dse_gw.get_domain()
         dns_settings = await dns_state_gateway.get_dns_manager_settings(
             settings,
+            domain.name,
         )
         yield dns_settings
 

app/ldap_protocol/dns/constants.py

@@ -11,6 +11,42 @@
 DNS_MANAGER_IP_ADDRESS_NAME = "DNSManagerIpAddress"
 DNS_MANAGER_TSIG_KEY_NAME = "DNSManagerTSIGKey"
 
+DEFAULT_FORWARD_ZONE_NAMES: list[str] = [
+    ".",
+    "b.e.f.ip6.arpa.",
+    "a.e.f.ip6.arpa.",
+    "23.172.in-addr.arpa.",
+    "21.172.in-addr.arpa.",
+    "254.169.in-addr.arpa.",
+    "20.172.in-addr.arpa.",
+    "17.172.in-addr.arpa.",
+    "31.172.in-addr.arpa.",
+    "22.172.in-addr.arpa.",
+    "16.172.in-addr.arpa.",
+    "19.172.in-addr.arpa.",
+    "24.172.in-addr.arpa.",
+    "168.192.in-addr.arpa.",
+    "10.in-addr.arpa.",
+    "8.e.f.ip6.arpa.",
+    "127.in-addr.arpa.",
+    "113.0.203.in-addr.arpa.",
+    "26.172.in-addr.arpa.",
+    "27.172.in-addr.arpa.",
+    "8.b.d.0.1.0.0.2.ip6.arpa.",
+    "28.172.in-addr.arpa.",
+    "d.f.ip6.arpa.",
+    "18.172.in-addr.arpa.",
+    "30.172.in-addr.arpa.",
+    "9.e.f.ip6.arpa.",
+    "100.51.198.in-addr.arpa.",
+    "255.255.255.255.in-addr.arpa.",
+    "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.",
+    "29.172.in-addr.arpa.",
+    "0.in-addr.arpa.",
+    "25.172.in-addr.arpa.",
+    "2.0.192.in-addr.arpa.",
+]
+
 DNS_FIRST_SETUP_RECORDS: list[dict[str, str | DNSRecordType]] = [
     {"name": "_ldap._tcp.", "value": "0 0 389 ", "type": DNSRecordType.SRV},
     {"name": "_ldaps._tcp.", "value": "0 0 636 ", "type": DNSRecordType.SRV},

app/ldap_protocol/dns/dns_gateway.py

@@ -125,14 +125,15 @@ async def create_settings(
     async def get_dns_manager_settings(
         self,
         app_settings: Settings,
+        domain: str,
     ) -> DNSSettingsDTO:
         """Get DNS manager settings."""
         power_dns_settings = PowerDNSSettingsDTO(
             auth_server_ip=app_settings.PDNS_AUTH_SERVER_IP,
             recursor_server_ip=app_settings.PDNS_RECURSOR_SERVER_IP,
         )
         dns_settings = DNSSettingsDTO(
-            domain=app_settings.DOMAIN,
+            domain=domain,
             dns_server_ip=None,
             tsig_key=None,
             default_nameserver=app_settings.DEFAULT_NAMESERVER,

app/ldap_protocol/dns/managers/power_dns_manager.py

@@ -14,7 +14,10 @@
     PowerDNSDistClient,
     PowerDNSRecursorHTTPClient,
 )
-from ldap_protocol.dns.constants import DNS_FIRST_SETUP_RECORDS
+from ldap_protocol.dns.constants import (
+    DEFAULT_FORWARD_ZONE_NAMES,
+    DNS_FIRST_SETUP_RECORDS,
+)
 from ldap_protocol.dns.dto import (
     DNSForwardServerStatus,
     DNSForwardZoneDTO,
@@ -225,7 +228,14 @@ async def get_master_zone_by_id(self, zone_id: str) -> DNSMasterZoneDTO:
     async def get_forward_zones(self) -> list[DNSForwardZoneDTO]:
         """Retrieve all forward DNS zones."""
         try:
-            return await self._power_dns_recursor_client.get_forward_zones()
+            forward_zones = (
+                await self._power_dns_recursor_client.get_forward_zones()
+            )
+            return [
+                zone
+                for zone in forward_zones
+                if zone.name not in DEFAULT_FORWARD_ZONE_NAMES
+            ]
         except DNSError as e:
             raise DNSZoneGetError(f"Failed to get DNS zones: {e}")
 

tests/conftest.py

@@ -286,9 +286,14 @@ async def get_dns_mngr_settings(
         self,
         dns_state_gateway: DNSStateGateway,
         settings: Settings,
+        root_dse_gw: DomainReadProtocol,
     ) -> AsyncIterator["DNSSettingsDTO"]:
         """Get DNS manager's settings."""
-        yield await dns_state_gateway.get_dns_manager_settings(settings)
+        domain = await root_dse_gw.get_domain()
+        yield await dns_state_gateway.get_dns_manager_settings(
+            settings,
+            domain.name,
+        )
 
     attribute_type_dao = provide(AttributeTypeDAO, scope=Scope.REQUEST)
     object_class_dao = provide(ObjectClassDAO, scope=Scope.REQUEST)