github
/
apprise
mirror of https://github.com/caronc/apprise
1
0
Fork 0
Code Issues Releases Wiki Activity

Eliminated Pushover API Token and User Key validation (#314)

pull/212/head
Chris Caron 2020-10-13 17:06:24 -04:00 committed by GitHub
parent 26c9e14bda
commit f6ce71c65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apprise/plugins/NotifyPushover.py
View File

@ -162,14 +162,12 @@ class NotifyPushover(NotifyBase):
'type': 'string', 'type': 'string',
'private': True, 'private': True,
'required': True, 'required': True,
'regex': (r'^[a-z0-9]{30}$', 'i'),
}, },
'token': { 'token': {
'name': _('Access Token'), 'name': _('Access Token'),
'type': 'string', 'type': 'string',
'private': True, 'private': True,
'required': True, 'required': True,
'regex': (r'^[a-z0-9]{30}$', 'i'),
}, },
'target_device': { 'target_device': {
'name': _('Target Device'), 'name': _('Target Device'),
@ -223,8 +221,7 @@ class NotifyPushover(NotifyBase):
super(NotifyPushover, self).__init__(**kwargs) super(NotifyPushover, self).__init__(**kwargs)
# Access Token (associated with project) # Access Token (associated with project)
self.token = validate_regex( self.token = validate_regex(token)
token, *self.template_tokens['token']['regex'])
if not self.token: if not self.token:
msg = 'An invalid Pushover Access Token ' \ msg = 'An invalid Pushover Access Token ' \
'({}) was specified.'.format(token) '({}) was specified.'.format(token)
@ -232,8 +229,7 @@ class NotifyPushover(NotifyBase):
raise TypeError(msg) raise TypeError(msg)
# User Key (associated with project) # User Key (associated with project)
self.user_key = validate_regex( self.user_key = validate_regex(user_key)
user_key, *self.template_tokens['user_key']['regex'])
if not self.user_key: if not self.user_key:
msg = 'An invalid Pushover User Key ' \ msg = 'An invalid Pushover User Key ' \
'({}) was specified.'.format(user_key) '({}) was specified.'.format(user_key)