webmaster/maubot
1
0
Fork 0
mirror of https://github.com/maubot/maubot synced 2025-09-05 02:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make management UI aware of URL subpaths in config

Browse source 
Signed-off-by: Antoine Mazeas <antoine@karthanis.net>
This commit is contained in:
Antoine Mazeas 2020-01-07 19:04:40 +01:00
parent 8a711e0c8e
commit 3c7b4fc09c
3 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
maubot/server.py
View file

@ -16,6 +16,8 @@
from typing import Tuple, Dict
import logging
import asyncio
import json
from urllib.parse import urlparse
from aiohttp import web, hdrs
from aiohttp.abc import AbstractAccessLogger
@ -63,7 +65,8 @@ class MaubotServer:
def get_instance_subapp(self, instance_id: str) -> Tuple[PluginWebApp, str]:
subpath = self.config["server.plugin_base_path"] + instance_id
url = self.config["server.public_url"] + subpath
path_prefix = self.config["server.public_url_path_prefix"].rstrip("/")
url = self.config["server.public_url"] + path_prefix + subpath
try:
return self.plugin_routes[subpath], url
except KeyError:
@ -129,6 +132,22 @@ class MaubotServer:
self.app.router.add_get(f"{ui_base}/{file}", lambda _: web.Response(body=data,
content_type=mime))
# also set up a resource path for the public url path prefix config
# cut the prefix path from public_url
public_url = self.config["server.public_url"]
base_path = self.config["server.base_path"]
public_url_path = ""
if public_url != "":
url_parts = urlparse(public_url)
public_url_path = url_parts.path.rstrip("/")
# assemble with base_path
api_path = f"{public_url_path}{base_path}"
path_prefix_response_body = json.dumps({"api_path": api_path.rstrip("/")})
self.app.router.add_get(f"{ui_base}/paths.json", lambda _: web.Response(body=path_prefix_response_body,
content_type="application/json"))
def add_route(self, method: Method, path: PathBuilder, handler) -> None:
self.app.router.add_route(method.value, str(path), handler)