Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
AC_PATH_PROG([XSLTPROC], [xsltproc])
# Python
AC_PATH_PROG([XSLTPROC], [xsltproc])
# Python
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
# IPv6
ipv6_address = d.system.guess_external_ip_address("ipv6")
if ipv6_address:
# IPv6
ipv6_address = d.system.guess_external_ip_address("ipv6")
if ipv6_address:
- print _("IPv6 Address: %s") % ipv6_address
+ print("IPv6 Address: %s" % ipv6_address)
# IPv4
ipv4_address = d.system.guess_external_ip_address("ipv4")
if ipv4_address:
# IPv4
ipv4_address = d.system.guess_external_ip_address("ipv4")
if ipv4_address:
- print _("IPv4 Address: %s") % ipv4_address
+ print("IPv4 Address: %s" % ipv4_address)
elif args.subparsers_name == "list-providers":
provider_names = d.get_provider_names()
elif args.subparsers_name == "list-providers":
provider_names = d.get_provider_names()
- print "\n".join(provider_names)
+ print("\n".join(provider_names))
elif args.subparsers_name == "update":
d.updateone(hostname=args.hostname, force=args.force)
elif args.subparsers_name == "update":
d.updateone(hostname=args.hostname, force=args.force)
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
import logging
import logging.handlers
import logging
import logging.handlers
logger = logging.getLogger("ddns.core")
logger.propagate = 1
logger = logging.getLogger("ddns.core")
logger.propagate = 1
-import database
-import providers
+from . import database
+from . import providers
from .errors import *
from .system import DDNSSystem
from .errors import *
from .system import DDNSSystem
def load_configuration(self, filename):
logger.debug(_("Loading configuration file %s") % filename)
def load_configuration(self, filename):
logger.debug(_("Loading configuration file %s") % filename)
- configs = ConfigParser.RawConfigParser()
+ configs = configparser.RawConfigParser()
configs.read([filename,])
# First apply all global configuration settings.
configs.read([filename,])
# First apply all global configuration settings.
self.settings[k] = v
# Allow missing config section
self.settings[k] = v
# Allow missing config section
- except ConfigParser.NoSectionError:
+ except configparser.NoSectionError:
pass
for entry in configs.sections():
pass
for entry in configs.sections():
# Check if the provider is actually supported and if there are
# some dependencies missing on this system.
if not provider.supported():
# Check if the provider is actually supported and if there are
# some dependencies missing on this system.
if not provider.supported():
- logger.warning("Provider '%s' is known, but not supported on this machine" % (provider.name))
+ logger.warning("Provider '%s' is known, but not supported on this machine" % provider.name)
continue
# Create an instance of the provider object with settings from the
continue
# Create an instance of the provider object with settings from the
- except DDNSError, e:
- logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) failed:") % \
- { "hostname" : entry.hostname, "provider" : entry.name })
+ except DDNSError as e:
+ logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) failed:") %
+ {"hostname": entry.hostname, "provider": entry.name})
logger.error(" %s: %s" % (e.__class__.__name__, e.reason))
if e.message:
logger.error(" %s" % e.message)
logger.error(" %s: %s" % (e.__class__.__name__, e.reason))
if e.message:
logger.error(" %s" % e.message)
- except Exception, e:
- logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) throwed an unhandled exception:") % \
- { "hostname" : entry.hostname, "provider" : entry.name }, exc_info=True)
+ except Exception:
+ logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) threw an unhandled exception:") %
+ {"hostname": entry.hostname, "provider": entry.name}, exc_info=True)
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
def _close_database(self):
if self._db:
def _close_database(self):
if self._db:
+ # TODO: Check Unresolved attribute reference '_db_close' for class 'DDNSDatabase'
self._db_close()
self._db = None
self._db_close()
self._db = None
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
def _(singular, plural=None, n=None):
"""
A function that returnes the translation of a string if available.
def _(singular, plural=None, n=None):
"""
A function that returnes the translation of a string if available.
The language is taken from the system environment.
The language is taken from the system environment.
- """
- if not plural is None:
+ """
+ if plural is not None:
assert n is not None
return gettext.dngettext(TEXTDOMAIN, singular, plural, n)
return gettext.dgettext(TEXTDOMAIN, singular)
assert n is not None
return gettext.dngettext(TEXTDOMAIN, singular, plural, n)
return gettext.dgettext(TEXTDOMAIN, singular)
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
import logging
import os
import subprocess
import logging
import os
import subprocess
+import urllib.request
+import urllib.error
+import urllib.parse
# Import all possible exception types.
from .errors import *
# Import all possible exception types.
from .errors import *
if not all((provider.handle, provider.name, provider.website)):
raise DDNSError(_("Provider is not properly configured"))
if not all((provider.handle, provider.name, provider.website)):
raise DDNSError(_("Provider is not properly configured"))
- assert not _providers.has_key(provider.handle), \
+ assert provider.handle not in _providers, \
"Provider '%s' has already been registered" % provider.handle
_providers[provider.handle] = provider
"Provider '%s' has already been registered" % provider.handle
_providers[provider.handle] = provider
return "<DDNS Provider %s (%s)>" % (self.name, self.handle)
def __cmp__(self, other):
return "<DDNS Provider %s (%s)>" % (self.name, self.handle)
def __cmp__(self, other):
- return cmp(self.hostname, other.hostname)
+ return (lambda a, b: (a > b)-(a < b))(self.hostname, other.hostname)
self.core.db.log_failure(self.hostname, e)
raise
self.core.db.log_failure(self.hostname, e)
raise
- logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") % \
- { "hostname" : self.hostname, "provider" : self.name })
+ logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") %
+ {"hostname": self.hostname, "provider": self.name})
self.core.db.log_success(self.hostname)
def update(self):
self.core.db.log_success(self.hostname)
def update(self):
def remove_protocol(self, proto):
if not self.can_remove_records:
def remove_protocol(self, proto):
if not self.can_remove_records:
- raise RuntimeError, "can_remove_records is enabled, but remove_protocol() not implemented"
+ raise RuntimeError("can_remove_records is enabled, but remove_protocol() not implemented")
raise NotImplementedError
raise NotImplementedError
def requires_update(self):
# If the IP addresses have changed, an update is required
if self.ip_address_changed(self.protocols):
def requires_update(self):
# If the IP addresses have changed, an update is required
if self.ip_address_changed(self.protocols):
- logger.debug(_("An update for %(hostname)s (%(provider)s)"
- " is performed because of an IP address change") % \
- { "hostname" : self.hostname, "provider" : self.name })
+ logger.debug(_("An update for %(hostname)s (%(provider)s) is performed because of an IP address change") %
+ {"hostname": self.hostname, "provider": self.name})
return True
# If the holdoff time has expired, an update is required, too
if self.holdoff_time_expired():
return True
# If the holdoff time has expired, an update is required, too
if self.holdoff_time_expired():
- logger.debug(_("An update for %(hostname)s (%(provider)s)"
- " is performed because the holdoff time has expired") % \
- { "hostname" : self.hostname, "provider" : self.name })
+ logger.debug(_("An update for %(hostname)s (%(provider)s) is performed because the holdoff time has expired") %
+ {"hostname": self.hostname, "provider": self.name})
return True
# Otherwise, we don't need to perform an update
return True
# Otherwise, we don't need to perform an update
- logger.debug(_("No update required for %(hostname)s (%(provider)s)") % \
- { "hostname" : self.hostname, "provider" : self.name })
+ logger.debug(_("No update required for %(hostname)s (%(provider)s)") %
+ {"hostname": self.hostname, "provider": self.name})
# If there is no holdoff time, we won't update ever again.
if self.holdoff_failure_days is None:
# If there is no holdoff time, we won't update ever again.
if self.holdoff_failure_days is None:
- logger.warning(_("An update has not been performed because earlier updates failed for %s") \
- % self.hostname)
+ logger.warning(_("An update has not been performed because earlier updates failed for %s") % self.hostname)
logger.warning(_("There will be no retries"))
return True
logger.warning(_("There will be no retries"))
return True
if now < holdoff_end:
failure_message = self.db.last_update_failure_message(self.hostname)
if now < holdoff_end:
failure_message = self.db.last_update_failure_message(self.hostname)
- logger.warning(_("An update has not been performed because earlier updates failed for %s") \
- % self.hostname)
+ logger.warning(_("An update has not been performed because earlier updates failed for %s") % self.hostname)
if failure_message:
logger.warning(_("Last failure message:"))
if failure_message:
logger.warning(_("Last failure message:"))
logger.debug("The holdoff time has expired for %s" % self.hostname)
return True
else:
logger.debug("The holdoff time has expired for %s" % self.hostname)
return True
else:
- logger.debug("Updates for %s are held off until %s" % \
- (self.hostname, holdoff_end))
+ logger.debug("Updates for %s are held off until %s" %
+ (self.hostname, holdoff_end))
return False
def send_request(self, *args, **kwargs):
return False
def send_request(self, *args, **kwargs):
def send_request(self, data):
# Send update to the server.
def send_request(self, data):
# Send update to the server.
- response = DDNSProvider.send_request(self, self.url, data=data,
- username=self.username, password=self.password)
+ response = DDNSProvider.send_request(self, self.url, data=data, username=self.username, password=self.password)
# Get the full response message.
output = response.read()
# Get the full response message.
output = response.read()
will be sent by various providers. This class uses the python
shipped XML minidom module to walk through the XML tree and return
a requested element.
will be sent by various providers. This class uses the python
shipped XML minidom module to walk through the XML tree and return
a requested element.
def get_xml_tag_value(self, document, content):
# Send input to the parser.
def get_xml_tag_value(self, document, content):
# Send input to the parser.
# -t sets the timeout
command = ["nsupdate", "-v", "-t", "60"]
# -t sets the timeout
command = ["nsupdate", "-v", "-t", "60"]
- p = subprocess.Popen(command, shell=True,
- stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- )
+ p = subprocess.Popen(command, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate(scriptlet)
if p.returncode == 0:
stdout, stderr = p.communicate(scriptlet)
if p.returncode == 0:
# Send update to the server.
try:
# Send update to the server.
try:
- response = self.send_request(self.url, username=self.username, password=self.password,
- data=data)
+ response = self.send_request(self.url, username=self.username, password=self.password, data=data)
- except urllib2.HTTPError, e:
+ except urllib.error.HTTPError as e:
if e.code == 422:
raise DDNSRequestError(_("Domain not found."))
if e.code == 422:
raise DDNSRequestError(_("Domain not found."))
}
# Send update to the server.
}
# Send update to the server.
- response = self.send_request(self.url, username=self.username, password=self.password,
- data=data)
+ response = self.send_request(self.url, username=self.username, password=self.password, data=data)
# Handle success messages.
if response.code == 200:
# Handle success messages.
if response.code == 200:
}
# Send update to the server.
}
# Send update to the server.
- response = self.send_request(self.url, username=self.username, password=self.password,
- data=data)
+ response = self.send_request(self.url, username=self.username, password=self.password, data=data)
# Get the full response message.
output = response.read()
# Get the full response message.
output = response.read()
output = output.strip()
# Handle success messages.
output = output.strip()
# Handle success messages.
- if output.startswith("I:OK") :
+ if output.startswith("I:OK"):
return
# If we got here, some other update error happened.
raise DDNSUpdateError
return
# If we got here, some other update error happened.
raise DDNSUpdateError
class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider):
handle = "dynu.com"
name = "Dynu"
class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider):
handle = "dynu.com"
name = "Dynu"
}
# Send update to the server.
}
# Send update to the server.
- response = self.send_request(self.url, data=data,
- username=self.username, password=self.password)
+ response = self.send_request(self.url, data=data, username=self.username, password=self.password)
# Get the full response message.
output = response.read()
# Get the full response message.
output = response.read()
response = self.send_request(url, data=data)
# Handle error codes
response = self.send_request(url, data=data)
# Handle error codes
- except urllib2.HTTPError, e:
+ except urllib.error.HTTPError as e:
if e.code == 404:
raise DDNSAuthenticationError
if e.code == 404:
raise DDNSAuthenticationError
data["ipv4"] = address4
# Raise an error if none address is given.
data["ipv4"] = address4
# Raise an error if none address is given.
- if not data.has_key("ipv6") and not data.has_key("ipv4"):
+ if "ipv6" not in data and "ipv4" not in data:
raise DDNSConfigurationError
# Check if a token has been set.
raise DDNSConfigurationError
# Check if a token has been set.
response = self.send_request(self.url, data=data)
else:
# Send update to the server.
response = self.send_request(self.url, data=data)
else:
# Send update to the server.
- response = self.send_request(self.url, username=self.username, password=self.password,
- data=data)
+ response = self.send_request(self.url, username=self.username, password=self.password, data=data)
# Get the full response message.
output = response.read()
# Get the full response message.
output = response.read()
}
# Send update to the server.
}
# Send update to the server.
- response = self.send_request(self.url, username=self.username, password=self.password,
- data=data)
+ response = self.send_request(self.url, username=self.username, password=self.password, data=data)
# Get the full response message.
output = response.read()
# Get the full response message.
output = response.read()
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
###############################################################################
# #
# ddns - A dynamic DNS client for IPFire #
import re
import ssl
import socket
import re
import ssl
import socket
-import urllib
-import urllib2
+import urllib.request
+import urllib.parse
+import urllib.error
-from __version__ import CLIENT_VERSION
+from .__version__ import CLIENT_VERSION
# Initialize the logger.
import logging
# Initialize the logger.
import logging
with open("/var/ipfire/red/local-ipaddress") as f:
return f.readline()
with open("/var/ipfire/red/local-ipaddress") as f:
return f.readline()
# File not found
if e.errno == 2:
return
# File not found
if e.errno == 2:
return
if data:
logger.debug(" data: %s" % data)
if data:
logger.debug(" data: %s" % data)
- req = urllib2.Request(url, data=data)
+ req = urllib.request.Request(url, data=data)
if username and password:
basic_auth_header = self._make_basic_auth_header(username, password)
if username and password:
basic_auth_header = self._make_basic_auth_header(username, password)
logger.debug(" %s: %s" % (k, v))
try:
logger.debug(" %s: %s" % (k, v))
try:
- resp = urllib2.urlopen(req, timeout=timeout)
+ resp = urllib.request.urlopen(req, timeout=timeout)
# Log response header.
logger.debug(_("Response header (Status Code %s):") % resp.code)
# Log response header.
logger.debug(_("Response header (Status Code %s):") % resp.code)
# Return the entire response object.
return resp
# Return the entire response object.
return resp
- except urllib2.HTTPError, e:
+ except urllib.error.HTTPError as e:
# Log response header.
logger.debug(_("Response header (Status Code %s):") % e.code)
for k, v in e.hdrs.items():
# Log response header.
logger.debug(_("Response header (Status Code %s):") % e.code)
for k, v in e.hdrs.items():
# Raise all other unhandled exceptions.
raise
# Raise all other unhandled exceptions.
raise
- except urllib2.URLError, e:
+ except urllib.error.URLError as e:
if e.reason:
# Handle SSL errors
if isinstance(e.reason, ssl.SSLError):
if e.reason:
# Handle SSL errors
if isinstance(e.reason, ssl.SSLError):
# Raise all other unhandled exceptions.
raise
# Raise all other unhandled exceptions.
raise
- except socket.timeout, e:
+ except socket.timeout as e:
logger.debug(_("Connection timeout"))
raise DDNSConnectionTimeoutError
logger.debug(_("Connection timeout"))
raise DDNSConnectionTimeoutError
args = []
for k, v in data.items():
args = []
for k, v in data.items():
- arg = "%s=%s" % (k, urllib.quote(v))
+ arg = "%s=%s" % (k, urllib.parse.quote(v))
args.append(arg)
return "&".join(args)
args.append(arg)
return "&".join(args)
authstring = "%s:%s" % (username, password)
# Encode authorization data in base64.
authstring = "%s:%s" % (username, password)
# Encode authorization data in base64.
- authstring = base64.encodestring(authstring)
+ authstring = base64.encodebytes(authstring)
# Remove any newline characters.
authstring = authstring.replace("\n", "")
# Remove any newline characters.
authstring = authstring.replace("\n", "")
# Resolve the host address.
try:
response = socket.getaddrinfo(hostname, None, family)
# Resolve the host address.
try:
response = socket.getaddrinfo(hostname, None, family)
- except socket.gaierror, e:
+ except socket.gaierror as e:
# Name or service not known
if e.errno == -2:
return []
# Name or service not known
if e.errno == -2:
return []
continue
# Add to repsonse list if not already in there.
continue
# Add to repsonse list if not already in there.
- if not address in addresses:
+ if address not in addresses:
addresses.append(address)
return addresses
addresses.append(address)
return addresses
"""
try:
f = open("/etc/os-release", "r")
"""
try:
f = open("/etc/os-release", "r")
# File not found
if e.errno == 2:
return
# File not found
if e.errno == 2:
return
"""
try:
f = open("/etc/system-release", "r")
"""
try:
f = open("/etc/system-release", "r")
# File not found
if e.errno == 2:
return
# File not found
if e.errno == 2:
return
projects / ddns.git / commitdiff
