diff --git a/nsupdate/login/templates/logout.html b/nsupdate/login/templates/logout.html
index d24bdbf6..eab7aec0 100644
--- a/nsupdate/login/templates/logout.html
+++ b/nsupdate/login/templates/logout.html
@@ -6,7 +6,7 @@
{% endblock %}
diff --git a/nsupdate/login/urls.py b/nsupdate/login/urls.py
index aecb7485..87ea8663 100644
--- a/nsupdate/login/urls.py
+++ b/nsupdate/login/urls.py
@@ -1,21 +1,22 @@
# -*- coding: utf-8 -*-
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from django.contrib.auth.views import login, logout_then_login, password_reset, password_reset_done, \
+ password_reset_confirm, password_reset_complete
-urlpatterns = patterns(
- '',
+urlpatterns = (
# login and logout url
- url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
- # or use 'django.contrib.auth.views.logout' with template 'logout.html
- url(r'^logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
+ url(r'^login/$', login, {'template_name': 'login.html'}, name='login'),
+ # or use logout with template 'logout.html'
+ url(r'^logout/$', logout_then_login, name='logout'),
# password reset urls
- url(r'^password_reset/$', 'django.contrib.auth.views.password_reset',
- {'template_name': 'password_reset.html'}, name='password_reset'),
- url(r'^password_reset_done/$', 'django.contrib.auth.views.password_reset_done',
+ url(r'^password_reset/$', password_reset, {'template_name': 'password_reset.html'},
+ name='password_reset'),
+ url(r'^password_reset_done/$', password_reset_done,
{'template_name': 'password_reset_done.html'}, name='password_reset_done'),
url(r'^password_reset_confirm/(?P
[0-9A-Za-z_\-]+)/(?P.+)/$',
- 'django.contrib.auth.views.password_reset_confirm',
- {'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),
- url(r'^password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete',
+ password_reset_confirm, {'template_name': 'password_reset_confirm.html'},
+ name='password_reset_confirm'),
+ url(r'^password_reset_complete/$', password_reset_complete,
{'template_name': 'password_reset_complete.html'}, name='password_reset_complete'),
)
diff --git a/nsupdate/main/_tests/test_main.py b/nsupdate/main/_tests/test_main.py
index d887104e..ccb88d0d 100644
--- a/nsupdate/main/_tests/test_main.py
+++ b/nsupdate/main/_tests/test_main.py
@@ -6,7 +6,7 @@
import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
USERNAME = 'test'
diff --git a/nsupdate/main/models.py b/nsupdate/main/models.py
index 57930c78..e04d5f3f 100644
--- a/nsupdate/main/models.py
+++ b/nsupdate/main/models.py
@@ -20,7 +20,6 @@
from django.utils.encoding import python_2_unicode_compatible
from django.utils.six import text_type
-
from . import dnstools
RESULT_MSG_LEN = 255
@@ -47,7 +46,7 @@ class BlacklistedHost(models.Model):
created_by = models.ForeignKey(
settings.AUTH_USER_MODEL,
related_name='blacklisted_domains',
- verbose_name=_('created by'))
+ verbose_name=_('created by'), on_delete=models.CASCADE)
def __str__(self):
return self.name_re
@@ -64,6 +63,7 @@ def host_blacklist_validator(value):
from collections import namedtuple
+
UpdateAlgorithm = namedtuple("update_algorithm", "bitlength bind_name")
UPDATE_ALGORITHM_DEFAULT = 'HMAC_SHA512'
@@ -128,7 +128,8 @@ class Domain(models.Model):
last_update = models.DateTimeField(_("last update"), auto_now=True)
created = models.DateTimeField(_("created at"), auto_now_add=True)
- created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='domains', verbose_name=_("created by"))
+ created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='domains', verbose_name=_("created by"),
+ on_delete=models.CASCADE)
def __str__(self):
return self.name
@@ -149,7 +150,7 @@ def get_bind9_algorithm(self):
class Meta:
verbose_name = _('domain')
verbose_name_plural = _('domains')
- ordering = ('name', )
+ ordering = ('name',)
@python_2_unicode_compatible
@@ -249,14 +250,15 @@ class Host(models.Model):
last_update = models.DateTimeField(_("last update"), auto_now=True)
created = models.DateTimeField(_("created at"), auto_now_add=True)
- created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hosts', verbose_name=_("created by"),)
+ created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hosts', verbose_name=_("created by"),
+ on_delete=models.CASCADE)
def __str__(self):
return u"%s.%s" % (self.name, self.domain.name)
class Meta(object):
- unique_together = (('name', 'domain'), )
- index_together = (('name', 'domain'), )
+ unique_together = (('name', 'domain'),)
+ index_together = (('name', 'domain'),)
verbose_name = _('host')
verbose_name_plural = _('hosts')
ordering = ('domain', 'name') # groupby domain and sort by name
@@ -345,10 +347,11 @@ def pre_delete_host(sender, **kwargs):
except (dnstools.Timeout, dnstools.NameServerNotAvailable):
# well, we tried to clean up, but we didn't reach the nameserver
pass
- except (dnstools.DnsUpdateError, ):
+ except (dnstools.DnsUpdateError,):
# e.g. PeerBadSignature if host is protected by a key we do not have
pass
+
pre_delete.connect(pre_delete_host, sender=Host)
@@ -360,10 +363,11 @@ def post_save_host(sender, **kwargs):
except (dnstools.Timeout, dnstools.NameServerNotAvailable):
# well, we tried to clean up, but we didn't reach the nameserver
pass
- except (dnstools.DnsUpdateError, ):
+ except (dnstools.DnsUpdateError,):
# e.g. PeerBadSignature if host is protected by a key we do not have
pass
+
post_save.connect(post_save_host, sender=Host)
@@ -411,7 +415,7 @@ def __str__(self):
return u"%s.%s" % (self.name, text_type(self.main_host))
class Meta(object):
- unique_together = (('name', 'main_host'), )
+ unique_together = (('name', 'main_host'),)
verbose_name = _('related host')
verbose_name_plural = _('related hosts')
ordering = ('main_host', 'name')
@@ -475,7 +479,7 @@ class ServiceUpdater(models.Model):
created_by = models.ForeignKey(
settings.AUTH_USER_MODEL,
related_name='serviceupdater',
- verbose_name=_("created by"))
+ verbose_name=_("created by"), on_delete=models.CASCADE)
def __str__(self):
return self.name
@@ -525,10 +529,10 @@ class ServiceUpdaterHostConfig(models.Model):
created_by = models.ForeignKey(
settings.AUTH_USER_MODEL,
related_name='serviceupdaterhostconfigs',
- verbose_name=_("created by"))
+ verbose_name=_("created by"), on_delete=models.CASCADE)
def __str__(self):
- return u"%s (%s)" % (self.hostname, self.service.name, )
+ return u"%s (%s)" % (self.hostname, self.service.name,)
class Meta(object):
verbose_name = _('service updater host config')
diff --git a/nsupdate/main/urls.py b/nsupdate/main/urls.py
index e9d79806..974f919e 100644
--- a/nsupdate/main/urls.py
+++ b/nsupdate/main/urls.py
@@ -2,7 +2,7 @@
main app url dispatching
"""
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from .views import (
HomeView, OverviewView, HostView, AddHostView, DeleteHostView, AboutView, GenerateSecretView, GenerateNSSecretView,
@@ -14,8 +14,7 @@
NicDeleteView, AuthorizedNicDeleteView)
-urlpatterns = patterns(
- '',
+urlpatterns = (
# interactive web ui
url(r'^$', HomeView.as_view(), name="home"),
url(r'^about/$', AboutView.as_view(), name="about"),
diff --git a/nsupdate/main/views.py b/nsupdate/main/views.py
index b9d37f24..0714b75b 100644
--- a/nsupdate/main/views.py
+++ b/nsupdate/main/views.py
@@ -16,7 +16,7 @@
from django.contrib.auth import get_user_model
from django.contrib import messages
from django.utils.decorators import method_decorator
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.http import Http404
from django import template
from django.utils.timezone import now
@@ -195,7 +195,7 @@ def get_context_data(self, **kwargs):
.only("name", "comment", "available", "client_faults", "server_faults", "abuse_blocked", "abuse",
"last_update_ipv4", "tls_update_ipv4", "last_update_ipv6", "tls_update_ipv6", "domain__name")
context['your_domains'] = Domain.objects.filter(
- created_by=self.request.user).select_related("created_by__username")\
+ created_by=self.request.user).select_related("created_by__profile")\
.only("name", "public", "available", "comment", "created_by__username")
context['public_domains'] = Domain.objects.filter(
public=True).exclude(created_by=self.request.user).select_related("created_by")\
@@ -215,7 +215,7 @@ def dispatch(self, *args, **kwargs):
def get_success_url(self):
return reverse('generate_secret_view', args=(self.object.pk,))
- def get_form(self, form_class):
+ def get_form(self, form_class=None):
form = super(AddHostView, self).get_form(form_class)
form.fields['domain'].queryset = Domain.objects.filter(
Q(created_by=self.request.user) | Q(public=True))
@@ -347,7 +347,7 @@ def dispatch(self, *args, **kwargs):
def get_success_url(self):
return reverse('related_host_overview', args=(self.object.main_host.pk, ))
- def get_form(self, form_class):
+ def get_form(self, form_class=None):
form = super(AddRelatedHostView, self).get_form(form_class)
return form
diff --git a/nsupdate/management/commands/domains.py b/nsupdate/management/commands/domains.py
index c648be23..aee2f20f 100644
--- a/nsupdate/management/commands/domains.py
+++ b/nsupdate/management/commands/domains.py
@@ -4,8 +4,6 @@
import dns.resolver
-from optparse import make_option
-
from django.core.management.base import BaseCommand
from django.core.mail import send_mail
from django.db import transaction
@@ -15,7 +13,6 @@
from nsupdate.main.dnstools import FQDN, query_ns, NameServerNotAvailable
from nsupdate.utils.mail import translate_for_user, send_mail_to_user
-
MSG = _("""\
Your domain: %(domain)s (comment: %(comment)s)
@@ -68,20 +65,17 @@ def check_dns(domain):
class Command(BaseCommand):
help = 'deal with domains'
- option_list = BaseCommand.option_list + (
- make_option('--check',
- action='store_true',
- dest='check',
- default=False,
- help='check whether nameserver for domain is reachable and answers queries',
- ),
- make_option('--notify-user',
- action='store_true',
- dest='notify_user',
- default=False,
- help='notify the user by email when domain gets flagged as unavailable',
- ),
- )
+ def add_arguments(self, parser):
+ parser.add_argument('--check',
+ action='store_true',
+ dest='check',
+ default=False,
+ help='check whether nameserver for domain is reachable and answers queries')
+ parser.add_argument('--notify-user',
+ action='store_true',
+ dest='notify_user',
+ default=False,
+ help='notify the user by email when domain gets flagged as unavailable')
def handle(self, *args, **options):
check = options['check']
@@ -105,6 +99,6 @@ def handle(self, *args, **options):
subject = subject % dict(domain=domain)
msg = msg % dict(domain=domain, comment=comment)
send_mail_to_user(creator, subject, msg)
- msg = "setting unavailable flag for domain %s (created by %s)\n" % (domain, creator, )
+ msg = "setting unavailable flag for domain %s (created by %s)\n" % (domain, creator,)
self.stdout.write(msg)
d.save()
diff --git a/nsupdate/management/commands/faults.py b/nsupdate/management/commands/faults.py
index beaee5cb..2c581c17 100644
--- a/nsupdate/management/commands/faults.py
+++ b/nsupdate/management/commands/faults.py
@@ -4,8 +4,6 @@
import traceback
-from optparse import make_option
-
from django.core.management.base import BaseCommand
from django.core.mail import send_mail
from django.db import transaction
@@ -14,7 +12,6 @@
from nsupdate.main.models import Host
from nsupdate.utils.mail import translate_for_user, send_mail_to_user
-
ABUSE_MSG = _("""\
Your host: %(fqdn)s (comment: %(comment)s)
@@ -52,63 +49,53 @@
class Command(BaseCommand):
help = 'deal with the faults counters'
- option_list = BaseCommand.option_list + (
- make_option('--show-server',
- action='store_true',
- dest='show_server',
- default=False,
- help='show server fault counters',
- ),
- make_option('--show-client',
- action='store_true',
- dest='show_client',
- default=False,
- help='show client fault counters',
- ),
- make_option('--reset-server',
- action='store_true',
- dest='reset_server',
- default=False,
- help='reset the server fault counters of all hosts',
- ),
- make_option('--reset-client',
- action='store_true',
- dest='reset_client',
- default=False,
- help='reset the client fault counters of all hosts',
- ),
- make_option('--reset-abuse',
- action='store_true',
- dest='reset_abuse',
- default=False,
- help='reset the abuse flag (to False) of all hosts',
- ),
- make_option('--reset-abuse-blocked',
- action='store_true',
- dest='reset_abuse_blocked',
- default=False,
- help='reset the abuse_blocked flag (to False) of all hosts',
- ),
- make_option('--reset-available',
- action='store_true',
- dest='reset_available',
- default=False,
- help='reset the available flag (to True) of all hosts',
- ),
- make_option('--flag-abuse',
- action='store',
- dest='flag_abuse',
- default=None,
- type='int',
- help='if client faults > N then set abuse flag and reset client faults',
- ),
- make_option('--notify-user',
- action='store_true',
- dest='notify_user',
- default=False,
- help='notify the user by email when host gets flagged for abuse',
- ),
- )
+ def add_arguments(self, parser):
+ parser.add_argument('--show-server',
+ action='store_true',
+ dest='show_server',
+ default=False,
+ help='show server fault counters')
+ parser.add_argument('--show-client',
+ action='store_true',
+ dest='show_client',
+ default=False,
+ help='show client fault counters')
+ parser.add_argument('--reset-server',
+ action='store_true',
+ dest='reset_server',
+ default=False,
+ help='reset the server fault counters of all hosts')
+ parser.add_argument('--reset-client',
+ action='store_true',
+ dest='reset_client',
+ default=False,
+ help='reset the client fault counters of all hosts')
+ parser.add_argument('--reset-abuse',
+ action='store_true',
+ dest='reset_abuse',
+ default=False,
+ help='reset the abuse flag (to False) of all hosts')
+ parser.add_argument('--reset-abuse-blocked',
+ action='store_true',
+ dest='reset_abuse_blocked',
+ default=False,
+ help='reset the abuse_blocked flag (to False) of all hosts')
+ parser.add_argument('--reset-available',
+ action='store_true',
+ dest='reset_available',
+ default=False,
+ help='reset the available flag (to True) of all hosts')
+ parser.add_argument('--flag-abuse',
+ action='store',
+ dest='flag_abuse',
+ default=None,
+ type=int,
+ help='if client faults N then set abuse flag and reset client faults')
+ parser.add_argument('--notify-user',
+ action='store_true',
+ dest='notify_user',
+ default=False,
+ help='notify the user by email when host gets flagged for abuse')
def handle(self, *args, **options):
show_client = options['show_client']
@@ -129,10 +116,10 @@ def handle(self, *args, **options):
output += u"%-6d " % h.client_faults
if show_server:
output += u"%-6d " % h.server_faults
- output += u"%s %s\n" % (h.created_by.username, h.get_fqdn(), )
+ output += u"%s %s\n" % (h.created_by.username, h.get_fqdn(),)
self.stdout.write(output)
if (flag_abuse is not None or reset_client or reset_server or
- reset_available or reset_abuse or reset_abuse_blocked):
+ reset_available or reset_abuse or reset_abuse_blocked):
if flag_abuse is not None:
if h.client_faults > flag_abuse:
h.abuse = True
@@ -166,7 +153,7 @@ def handle(self, *args, **options):
h.save()
except Exception:
try:
- msg = u"The following Exception occurred when processing host %s!\n" % (h.get_fqdn(), )
+ msg = u"The following Exception occurred when processing host %s!\n" % (h.get_fqdn(),)
self.stderr.write(msg)
except Exception:
pass
diff --git a/nsupdate/management/commands/hosts.py b/nsupdate/management/commands/hosts.py
index de1fd45a..9dd852e7 100644
--- a/nsupdate/management/commands/hosts.py
+++ b/nsupdate/management/commands/hosts.py
@@ -3,7 +3,6 @@
"""
from datetime import datetime
-from optparse import make_option
from django.core.management.base import BaseCommand
from django.db import transaction
@@ -132,20 +131,17 @@ def check_staleness(h):
class Command(BaseCommand):
help = 'deal with hosts'
- option_list = BaseCommand.option_list + (
- make_option('--stale-check',
- action='store_true',
- dest='stale_check',
- default=False,
- help='check whether the host has been updated recently, increase staleness counter if not',
- ),
- make_option('--notify-user',
- action='store_true',
- dest='notify_user',
- default=False,
- help='notify the user by email when staleness counter increases',
- ),
- )
+ def add_arguments(self, parser):
+ parser.add_argument('--stale-check',
+ action='store_true',
+ dest='stale_check',
+ default=False,
+ help='check whether the host has been updated recently, increase staleness counter if not')
+ parser.add_argument('--notify-user',
+ action='store_true',
+ dest='notify_user',
+ default=False,
+ help='notify the user by email when staleness counter increases')
def handle(self, *args, **options):
stale_check = options['stale_check']
diff --git a/nsupdate/management/commands/testuser.py b/nsupdate/management/commands/testuser.py
index 158d594b..c90c2d43 100644
--- a/nsupdate/management/commands/testuser.py
+++ b/nsupdate/management/commands/testuser.py
@@ -4,13 +4,13 @@
from django.conf import settings
from django.contrib.auth import get_user_model
-from django.core.management.base import NoArgsCommand
+from django.core.management.base import BaseCommand
-class Command(NoArgsCommand):
+class Command(BaseCommand):
help = 'reinitialize the test user'
- def handle_noargs(self, **options):
+ def handle(self, *args, **options):
user_model = get_user_model()
try:
u = user_model.objects.get(username='test')
diff --git a/nsupdate/settings/base.py b/nsupdate/settings/base.py
index 982db647..7bd159b2 100644
--- a/nsupdate/settings/base.py
+++ b/nsupdate/settings/base.py
@@ -264,8 +264,17 @@
SESSION_COOKIE_AGE = 14 * 24 * 60 * 60 # 14 days, in seconds (remember_me is True)
SESSION_EXPIRE_AT_BROWSER_CLOSE = True # more safe (remember_me is False)
-# python-social-auth settings
+# Allow SHA1 for host update secrets
+PASSWORD_HASHERS = [
+ 'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+ 'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+ 'django.contrib.auth.hashers.Argon2PasswordHasher',
+ 'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
+ 'django.contrib.auth.hashers.BCryptPasswordHasher',
+ 'django.contrib.auth.hashers.SHA1PasswordHasher',
+]
+# python-social-auth settings
AUTHENTICATION_BACKENDS = (
'social_core.backends.amazon.AmazonOAuth2',
'social_core.backends.bitbucket.BitbucketOAuth',
diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html
index c20235f4..d6b3988f 100644
--- a/nsupdate/templates/base.html
+++ b/nsupdate/templates/base.html
@@ -58,7 +58,7 @@
{% endif %}
diff --git a/nsupdate/urls.py b/nsupdate/urls.py
index b28fcdb2..e82f8bd6 100644
--- a/nsupdate/urls.py
+++ b/nsupdate/urls.py
@@ -3,9 +3,10 @@
"""
from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.auth import views as auth_views
+from django.conf.urls.static import static
def remember_me_login(request, *args, **kw):
@@ -20,8 +21,7 @@ def remember_me_login(request, *args, **kw):
return auth_views.login(request, *args, **kw)
-urlpatterns = patterns(
- '',
+urlpatterns = [
url('', include('social_django.urls', namespace='social')),
url(r'^accounts/', include('nsupdate.login.urls')),
# registration and user settings
@@ -29,12 +29,9 @@ def remember_me_login(request, *args, **kw):
url(r'^admin/', include(admin.site.urls)),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^', include('nsupdate.main.urls')),
-)
+]
if settings.DEBUG:
- urlpatterns += patterns('django.contrib.staticfiles.views',
- url(r'^static/(?P.*)$', 'serve'), )
+ urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
import debug_toolbar
- urlpatterns += patterns('',
- url(r'^__debug__/', include(debug_toolbar.urls)),
- )
+ urlpatterns += (url(r'^__debug__/', include(debug_toolbar.urls)),)
diff --git a/requirements.d/all.txt b/requirements.d/all.txt
index f2e8da60..e1945071 100644
--- a/requirements.d/all.txt
+++ b/requirements.d/all.txt
@@ -1,7 +1,7 @@
# packages always needed
dnspython
netaddr
-django>=1.8.1, <1.9
+django~=1.11.0
django-bootstrap-form
django-registration-redux
django-extensions
diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh
index 1faa82ab..c30a332c 100755
--- a/scripts/travis/install.sh
+++ b/scripts/travis/install.sh
@@ -19,6 +19,6 @@ sudo chattr +i /etc/resolv.conf
#dig @127.0.0.1 tests.nsupdate.info SOA
#sudo netstat -tulpen | grep 53
-pip install Django==$DJANGO
+pip install Django~=$DJANGO
pip install -r requirements.d/travis.txt
pip install -e .
diff --git a/setup.cfg b/setup.cfg
index 901b485a..e3fc537a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,7 +21,7 @@ all_files = 1
[upload_sphinx]
upload-dir = docs/_build/html
-[pytest]
+[tool:pytest]
DJANGO_SETTINGS_MODULE = nsupdate.settings.dev
pep8maxlinelength = 120
norecursedirs = .git
diff --git a/setup.py b/setup.py
index b98db06a..31f192da 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,6 @@
with open('README.rst') as f:
readme_content = f.read()
-if PY2:
- install_requires = ['dnspython', ]
-else:
- install_requires = ['dnspython3', ]
-
setup(
name='nsupdate',
version=str(version),
@@ -53,9 +48,10 @@
include_package_data=True,
zip_safe=False,
platforms='any',
- install_requires=install_requires + [
+ install_requires=[
+ 'dnspython',
'netaddr',
- 'django>=1.8.1, <1.9',
+ 'django~=1.11.0',
'django-bootstrap-form',
'django-registration-redux',
'django-extensions',