flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

dnstools logging levels improved

Browse Source
This commit is contained in:
Thomas Waldmann 2013-11-10 13:59:40 +01:00
parent 9da1fe95b6
commit f1cdf2ec45
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nsupdate/api/views.py
View File

@ -191,7 +191,7 @@ class NicUpdateView(View):
return basic_challenge("authenticate to update DNS", 'noauth') return basic_challenge("authenticate to update DNS", 'noauth')
username, password = basic_authenticate(auth) username, password = basic_authenticate(auth)
if not check_api_auth(username, password): if not check_api_auth(username, password):
logger.info('%s - received bad credentials, username: %s' % (hostname, username, )) logger.warning('%s - received bad credentials, username: %s' % (hostname, username, ))
return basic_challenge("authenticate to update DNS", 'badauth') return basic_challenge("authenticate to update DNS", 'badauth')
logger.info("authenticated by update secret for host %s" % username) logger.info("authenticated by update secret for host %s" % username)
if hostname is None: if hostname is None:
@ -199,14 +199,14 @@ class NicUpdateView(View):
hostname = username hostname = username
elif hostname != username: elif hostname != username:
# maybe this host is owned by same person, but we can't know. # maybe this host is owned by same person, but we can't know.
logger.info("rejecting to update wrong host %s (given in query string) " logger.warning("rejecting to update wrong host %s (given in query string) "
"[instead of %s (given in basic auth)]" % (hostname, username)) "[instead of %s (given in basic auth)]" % (hostname, username))
return Response('nohost') # or 'badauth'? return Response('nohost') # or 'badauth'?
ipaddr = request.GET.get('myip') ipaddr = request.GET.get('myip')
if ipaddr is None: if ipaddr is None:
ipaddr = request.META.get('REMOTE_ADDR') ipaddr = request.META.get('REMOTE_ADDR')
if agent in settings.BAD_AGENTS: if agent in settings.BAD_AGENTS:
logger.info('%s - received update from bad user agent' % (hostname, )) logger.warning('%s - received update from bad user agent' % (hostname, ))
return Response('badagent') return Response('badagent')
return _update(hostname, ipaddr, agent, ssl, logger=logger) return _update(hostname, ipaddr, agent, ssl, logger=logger)
@ -236,7 +236,7 @@ class AuthorizedNicUpdateView(View):
if hostname is None: if hostname is None:
return Response('nohost') return Response('nohost')
if not check_session_auth(request.user, hostname): if not check_session_auth(request.user, hostname):
logger.info('%s - is not owned by user: %s' % (hostname, request.user.username, )) logger.warning('%s - is not owned by user: %s' % (hostname, request.user.username, ))
return Response('nohost') return Response('nohost')
logger.info("authenticated by session as user %s, creator of host %s" % (request.user.username, hostname)) logger.info("authenticated by session as user %s, creator of host %s" % (request.user.username, hostname))
ipaddr = request.GET.get('myip') ipaddr = request.GET.get('myip')
@ -267,6 +267,6 @@ def _update(hostname, ipaddr, agent='unknown', ssl=False, logger=None):
return Response('nochg %s' % ipaddr) return Response('nochg %s' % ipaddr)
except (DnsUpdateError, NameServerNotAvailable) as e: except (DnsUpdateError, NameServerNotAvailable) as e:
msg = str(e) msg = str(e)
logger.warning('%s - received update that resulted in an error, ip: %s ssl: %r [%s]' % ( logger.error('%s - received update that resulted in a dns error [%s], ip: %s ssl: %r' % (
hostname, ipaddr, ssl, msg)) hostname, msg, ipaddr, ssl))
return Response('dnserr %s' % msg) return Response('dnserr %s' % msg)