extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2024-11-28 19:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

m.login.token support for Matrix

Browse Source
This commit is contained in:
Chris Caron 2024-09-14 17:11:47 -04:00
parent f37dfbf5a1
commit 05b23fdede
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apprise/plugins/matrix.py
View File

@ -201,9 +201,11 @@ class NotifyMatrix(NotifyBase):
'{schema}://{token}', '{schema}://{token}',
'{schema}://{user}@{token}', '{schema}://{user}@{token}',
# Disabled webhook # Matrix Server
'{schema}://{user}:{password}@{host}/{targets}', '{schema}://{user}:{password}@{host}/{targets}',
'{schema}://{user}:{password}@{host}:{port}/{targets}', '{schema}://{user}:{password}@{host}:{port}/{targets}',
'{schema}://{token}@{host}/{targets}',
'{schema}://{token}@{host}:{port}/{targets}',
# Webhook mode # Webhook mode
'{schema}://{user}:{token}@{host}/{targets}', '{schema}://{user}:{token}@{host}/{targets}',
@ -890,14 +892,7 @@ class NotifyMatrix(NotifyBase):
# Login not required; silently skip-over # Login not required; silently skip-over
return True return True
if not (self.user and self.password): if (self.user and self.password):
# It's not possible to register since we need these 2 values to
# make the action possible.
self.logger.warning(
'Failed to login to Matrix server: '
'user/pass combo is missing.')
return False
# Prepare our Authentication Payload # Prepare our Authentication Payload
if self.version == MatrixVersion.V3: if self.version == MatrixVersion.V3:
payload = { payload = {
@ -916,6 +911,21 @@ class NotifyMatrix(NotifyBase):
'password': self.password, 'password': self.password,
} }
elif self.password:
# token
payload = {
'type': 'm.login.token',
'token': self.password,
}
else:
# It's not possible to register since we need these 2 values to
# make the action possible.
self.logger.warning(
'Failed to login to Matrix server: '
'token or user/pass combo is missing.')
return False
# Build our URL # Build our URL
postokay, response = self._fetch('/login', payload=payload) postokay, response = self._fetch('/login', payload=payload)
if not (postokay and isinstance(response, dict)): if not (postokay and isinstance(response, dict)):
@ -1483,9 +1493,10 @@ class NotifyMatrix(NotifyBase):
safe=''), safe=''),
) )
elif self.user: elif self.user or self.password:
auth = '{user}@'.format( auth = '{value}@'.format(
user=NotifyMatrix.quote(self.user, safe=''), value=NotifyMatrix.quote(
self.user if self.user else self.password, safe=''),
) )
default_port = 443 if self.secure else 80 default_port = 443 if self.secure else 80
@ -1567,6 +1578,11 @@ class NotifyMatrix(NotifyBase):
if 'token' in results['qsd'] and len(results['qsd']['token']): if 'token' in results['qsd'] and len(results['qsd']['token']):
results['password'] = NotifyMatrix.unquote(results['qsd']['token']) results['password'] = NotifyMatrix.unquote(results['qsd']['token'])
elif not results['password'] and results['user']:
# swap
results['password'] = results['user']
results['user'] = None
# Support the use of the version= or v= keyword # Support the use of the version= or v= keyword
if 'version' in results['qsd'] and len(results['qsd']['version']): if 'version' in results['qsd'] and len(results['qsd']['version']):
results['version'] = \ results['version'] = \