vbatts/maubot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix uploading and downloading avatars

Browse source
This commit is contained in:
Tulir Asokan 2018-12-08 13:07:12 +02:00
parent 4f723b24da
commit 4f7eef6029
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maubot/management/api/__init__.py
View file

@ -32,7 +32,7 @@ from .log import stop_all as stop_log_sockets, init as init_log_listener
def init(cfg: Config, loop: AbstractEventLoop) -> web.Application: def init(cfg: Config, loop: AbstractEventLoop) -> web.Application:
set_config(cfg) set_config(cfg)
set_loop(loop) set_loop(loop)
app = web.Application(loop=loop, middlewares=[auth, error]) app = web.Application(loop=loop, middlewares=[auth, error], client_max_size=100*1024*1024)
app.add_routes(routes) app.add_routes(routes)
return app return app

9
maubot/management/api/client_proxy.py
View file

@ -14,7 +14,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from aiohttp import web, client as http from aiohttp import web, client as http
from ...client import Client from ...client import Client
from .base import routes from .base import routes
from .responses import resp from .responses import resp
@ -44,15 +43,11 @@ async def proxy(request: web.Request) -> web.StreamResponse:
headers["X-Forwarded-For"] = f"{host}:{port}" headers["X-Forwarded-For"] = f"{host}:{port}"
data = await request.read() data = await request.read()
chunked = PROXY_CHUNK_SIZE if not data else None
async with http.request(request.method, f"{client.homeserver}/{path}", headers=headers, async with http.request(request.method, f"{client.homeserver}/{path}", headers=headers,
params=query, chunked=chunked, data=data) as proxy_resp: params=query, data=data) as proxy_resp:
response = web.StreamResponse(status=proxy_resp.status, headers=proxy_resp.headers) response = web.StreamResponse(status=proxy_resp.status, headers=proxy_resp.headers)
await response.prepare(request) await response.prepare(request)
content = proxy_resp.content async for chunk in proxy_resp.content.iter_chunked(PROXY_CHUNK_SIZE):
chunk = await content.read(PROXY_CHUNK_SIZE)
while chunk:
await response.write(chunk) await response.write(chunk)
chunk = await content.read(PROXY_CHUNK_SIZE)
await response.write_eof() await response.write_eof()
return response return response

4
maubot/management/api/middleware.py
View file

@ -23,6 +23,7 @@ from .auth import check_token
from .base import get_config from .base import get_config
Handler = Callable[[web.Request], Awaitable[web.Response]] Handler = Callable[[web.Request], Awaitable[web.Response]]
log = logging.getLogger("maubot.server")
@web.middleware @web.middleware
@ -36,9 +37,6 @@ async def auth(request: web.Request, handler: Handler) -> web.Response:
return await handler(request) return await handler(request)
log = logging.getLogger("maubot.server")
@web.middleware @web.middleware
async def error(request: web.Request, handler: Handler) -> web.Response: async def error(request: web.Request, handler: Handler) -> web.Response:
try: try:

2
maubot/server.py
View file

@ -38,7 +38,7 @@ class MaubotServer:
def __init__(self, config: Config, loop: asyncio.AbstractEventLoop) -> None: def __init__(self, config: Config, loop: asyncio.AbstractEventLoop) -> None:
self.loop = loop or asyncio.get_event_loop() self.loop = loop or asyncio.get_event_loop()
self.app = web.Application(loop=self.loop) self.app = web.Application(loop=self.loop, client_max_size=100*1024*1024)
self.config = config self.config = config
as_path = PathBuilder(config["server.appservice_base_path"]) as_path = PathBuilder(config["server.appservice_base_path"])