diff --git a/nsupdate/api/views.py b/nsupdate/api/views.py index 77c67c7..b48d15a 100644 --- a/nsupdate/api/views.py +++ b/nsupdate/api/views.py @@ -210,14 +210,16 @@ class NicUpdateView(View): else: # maybe this host is owned by same person, but we can't know. result = 'nohost' # or 'badauth'? - logger.warning("rejecting to update wrong host %s (given in query string) " - "[instead of %s (given in basic auth)]" % (hostname, username)) - host.register_client_result(fault=True) + msg = ("rejecting to update wrong host %s (given in query string) " + "[instead of %s (given in basic auth)]" % (hostname, username)) + logger.warning(msg) + host.register_client_result(msg, fault=True) return Response(result) agent = request.META.get('HTTP_USER_AGENT', 'unknown') if agent in settings.BAD_AGENTS: - logger.warning('%s - received update from bad user agent' % (hostname, )) - host.register_client_result(fault=True) + msg = '%s - received update from bad user agent %r' % (hostname, agent) + logger.warning(msg) + host.register_client_result(msg, fault=True) return Response('badagent') ipaddr = request.GET.get('myip') if not ipaddr: # None or '' @@ -351,14 +353,16 @@ def _update(host, ipaddr, secure=False, logger=None): logger.exception("the dyndns2 updater raised an exception [%r]" % kwargs) return Response('good %s' % ipaddr) except SameIpError: - logger.warning('%s - received no-change update, ip: %s tls: %r' % (fqdn, ipaddr, secure)) - host.register_client_result(fault=True) + msg = '%s - received no-change update, ip: %s tls: %r' % (fqdn, ipaddr, secure) + logger.warning(msg) + host.register_client_result(msg, fault=True) return Response('nochg %s' % ipaddr) except (DnsUpdateError, NameServerNotAvailable) as e: msg = str(e) - logger.error('%s - received update that resulted in a dns error [%s], ip: %s tls: %r' % ( - fqdn, msg, ipaddr, secure)) - host.register_server_result(fault=True) + msg = '%s - received update that resulted in a dns error [%s], ip: %s tls: %r' % ( + fqdn, msg, ipaddr, secure) + logger.error(msg) + host.register_server_result(msg, fault=True) return Response('dnserr') @@ -400,7 +404,8 @@ def _delete(host, ipaddr, secure=False, logger=None): return Response('deleted %s' % rdtype) except (DnsUpdateError, NameServerNotAvailable) as e: msg = str(e) - logger.error('%s - received delete for record %s that resulted in a dns error [%s], tls: %r' % ( - fqdn, rdtype, msg, secure)) - host.register_server_result(fault=True) + msg = '%s - received delete for record %s that resulted in a dns error [%s], tls: %r' % ( + fqdn, rdtype, msg, secure) + logger.error(msg) + host.register_server_result(msg, fault=True) return Response('dnserr') diff --git a/nsupdate/main/migrations/0025_auto__add_field_host_client_result_msg__add_field_host_server_result_m.py b/nsupdate/main/migrations/0025_auto__add_field_host_client_result_msg__add_field_host_server_result_m.py new file mode 100644 index 0000000..66fff60 --- /dev/null +++ b/nsupdate/main/migrations/0025_auto__add_field_host_client_result_msg__add_field_host_server_result_m.py @@ -0,0 +1,142 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Host.client_result_msg' + db.add_column(u'main_host', 'client_result_msg', + self.gf('django.db.models.fields.CharField')(default='', max_length=255, null=True, blank=True), + keep_default=False) + + # Adding field 'Host.server_result_msg' + db.add_column(u'main_host', 'server_result_msg', + self.gf('django.db.models.fields.CharField')(default='', max_length=255, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Host.client_result_msg' + db.delete_column(u'main_host', 'client_result_msg') + + # Deleting field 'Host.server_result_msg' + db.delete_column(u'main_host', 'server_result_msg') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'main.blacklisteddomain': { + 'Meta': {'object_name': 'BlacklistedDomain'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blacklisted_domains'", 'to': u"orm['auth.User']"}), + 'domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + u'main.domain': { + 'Meta': {'object_name': 'Domain'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'domains'", 'to': u"orm['auth.User']"}), + 'domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'nameserver_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), + 'nameserver_update_algorithm': ('django.db.models.fields.CharField', [], {'default': "'HMAC_SHA512'", 'max_length': '16'}), + 'nameserver_update_secret': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '88'}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + u'main.host': { + 'Meta': {'unique_together': "(('subdomain', 'domain'),)", 'object_name': 'Host', 'index_together': "(('subdomain', 'domain'),)"}, + 'abuse': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'abuse_blocked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'client_faults': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'client_result_msg': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'hosts'", 'to': u"orm['auth.User']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['main.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'last_update_ipv4': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_update_ipv6': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'server_faults': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'server_result_msg': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'subdomain': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'tls_update_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'tls_update_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'update_secret': ('django.db.models.fields.CharField', [], {'max_length': '64'}) + }, + u'main.serviceupdater': { + 'Meta': {'object_name': 'ServiceUpdater'}, + 'accept_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'accept_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'serviceupdater'", 'to': u"orm['auth.User']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'path': ('django.db.models.fields.CharField', [], {'default': "'/nic/update'", 'max_length': '255'}), + 'secure': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'server': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'main.serviceupdaterhostconfig': { + 'Meta': {'object_name': 'ServiceUpdaterHostConfig'}, + 'comment': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'serviceupdaterhostconfigs'", 'to': u"orm['auth.User']"}), + 'give_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'give_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'host': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'serviceupdaterhostconfigs'", 'to': u"orm['main.Host']"}), + 'hostname': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['main.ServiceUpdater']"}) + } + } + + complete_apps = ['main'] \ No newline at end of file diff --git a/nsupdate/main/models.py b/nsupdate/main/models.py index c794710..94b1f95 100644 --- a/nsupdate/main/models.py +++ b/nsupdate/main/models.py @@ -3,6 +3,7 @@ models for hosts, domains, service updaters, ... """ import re +import time import base64 import dns.resolver @@ -19,6 +20,16 @@ from django.utils.translation import ugettext_lazy as _ from . import dnstools +RESULT_MSG_LEN = 255 + + +def result_fmt(msg): + """ + format the message for storage into client/server_result_msg fields + """ + msg = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(time.time())) + ' ' + msg + return msg[:RESULT_MSG_LEN] + class BlacklistedDomain(models.Model): domain = models.CharField( @@ -158,9 +169,17 @@ class Host(models.Model): # count client misbehaviours, like sending nochg updates or other # errors that should make the client stop trying to update: client_faults = models.PositiveIntegerField(default=0) + client_result_msg = models.CharField( + max_length=RESULT_MSG_LEN, + default='', blank=True, null=True, + help_text=_("Latest result message relating to the client")) # count server faults that happened when updating this host server_faults = models.PositiveIntegerField(default=0) + server_result_msg = models.CharField( + max_length=RESULT_MSG_LEN, + default='', blank=True, null=True, + help_text=_("Latest result message relating to the server")) # when we received the last update for v4/v6 addr last_update_ipv4 = models.DateTimeField(blank=True, null=True) @@ -224,14 +243,16 @@ class Host(models.Model): self.tls_update_ipv6 = secure self.save() - def register_client_result(self, fault=False): + def register_client_result(self, msg, fault=False): if fault: self.client_faults += 1 + self.client_result_msg = result_fmt(msg) self.save() - def register_server_result(self, fault=False): + def register_server_result(self, msg, fault=False): if fault: self.server_faults += 1 + self.server_result_msg = result_fmt(msg) self.save() def generate_secret(self, secret=None):