diff --git a/hobo/middleware/maintenance.py b/hobo/middleware/maintenance.py index b89d56d..f8c3d04 100644 --- a/hobo/middleware/maintenance.py +++ b/hobo/middleware/maintenance.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import dns.exception -import dns.resolver from django.conf import settings from django.http import HttpResponse from django.utils.translation import ugettext as _ @@ -25,14 +23,6 @@ def pass_through(remote_addr): pass_through_ips = getattr(settings, 'MAINTENANCE_PASS_THROUGH_IPS', []) if remote_addr in pass_through_ips: return True - pass_through_ddns = getattr(settings, 'MAINTENANCE_PASS_THROUGH_DDNS', None) - if pass_through_ddns: - domain = '.'.join(reversed(remote_addr.split('.'))) + '.' + pass_through_ddns - try: - answers = dns.resolver.query(domain, 'A', lifetime=1) - return any(answer.address for answer in answers) - except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer, dns.exception.DNSException): - return False return False diff --git a/tests/test_maintenance.py b/tests/test_maintenance.py index 4190e97..3638dd7 100644 --- a/tests/test_maintenance.py +++ b/tests/test_maintenance.py @@ -17,10 +17,3 @@ def test_maintenance_middleware(app, admin_user, db, monkeypatch, settings): settings.MAINTENANCE_PASS_THROUGH_IPS = [] resp = app.get('/', status=503) - - settings.MAINTENANCE_PASS_THROUGH_DDNS = 'ddns.foo.bar' - with mock.patch('dns.resolver.resolve', return_value=[mock.Mock(address='127.0.0.2')]): - resp = app.get('/') - assert resp.status_code == 200 - with mock.patch('dns.resolver.resolve', return_value=[]): - resp = app.get('/', status=503)