fergalmoran/bitchmin
1
0
Fork 0
mirror of https://github.com/fergalmoran/bitchmin.git synced 2025-12-22 09:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hosting and record update loop

Browse Source
This commit is contained in:
Fergal Moran
2020-11-20 16:05:43 +00:00
parent 4fb7349fa6
commit f5295936c9
8 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitchmin-client/.env.production
View File

@@ -1 +1 @@
VUE_APP_API_SERVER=https://admin-api.bitchmints.com
VUE_APP_API_SERVER=https://api.fergl.ie

7
bitchmin-server/models/zone.py
View File

@@ -3,13 +3,14 @@ from types import SimpleNamespace
class Zone(object):
def __init__(self, serial, name, admin, hosts, nameservers, mailexchangers):
def __init__(self, serial, name, admin, hosts, nameservers, mailexchangers, ttl=30):
self._serial = serial
self._name = name
self._admin = admin
self._hosts = hosts
self._nameservers = nameservers
self._mailexchangers = mailexchangers
self._ttl = ttl
@staticmethod
def from_json(data):
@@ -63,6 +64,10 @@ class Zone(object):
def mailexchangers(self):
return self._mailexchangers
@property
def ttl(self):
return self._ttl
class Nameserver(object):

66
bitchmin-server/resolvers/memory_resolver.py
View File

@@ -1,8 +1,14 @@
import requests
from twisted.internet import defer
from twisted.internet import defer, reactor
from twisted.names import dns, error
import logging
from twisted.plugins.twisted_reactors import wx
from models.zone import Zone
TIMER_ID = 100 # pick a number
class InvalidZoneException(Exception):
pass
@@ -14,8 +20,10 @@ class Resolver:
query type and name.
"""
def __init__(self, zones):
self._zones = zones
def __init__(self, api_host):
self._api_host = api_host
self._zones = self.load_zones(api_host)
self.reload_zones()
@staticmethod
def _build_host(record_type, host, ip, ttl):
@@ -27,6 +35,20 @@ class Resolver:
},
}
@staticmethod
def load_zones(api_host):
response = requests.get('{}/dns/zones'.format(api_host))
zones = Zone.from_json(response.text)
return {
zone.name: zone
for zone in zones
}
def reload_zones(self):
logging.debug('Reloading zones')
self._zones = Resolver.load_zones(self._api_host)
reactor.callLater(60, self.reload_zones)
def _gen_axfr(self, zone_name):
zone = self._zones[zone_name]
@@ -35,7 +57,7 @@ class Resolver:
name=zone.name,
type=dns.SOA,
cls=dns.IN,
ttl=86400,
ttl=zone.ttl,
auth=True,
payload=dns.Record_SOA(
mname=next(iter(zone.nameservers)),
@@ -71,7 +93,7 @@ class Resolver:
type=dns.NS,
cls=dns.IN,
ttl=700,
auth=False,
auth=True,
payload=record,
)
)
@@ -79,10 +101,11 @@ class Resolver:
host = zone.hosts[h]
record = dns.RRHeader(
'{}.{}'.format(host.name, zone.name),
dns.A,
dns.IN,
host.ttl,
dns.Record_A(host.ip, host.ttl))
type=dns.A,
cls=dns.IN,
ttl=host.ttl,
auth=True,
payload=dns.Record_A(host.ip, host.ttl))
records.append(record)
records.append(soa)
@@ -152,6 +175,7 @@ class MemoryResolver(Resolver):
record = self._zones[zone_name].hosts[host]
answers.append(dns.RRHeader(
name=str(query.name),
auth=True,
payload=dns.Record_A(
address=record.ip,
ttl=record.ttl
@@ -171,6 +195,7 @@ class MemoryResolver(Resolver):
name=str(query.name),
type=dns.NS,
ttl=self._zones[zone_name].nameservers[ns].ttl,
auth=True,
payload=dns.Record_NS(
name=self._zones[zone_name].nameservers[ns].name,
ttl=self._zones[zone_name].nameservers[ns].ttl
@@ -185,6 +210,7 @@ class MemoryResolver(Resolver):
name=str(query.name),
type=dns.MX,
ttl=self._zones[zone_name].mailexchangers[mx].ttl,
auth=True,
payload=dns.Record_MX(
name=self._zones[zone_name].mailexchangers[mx].name,
ttl=self._zones[zone_name].mailexchangers[mx].ttl,
@@ -200,13 +226,17 @@ class MemoryResolver(Resolver):
"""
logging.info(query)
zone_name, zone = self._get_authoritative_zone(query)
if zone and zone_name:
logging.debug('BitchNS: Authoritative for {}'.format(zone_name))
result = self._get_response(zone_name, query)
if result:
logging.debug('BitchNS: Resolving {} to {}'.format(zone_name, result))
return defer.succeed(result)
try:
zone_name, zone = self._get_authoritative_zone(query)
if zone and zone_name:
logging.debug('BitchNS: Authoritative for {}'.format(zone_name))
result = self._get_response(zone_name, query)
if result:
logging.debug('BitchNS: Resolving {} to {}'.format(zone_name, result))
return defer.succeed(result)
logging.error('Query failure')
return defer.fail(error.DomainError())
logging.error('Query failure')
return defer.fail(error.DomainError())
except TypeError as e:
logging.error('Invalid query - {}'.format(query))
return defer.fail(error.DNSFormatError())

13
bitchmin-server/server.py
View File

@@ -18,19 +18,8 @@ WORKER_PORT = int(os.environ.get('WORKER_PORT') or 10054)
API_HOST = os.environ.get('API_HOST') or 'http://localhost:5000'
# TODO: This smells
def get_zones():
response = requests.get('{}/dns/zones'.format(API_HOST))
zones = Zone.from_json(response.text)
return {
zone.name: zone
for zone in zones
}
def main():
zones = get_zones()
memory_resolver = MemoryResolver(zones)
memory_resolver = MemoryResolver(API_HOST)
dns_factory = server.DNSServerFactory(
clients=[

7
bitchmin-server/tests/test_worker.py Normal file
View File

@@ -0,0 +1,7 @@
import dns
import dns.zone
from dns.resolver import NoAnswer
def test_add_record(resolver) -> None:
assert False

2
build.sh
View File

@@ -1,3 +1,3 @@
cd bitchmin-server && ./build.sh && cd ..
cd bitchmin-api && ./build.sh && cd ..
cd bitchmin-web && ./build.sh && cd ..
cd bitchmin-client && ./build.sh && cd ..

1
hosting/.machineenv Normal file
View File

@@ -0,0 +1 @@
podnoms-status

8
hosting/docker-compose.yml Normal file
View File

@@ -0,0 +1,8 @@
version: "3.8"
services:
server:
image: fergalmoran/bitchmin-server
ports:
- "53:53"
environment:
- API_HOST=https://api.fergl.ie