diff --git a/apprise/URLBase.py b/apprise/URLBase.py index a0780b67..962721db 100644 --- a/apprise/URLBase.py +++ b/apprise/URLBase.py @@ -435,7 +435,7 @@ class URLBase(object): results['secure'] = (results['schema'][-1] == 's') # Support SSL Certificate 'verify' keyword. Default to being enabled - results['verify'] = verify_host + results['verify'] = True if 'verify' in results['qsd']: results['verify'] = parse_bool( diff --git a/apprise/config/ConfigBase.py b/apprise/config/ConfigBase.py index 3ea6e652..2aa26cc9 100644 --- a/apprise/config/ConfigBase.py +++ b/apprise/config/ConfigBase.py @@ -292,11 +292,12 @@ class ConfigBase(URLBase): # Create log entry of loaded URL ConfigBase.logger.debug('Loaded URL: {}'.format(plugin.url())) - except Exception: + except Exception as e: # the arguments are invalid or can not be used. ConfigBase.logger.warning( 'Could not load URL {} on line {}.'.format( url, line)) + ConfigBase.logger.debug('Loading Exception: %s' % str(e)) continue # if we reach here, we successfully loaded our data diff --git a/apprise/plugins/NotifyBoxcar.py b/apprise/plugins/NotifyBoxcar.py index 29c23902..c0a30189 100644 --- a/apprise/plugins/NotifyBoxcar.py +++ b/apprise/plugins/NotifyBoxcar.py @@ -283,6 +283,7 @@ class NotifyBoxcar(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{access}/{secret}/{targets}/?{args}'.format( diff --git a/apprise/plugins/NotifyDBus.py b/apprise/plugins/NotifyDBus.py index b72a84fc..e9886aac 100644 --- a/apprise/plugins/NotifyDBus.py +++ b/apprise/plugins/NotifyDBus.py @@ -315,7 +315,8 @@ class NotifyDBus(NotifyBase): 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', 'urgency': 'normal' if self.urgency not in _map - else _map[self.urgency] + else _map[self.urgency], + 'verify': 'yes' if self.verify_certificate else 'no', } # x in (x,y) screen coordinates diff --git a/apprise/plugins/NotifyDiscord.py b/apprise/plugins/NotifyDiscord.py index ef4a94f0..0c97be5b 100644 --- a/apprise/plugins/NotifyDiscord.py +++ b/apprise/plugins/NotifyDiscord.py @@ -264,6 +264,7 @@ class NotifyDiscord(NotifyBase): 'footer': 'yes' if self.footer else 'no', 'footer_logo': 'yes' if self.footer_logo else 'no', 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{webhook_id}/{webhook_token}/?{args}'.format( diff --git a/apprise/plugins/NotifyEmail.py b/apprise/plugins/NotifyEmail.py index 183ecb21..f871319e 100644 --- a/apprise/plugins/NotifyEmail.py +++ b/apprise/plugins/NotifyEmail.py @@ -441,6 +441,7 @@ class NotifyEmail(NotifyBase): 'smtp': self.smtp_host, 'timeout': self.timeout, 'user': self.user, + 'verify': 'yes' if self.verify_certificate else 'no', } # pull email suffix from username (if present) diff --git a/apprise/plugins/NotifyEmby.py b/apprise/plugins/NotifyEmby.py index 87611c5f..876f9a8b 100644 --- a/apprise/plugins/NotifyEmby.py +++ b/apprise/plugins/NotifyEmby.py @@ -550,6 +550,7 @@ class NotifyEmby(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'modal': 'yes' if self.modal else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } # Determine Authentication diff --git a/apprise/plugins/NotifyFaast.py b/apprise/plugins/NotifyFaast.py index dd5f2de9..98bbf730 100644 --- a/apprise/plugins/NotifyFaast.py +++ b/apprise/plugins/NotifyFaast.py @@ -145,6 +145,7 @@ class NotifyFaast(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{authtoken}/?{args}'.format( diff --git a/apprise/plugins/NotifyFlock.py b/apprise/plugins/NotifyFlock.py index 98145e1f..425368d5 100644 --- a/apprise/plugins/NotifyFlock.py +++ b/apprise/plugins/NotifyFlock.py @@ -262,6 +262,7 @@ class NotifyFlock(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{token}/{targets}?{args}'\ diff --git a/apprise/plugins/NotifyGitter.py b/apprise/plugins/NotifyGitter.py index 005be8dd..6d4d73c1 100644 --- a/apprise/plugins/NotifyGitter.py +++ b/apprise/plugins/NotifyGitter.py @@ -347,6 +347,7 @@ class NotifyGitter(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{token}/{targets}/?{args}'.format( diff --git a/apprise/plugins/NotifyGnome.py b/apprise/plugins/NotifyGnome.py index 4e74d0a3..8707fc34 100644 --- a/apprise/plugins/NotifyGnome.py +++ b/apprise/plugins/NotifyGnome.py @@ -196,7 +196,8 @@ class NotifyGnome(NotifyBase): 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', 'urgency': 'normal' if self.urgency not in _map - else _map[self.urgency] + else _map[self.urgency], + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://_/?{args}'.format( diff --git a/apprise/plugins/NotifyGotify.py b/apprise/plugins/NotifyGotify.py index ed3a21f9..cc7aedfd 100644 --- a/apprise/plugins/NotifyGotify.py +++ b/apprise/plugins/NotifyGotify.py @@ -195,6 +195,7 @@ class NotifyGotify(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'priority': self.priority, + 'verify': 'yes' if self.verify_certificate else 'no', } default_port = 443 if self.secure else 80 diff --git a/apprise/plugins/NotifyGrowl/__init__.py b/apprise/plugins/NotifyGrowl/__init__.py index 1069c444..496078b7 100644 --- a/apprise/plugins/NotifyGrowl/__init__.py +++ b/apprise/plugins/NotifyGrowl/__init__.py @@ -238,6 +238,7 @@ class NotifyGrowl(NotifyBase): _map[GrowlPriority.NORMAL] if self.priority not in _map else _map[self.priority], 'version': self.version, + 'verify': 'yes' if self.verify_certificate else 'no', } auth = '' diff --git a/apprise/plugins/NotifyIFTTT.py b/apprise/plugins/NotifyIFTTT.py index 4a43eb32..779235a5 100644 --- a/apprise/plugins/NotifyIFTTT.py +++ b/apprise/plugins/NotifyIFTTT.py @@ -249,6 +249,7 @@ class NotifyIFTTT(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } # Store any new key/value pairs added to our list diff --git a/apprise/plugins/NotifyJSON.py b/apprise/plugins/NotifyJSON.py index 1adade27..c83afc1d 100644 --- a/apprise/plugins/NotifyJSON.py +++ b/apprise/plugins/NotifyJSON.py @@ -86,6 +86,7 @@ class NotifyJSON(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } # Append our headers into our args diff --git a/apprise/plugins/NotifyJoin.py b/apprise/plugins/NotifyJoin.py index 4c86a442..d76b711c 100644 --- a/apprise/plugins/NotifyJoin.py +++ b/apprise/plugins/NotifyJoin.py @@ -236,6 +236,7 @@ class NotifyJoin(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{apikey}/{devices}/?{args}'.format( diff --git a/apprise/plugins/NotifyMSTeams.py b/apprise/plugins/NotifyMSTeams.py index a88ce4c9..675648f9 100644 --- a/apprise/plugins/NotifyMSTeams.py +++ b/apprise/plugins/NotifyMSTeams.py @@ -262,6 +262,7 @@ class NotifyMSTeams(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{token_a}/{token_b}/{token_c}/'\ diff --git a/apprise/plugins/NotifyMatrix.py b/apprise/plugins/NotifyMatrix.py index 0009d6a8..05d3f266 100644 --- a/apprise/plugins/NotifyMatrix.py +++ b/apprise/plugins/NotifyMatrix.py @@ -874,6 +874,7 @@ class NotifyMatrix(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } if self.mode: diff --git a/apprise/plugins/NotifyMatterMost.py b/apprise/plugins/NotifyMatterMost.py index 4d51edc0..eadfd251 100644 --- a/apprise/plugins/NotifyMatterMost.py +++ b/apprise/plugins/NotifyMatterMost.py @@ -223,6 +223,7 @@ class NotifyMatterMost(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } if self.channels: diff --git a/apprise/plugins/NotifyProwl.py b/apprise/plugins/NotifyProwl.py index cf0f25b6..ae41f62a 100644 --- a/apprise/plugins/NotifyProwl.py +++ b/apprise/plugins/NotifyProwl.py @@ -209,7 +209,8 @@ class NotifyProwl(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'priority': 'normal' if self.priority not in _map - else _map[self.priority] + else _map[self.priority], + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{apikey}/{providerkey}/?{args}'.format( diff --git a/apprise/plugins/NotifyPushBullet.py b/apprise/plugins/NotifyPushBullet.py index 62837974..ec476ae6 100644 --- a/apprise/plugins/NotifyPushBullet.py +++ b/apprise/plugins/NotifyPushBullet.py @@ -180,6 +180,7 @@ class NotifyPushBullet(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } targets = '/'.join([NotifyPushBullet.quote(x) for x in self.targets]) diff --git a/apprise/plugins/NotifyPushed.py b/apprise/plugins/NotifyPushed.py index fe90905c..a8dbdafa 100644 --- a/apprise/plugins/NotifyPushed.py +++ b/apprise/plugins/NotifyPushed.py @@ -248,6 +248,7 @@ class NotifyPushed(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{app_key}/{app_secret}/{targets}/?{args}'.format( diff --git a/apprise/plugins/NotifyPushjet/__init__.py b/apprise/plugins/NotifyPushjet/__init__.py index e02aad1b..f7bc2724 100644 --- a/apprise/plugins/NotifyPushjet/__init__.py +++ b/apprise/plugins/NotifyPushjet/__init__.py @@ -107,6 +107,7 @@ class NotifyPushjet(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } default_port = 443 if self.secure else 80 diff --git a/apprise/plugins/NotifyPushover.py b/apprise/plugins/NotifyPushover.py index 49d74350..95a4a467 100644 --- a/apprise/plugins/NotifyPushover.py +++ b/apprise/plugins/NotifyPushover.py @@ -243,6 +243,7 @@ class NotifyPushover(NotifyBase): 'priority': _map[PushoverPriority.NORMAL] if self.priority not in _map else _map[self.priority], + 'verify': 'yes' if self.verify_certificate else 'no', } # Escape our devices diff --git a/apprise/plugins/NotifyRocketChat.py b/apprise/plugins/NotifyRocketChat.py index 59783f08..96b3891f 100644 --- a/apprise/plugins/NotifyRocketChat.py +++ b/apprise/plugins/NotifyRocketChat.py @@ -137,6 +137,7 @@ class NotifyRocketChat(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } # Determine Authentication diff --git a/apprise/plugins/NotifyRyver.py b/apprise/plugins/NotifyRyver.py index 005f43dc..9a156e7c 100644 --- a/apprise/plugins/NotifyRyver.py +++ b/apprise/plugins/NotifyRyver.py @@ -248,6 +248,7 @@ class NotifyRyver(NotifyBase): 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', 'mode': self.mode, + 'verify': 'yes' if self.verify_certificate else 'no', } # Determine if there is a botname present diff --git a/apprise/plugins/NotifySNS.py b/apprise/plugins/NotifySNS.py index 2d2420b6..81fe0aa9 100644 --- a/apprise/plugins/NotifySNS.py +++ b/apprise/plugins/NotifySNS.py @@ -524,6 +524,7 @@ class NotifySNS(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://{key_id}/{key_secret}/{region}/{targets}/'\ diff --git a/apprise/plugins/NotifySlack.py b/apprise/plugins/NotifySlack.py index a7bd7f17..77c81023 100644 --- a/apprise/plugins/NotifySlack.py +++ b/apprise/plugins/NotifySlack.py @@ -329,6 +329,7 @@ class NotifySlack(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', + 'verify': 'yes' if self.verify_certificate else 'no', } # Determine if there is a botname present diff --git a/apprise/plugins/NotifyTelegram.py b/apprise/plugins/NotifyTelegram.py index da1b7908..3c120336 100644 --- a/apprise/plugins/NotifyTelegram.py +++ b/apprise/plugins/NotifyTelegram.py @@ -501,6 +501,7 @@ class NotifyTelegram(NotifyBase): 'format': self.notify_format, 'overflow': self.overflow_mode, 'image': self.include_image, + 'verify': 'yes' if self.verify_certificate else 'no', } # No need to check the user token because the user automatically gets diff --git a/apprise/plugins/NotifyTwitter/__init__.py b/apprise/plugins/NotifyTwitter/__init__.py index d2ee30b6..d2fed9b9 100644 --- a/apprise/plugins/NotifyTwitter/__init__.py +++ b/apprise/plugins/NotifyTwitter/__init__.py @@ -163,6 +163,7 @@ class NotifyTwitter(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } if len(self.targets) > 0: diff --git a/apprise/plugins/NotifyWindows.py b/apprise/plugins/NotifyWindows.py index 65207a69..17605030 100644 --- a/apprise/plugins/NotifyWindows.py +++ b/apprise/plugins/NotifyWindows.py @@ -206,6 +206,7 @@ class NotifyWindows(NotifyBase): 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', 'duration': str(self.duration), + 'verify': 'yes' if self.verify_certificate else 'no', } return '{schema}://_/?{args}'.format( diff --git a/apprise/plugins/NotifyXBMC.py b/apprise/plugins/NotifyXBMC.py index ccbb9c68..57702ff0 100644 --- a/apprise/plugins/NotifyXBMC.py +++ b/apprise/plugins/NotifyXBMC.py @@ -258,6 +258,7 @@ class NotifyXBMC(NotifyBase): 'overflow': self.overflow_mode, 'image': 'yes' if self.include_image else 'no', 'duration': str(self.duration), + 'verify': 'yes' if self.verify_certificate else 'no', } # Determine Authentication diff --git a/apprise/plugins/NotifyXML.py b/apprise/plugins/NotifyXML.py index e5f41d07..5f1928d2 100644 --- a/apprise/plugins/NotifyXML.py +++ b/apprise/plugins/NotifyXML.py @@ -101,6 +101,7 @@ class NotifyXML(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } # Append our headers into our args diff --git a/apprise/plugins/NotifyXMPP.py b/apprise/plugins/NotifyXMPP.py index 3aa97c79..922974f7 100644 --- a/apprise/plugins/NotifyXMPP.py +++ b/apprise/plugins/NotifyXMPP.py @@ -287,6 +287,7 @@ class NotifyXMPP(NotifyBase): args = { 'format': self.notify_format, 'overflow': self.overflow_mode, + 'verify': 'yes' if self.verify_certificate else 'no', } if self.jid: