Finish plugin API and add basic login system
This commit is contained in:
parent
d7f072aeff
commit
14fd0d6ac9
16 changed files with 160 additions and 62 deletions
|
@ -15,25 +15,21 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
from typing import Callable, Awaitable
|
||||
from aiohttp import web
|
||||
import logging
|
||||
|
||||
from .responses import ErrNoToken, ErrInvalidToken
|
||||
from .responses import ErrNoToken, ErrInvalidToken, ErrPathNotFound, ErrMethodNotAllowed
|
||||
from . import is_valid_token
|
||||
|
||||
Handler = Callable[[web.Request], Awaitable[web.Response]]
|
||||
|
||||
req_log = logging.getLogger("maubot.mgmt.request")
|
||||
resp_log = logging.getLogger("maubot.mgmt.response")
|
||||
|
||||
|
||||
@web.middleware
|
||||
async def auth(request: web.Request, handler: Handler) -> web.Response:
|
||||
if request.path.endswith("/login"):
|
||||
return await handler(request)
|
||||
token = request.headers.get("Authorization", "")
|
||||
if not token or not token.startswith("Bearer "):
|
||||
req_log.debug(f"Request missing auth: {request.remote} {request.method} {request.path}")
|
||||
return ErrNoToken
|
||||
if not is_valid_token(token[len("Bearer "):]):
|
||||
req_log.debug(f"Request invalid auth: {request.remote} {request.method} {request.path}")
|
||||
return ErrInvalidToken
|
||||
return await handler(request)
|
||||
|
||||
|
@ -43,6 +39,10 @@ async def error(request: web.Request, handler: Handler) -> web.Response:
|
|||
try:
|
||||
return await handler(request)
|
||||
except web.HTTPException as ex:
|
||||
if ex.status_code == 404:
|
||||
return ErrPathNotFound
|
||||
elif ex.status_code == 405:
|
||||
return ErrMethodNotAllowed
|
||||
return web.json_response({
|
||||
"error": f"Unhandled HTTP {ex.status}",
|
||||
"errcode": f"unhandled_http_{ex.status}",
|
||||
|
@ -56,12 +56,3 @@ def get_req_no():
|
|||
global req_no
|
||||
req_no += 1
|
||||
return req_no
|
||||
|
||||
|
||||
@web.middleware
|
||||
async def log(request: web.Request, handler: Handler) -> web.Response:
|
||||
local_req_no = get_req_no()
|
||||
req_log.info(f"Request {local_req_no}: {request.remote} {request.method} {request.path}")
|
||||
resp = await handler(request)
|
||||
resp_log.info(f"Responded to {local_req_no} from {request.remote}: {resp}")
|
||||
return resp
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue