sergey/matrix-webhook
1
0
Fork 0
mirror of https://github.com/bsedin/matrix-webhook.git synced 2026-01-16 08:05:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for using predefined access token

Browse Source
This commit is contained in:
Alexander Olofsson 2023-03-08 14:41:52 +01:00
parent 1f072d31c8
commit a14f8fe625
No known key found for this signature in database
GPG Key ID: D439C9470CB04C73
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -35,12 +35,11 @@ docker run --rm -it nim65s/matrix-webhook -h
```
```
usage: python -m matrix_webhook [-h] [-H HOST] [-P PORT] [-u MATRIX_URL] -i MATRIX_ID -p MATRIX_PW -k API_KEY [-v]
usage: python -m matrix_webhook [-h] [-H HOST] [-P PORT] [-u MATRIX_URL] -i MATRIX_ID [-p MATRIX_PW] [-t MATRIX_TOKEN] -k API_KEY [-v]
Configuration for Matrix Webhook.
optional arguments:
options:
-h, --help show this help message and exit
-H HOST, --host HOST host to listen to. Default: `''`. Environment variable: `HOST`
-P PORT, --port PORT port to listed to. Default: 4785. Environment variable: `PORT`
@ -49,7 +48,9 @@ optional arguments:
-i MATRIX_ID, --matrix-id MATRIX_ID
matrix user-id. Required. Environment variable: `MATRIX_ID`
-p MATRIX_PW, --matrix-pw MATRIX_PW
matrix password. Required. Environment variable: `MATRIX_PW`
matrix password. Either this or token required. Environment variable: `MATRIX_PW`
-t MATRIX_TOKEN, --matrix-token MATRIX_TOKEN
matrix access token. Either this or password required. Environment variable: `MATRIX_TOKEN`
-k API_KEY, --api-key API_KEY
shared secret to use this service. Required. Environment variable: `API_KEY`
-v, --verbose increment verbosity level

8
matrix_webhook/app.py
View File

@ -17,8 +17,12 @@ async def main(event):
matrix client login & start web server
"""
LOGGER.info(f"Log in {conf.MATRIX_ID=} on {conf.MATRIX_URL=}")
await utils.CLIENT.login(conf.MATRIX_PW)
if conf.MATRIX_PW:
LOGGER.info(f"Log in {conf.MATRIX_ID=} on {conf.MATRIX_URL=}")
await utils.CLIENT.login(conf.MATRIX_PW)
else:
LOGGER.info(f"Restoring log in {conf.MATRIX_ID=} on {conf.MATRIX_URL=}")
utils.CLIENT.access_token = conf.MATRIX_TOKEN
server = web.Server(handler.matrix_webhook)
runner = web.ServerRunner(server)

19
matrix_webhook/conf.py
View File

@ -36,11 +36,21 @@ parser.add_argument(
parser.add_argument(
"-p",
"--matrix-pw",
help="matrix password. Required. Environment variable: `MATRIX_PW`",
help="matrix password. Either this or token required. Environment variable: `MATRIX_PW`",
**(
{"default": os.environ["MATRIX_PW"]}
if "MATRIX_PW" in os.environ
else {"required": True}
else {}
),
)
parser.add_argument(
"-t",
"--matrix-token",
help="matrix access token. Either this or password required. Environment variable: `MATRIX_TOKEN`",
**(
{"default": os.environ["MATRIX_TOKEN"]}
if "MATRIX_TOKEN" in os.environ
else {}
),
)
parser.add_argument(
@ -59,9 +69,14 @@ parser.add_argument(
args = parser.parse_args()
if not (args.matrix_pw or args.matrix_token):
print("Error: Either MATRIX_PW or MATRIX_TOKEN needs to be provided")
exit(1)
SERVER_ADDRESS = (args.host, args.port)
MATRIX_URL = args.matrix_url
MATRIX_ID = args.matrix_id
MATRIX_PW = args.matrix_pw
MATRIX_TOKEN = args.matrix_token
API_KEY = args.api_key
VERBOSE = args.verbose

6
matrix_webhook/utils.py
View File

@ -44,7 +44,8 @@ async def join_room(room_id):
if isinstance(resp, JoinError):
if resp.status_code == "M_UNKNOWN_TOKEN":
LOGGER.warning("Reconnecting")
await CLIENT.login(conf.MATRIX_PW)
if conf.MATRIX_PW:
await CLIENT.login(conf.MATRIX_PW)
else:
return create_json_response(error_map(resp), resp.message)
else:
@ -67,7 +68,8 @@ async def send_room_message(room_id, content):
if isinstance(resp, RoomSendError):
if resp.status_code == "M_UNKNOWN_TOKEN":
LOGGER.warning("Reconnecting")
await CLIENT.login(conf.MATRIX_PW)
if conf.MATRIX_PW:
await CLIENT.login(conf.MATRIX_PW)
else:
return create_json_response(error_map(resp), resp.message)
else: