extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2025-01-08 07:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Matrix: Allow client API authorization with token parameter (#1236)

Browse Source
This commit is contained in:
voc0der 2024-11-22 17:56:18 +00:00 committed by GitHub
parent 5441c15a1e
commit f17df458cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
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}',
@ -612,6 +614,9 @@ class NotifyMatrix(NotifyBase):
Perform Direct Matrix Server Notification (no webhook) Perform Direct Matrix Server Notification (no webhook)
""" """
if self.access_token is None and self.password and not self.user:
self.access_token = self.password
if self.access_token is None: if self.access_token is None:
# We need to register # We need to register
if not self._login(): if not self._login():
@ -890,32 +895,33 @@ 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):
# Prepare our Authentication Payload
if self.version == MatrixVersion.V3:
payload = {
'type': 'm.login.password',
'identifier': {
'type': 'm.id.user',
'user': self.user,
},
'password': self.password,
}
else:
payload = {
'type': 'm.login.password',
'user': self.user,
'password': self.password,
}
else:
# It's not possible to register since we need these 2 values to # It's not possible to register since we need these 2 values to
# make the action possible. # make the action possible.
self.logger.warning( self.logger.warning(
'Failed to login to Matrix server: ' 'Failed to login to Matrix server: '
'user/pass combo is missing.') 'token or user/pass combo is missing.')
return False return False
# Prepare our Authentication Payload
if self.version == MatrixVersion.V3:
payload = {
'type': 'm.login.password',
'identifier': {
'type': 'm.id.user',
'user': self.user,
},
'password': self.password,
}
else:
payload = {
'type': 'm.login.password',
'user': self.user,
'password': self.password,
}
# 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 +1489,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 +1574,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'] = \