Raise error on invalid alert address in alert send

python/nav/alertengine/dispatchers/__init__.py

@@ -101,6 +101,13 @@ class FatalDispatcherException(DispatcherException):
  pass
 
 
+class InvalidAlertAddressError(Exception):
+ """Raised when an alert address is invalid, which is determined by the
+ is_valid_address method of each dispatcher"""
+
+ pass
+
+
 def is_valid_email(address):
  """Validates a string as an e-mail address"""
  try:

python/nav/models/profiles.py

@@ -35,8 +35,11 @@
 import nav.buildconf
 import nav.pwhash
 from nav.config import getconfig as get_alertengine_config
-from nav.alertengine.dispatchers import DispatcherException
-from nav.alertengine.dispatchers import FatalDispatcherException
+from nav.alertengine.dispatchers import (
+ DispatcherException,
+ FatalDispatcherException,
+ InvalidAlertAddressError,
+)
 
 from nav.models.event import AlertQueue, AlertType, EventType
 from nav.models.manage import Arp, Cam, Category, Device, Location
@@ -423,10 +426,10 @@ def send(self, alert, subscription):
  # Determine the right language for the user.
  lang = self.account.preferences.get(Account.PREFERENCE_KEY_LANGUAGE, 'en')
 
- if not (self.address or '').strip():
+ if not self.has_valid_address():
  _logger.error(
- 'Ignoring alert %d (%s: %s)! Account %s does not have an '
- 'address set for the alertaddress with id %d, this needs '
+ 'Ignoring alert %d (%s: %s)! Account %s does not have a '
+ 'valid address for the alertaddress with id %d, this needs '
  'to be fixed before the user will recieve any alerts.',
  alert.id,
  alert,
@@ -435,7 +438,7 @@ def send(self, alert, subscription):
  self.id,
  )
 
- return True
+ raise InvalidAlertAddressError
 
  if self.type.is_blacklisted():
  _logger.debug(
@@ -1364,7 +1367,7 @@ def send(self):
 
  super(AccountAlertQueue, self).delete()
  return False
- except FatalDispatcherException:
+ except (FatalDispatcherException, InvalidAlertAddressError):
  self.delete()
  return False