rms/mirrors-miniirc_matrix
1
0
Fork 0
mirror of https://github.com/luk3yx/miniirc_matrix.git synced 2026-05-17 05:25:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad idea

Browse Source
This commit is contained in:
luk3yx
2024-10-05 23:11:19 +13:00
parent 5c8f1fd25a
commit 75605dcc59
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -74,8 +74,9 @@ To expose this to the public, you must use a reverse proxy, and should set up
caching and some kind of rate limiting to prevent abuse. You can set the caching and some kind of rate limiting to prevent abuse. You can set the
`media_proxy_url` keyword argument to the public proxy URL. `media_proxy_url` keyword argument to the public proxy URL.
A HMAC is created based on the API token and URL to prevent using the proxy to A HMAC is created based on a random key and URL to prevent using the proxy to
fetch arbitrary attachment URLs. fetch arbitrary attachment URLs. To make this value consistent across restarts,
pass a bytes value to the `media_proxy_key` keyword argument.
## Installation ## Installation

16
miniirc_matrix.py
View File

@@ -9,11 +9,11 @@ from collections.abc import Callable
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
from typing import Any, Optional, TypeVar, overload from typing import Any, Optional, TypeVar, overload
from urllib.parse import quote as _url_quote, urlparse as _urlparse from urllib.parse import quote as _url_quote, urlparse as _urlparse
import functools, hmac, html.parser, itertools, json, math, re, time, uuid import functools, hmac, html.parser, itertools, json, math, os, re, time, uuid
import miniirc, requests, threading, traceback # type: ignore import miniirc, requests, threading, traceback # type: ignore
ver = (0, 0, 12) ver = (0, 0, 13)
__version__ = '.'.join(map(str, ver)) __version__ = '.'.join(map(str, ver))
@@ -440,6 +440,7 @@ class Matrix(miniirc.IRC):
token: Optional[str] = None, token: Optional[str] = None,
media_proxy_port: Optional[int] = None, media_proxy_port: Optional[int] = None,
media_proxy_url: Optional[str] = None, media_proxy_url: Optional[str] = None,
media_proxy_key: Optional[bytes] = None,
**kwargs **kwargs
) -> None: ) -> None:
# Cache _get_room_url # Cache _get_room_url
@@ -463,9 +464,11 @@ class Matrix(miniirc.IRC):
self._media_proxy: Optional[ThreadingHTTPServer] = None self._media_proxy: Optional[ThreadingHTTPServer] = None
self._media_proxy_port = media_proxy_port self._media_proxy_port = media_proxy_port
if media_proxy_port and not media_proxy_port: if media_proxy_port and not media_proxy_url:
media_proxy_url = f'http://127.0.0.1:{media_proxy_port}' media_proxy_url = f'http://127.0.0.1:{media_proxy_port}'
self._media_proxy_url = media_proxy_url and media_proxy_url.rstrip('/') self._media_proxy_url = media_proxy_url and media_proxy_url.rstrip('/')
if media_proxy_port is not None:
self._media_proxy_key = media_proxy_key or os.urandom(32)
# Stop miniirc from trying to access the (non-existent) socket # Stop miniirc from trying to access the (non-existent) socket
kwargs['ping_interval'] = kwargs['ping_timeout'] = None kwargs['ping_interval'] = kwargs['ping_timeout'] = None
@@ -541,11 +544,8 @@ class Matrix(miniirc.IRC):
return f'rooms/{_url_quote(room_id)}' return f'rooms/{_url_quote(room_id)}'
def __make_url_digest(self, path: str) -> str: def __make_url_digest(self, path: str) -> str:
return hmac.digest( return hmac.digest(self._media_proxy_key, path.encode('ascii'),
b'miniirc_matrix hmac v1 ' + self.token.encode('ascii'), 'sha256').hex()
path.encode('ascii'),
'sha256'
).hex()
def _download_media(self, url: str) -> requests.Response: def _download_media(self, url: str) -> requests.Response:
url_base, _, key = url.partition('?key=') url_base, _, key = url.partition('?key=')

2
setup.py
View File

@@ -5,7 +5,7 @@ from setuptools import setup
setup( setup(
name='miniirc_matrix', name='miniirc_matrix',
version='0.0.12', version='0.0.13',
py_modules=['miniirc_matrix'], py_modules=['miniirc_matrix'],
author='luk3yx', author='luk3yx',
description='A Matrix wrapper for miniirc.', description='A Matrix wrapper for miniirc.',