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

Eliminate Slack webhook token restrictions (#219)

pull/220/head
Chris Caron 2020-03-20 13:05:01 -04:00 committed by GitHub
parent 44905e5c6e
commit 3895ad9b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apprise/plugins/NotifySlack.py
View File

@ -176,7 +176,7 @@ class NotifySlack(NotifyBase):
'type': 'string', 'type': 'string',
'private': True, 'private': True,
'required': True, 'required': True,
'regex': (r'^[A-Z0-9]{9}$', 'i'), 'regex': (r'^[A-Z0-9]+$', 'i'),
}, },
# Token required as part of the Webhook request # Token required as part of the Webhook request
# /........./BBBBBBBBB/........................ # /........./BBBBBBBBB/........................
@ -185,7 +185,7 @@ class NotifySlack(NotifyBase):
'type': 'string', 'type': 'string',
'private': True, 'private': True,
'required': True, 'required': True,
'regex': (r'^[A-Z0-9]{9}$', 'i'), 'regex': (r'^[A-Z0-9]+$', 'i'),
}, },
# Token required as part of the Webhook request # Token required as part of the Webhook request
# /........./........./CCCCCCCCCCCCCCCCCCCCCCCC # /........./........./CCCCCCCCCCCCCCCCCCCCCCCC
@ -194,7 +194,7 @@ class NotifySlack(NotifyBase):
'type': 'string', 'type': 'string',
'private': True, 'private': True,
'required': True, 'required': True,
'regex': (r'^[A-Za-z0-9]{24}$', 'i'), 'regex': (r'^[A-Za-z0-9]+$', 'i'),
}, },
'target_encoded_id': { 'target_encoded_id': {
'name': _('Target Encoded ID'), 'name': _('Target Encoded ID'),

6
test/test_rest_plugins.py
View File

@ -3213,15 +3213,15 @@ TEST_URLS = (
'message': '', 'message': '',
}, },
}), }),
('slack://username@INVALID/A1BRTD4JD/TIiajkdnlazkcOXrIdevi7FQ/#cool', { ('slack://username@-INVALID-/A1BRTD4JD/TIiajkdnlazkcOXrIdevi7FQ/#cool', {
# invalid 1st Token # invalid 1st Token
'instance': TypeError, 'instance': TypeError,
}), }),
('slack://username@T1JJ3T3L2/INVALID/TIiajkdnlazkcOXrIdevi7FQ/#great', { ('slack://username@T1JJ3T3L2/-INVALID-/TIiajkdnlazkcOXrIdevi7FQ/#great', {
# invalid 2rd Token # invalid 2rd Token
'instance': TypeError, 'instance': TypeError,
}), }),
('slack://username@T1JJ3T3L2/A1BRTD4JD/INVALID/#channel', { ('slack://username@T1JJ3T3L2/A1BRTD4JD/-INVALID-/#channel', {
# invalid 3rd Token # invalid 3rd Token
'instance': TypeError, 'instance': TypeError,
}), }),