Blacken and isort code
This commit is contained in:
Tulir Asokan
@@ -1,5 +1,5 @@
|
||||
# mautrix-telegram - A Matrix-Telegram puppeting bridge
|
||||
# Copyright (C) 2019 Tulir Asokan
|
||||
# Copyright (C) 2021 Tulir Asokan
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
@@ -13,22 +13,23 @@
|
||||
#
|
||||
# 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/>.
|
||||
from typing import Optional
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import random
|
||||
import string
|
||||
import time
|
||||
|
||||
from mako.template import Template
|
||||
from aiohttp import web
|
||||
from mako.template import Template
|
||||
import pkg_resources
|
||||
|
||||
from mautrix.types import UserID
|
||||
from mautrix.util.signed_token import sign_token, verify_token
|
||||
|
||||
from ...user import User
|
||||
from ...puppet import Puppet
|
||||
from ...user import User
|
||||
from ..common import AuthAPI
|
||||
|
||||
|
||||
@@ -43,31 +44,38 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
super().__init__(loop)
|
||||
self.secret_key = "".join(random.choices(string.ascii_lowercase + string.digits, k=64))
|
||||
|
||||
self.login = Template(pkg_resources.resource_string(
|
||||
"mautrix_telegram", "web/public/login.html.mako"))
|
||||
self.login = Template(
|
||||
pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako")
|
||||
)
|
||||
|
||||
self.mx_login = Template(pkg_resources.resource_string(
|
||||
"mautrix_telegram", "web/public/matrix-login.html.mako"))
|
||||
self.mx_login = Template(
|
||||
pkg_resources.resource_string("mautrix_telegram", "web/public/matrix-login.html.mako")
|
||||
)
|
||||
|
||||
self.app = web.Application(loop=loop)
|
||||
self.app.router.add_route("GET", "/login", self.get_login)
|
||||
self.app.router.add_route("POST", "/login", self.post_login)
|
||||
self.app.router.add_route("GET", "/matrix-login", self.get_matrix_login)
|
||||
self.app.router.add_route("POST", "/matrix-login", self.post_matrix_login)
|
||||
self.app.router.add_static("/", pkg_resources.resource_filename("mautrix_telegram",
|
||||
"web/public/"))
|
||||
self.app.router.add_static(
|
||||
"/", pkg_resources.resource_filename("mautrix_telegram", "web/public/")
|
||||
)
|
||||
|
||||
def make_token(self, mxid: str, endpoint: str = "/login", expires_in: int = 900) -> str:
|
||||
return sign_token(self.secret_key, {
|
||||
"mxid": mxid,
|
||||
"endpoint": endpoint,
|
||||
"expiry": int(time.time()) + expires_in,
|
||||
})
|
||||
return sign_token(
|
||||
self.secret_key,
|
||||
{
|
||||
"mxid": mxid,
|
||||
"endpoint": endpoint,
|
||||
"expiry": int(time.time()) + expires_in,
|
||||
},
|
||||
)
|
||||
|
||||
def verify_token(self, token: str, endpoint: str = "/login") -> Optional[UserID]:
|
||||
def verify_token(self, token: str, endpoint: str = "/login") -> UserID | None:
|
||||
token = verify_token(self.secret_key, token)
|
||||
if token and (token.get("expiry", 0) > int(time.time()) and
|
||||
token.get("endpoint", None) == endpoint):
|
||||
if token and (
|
||||
token.get("expiry", 0) > int(time.time()) and token.get("endpoint", None) == endpoint
|
||||
):
|
||||
return UserID(token.get("mxid", None))
|
||||
return None
|
||||
|
||||
@@ -82,8 +90,9 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
if not user:
|
||||
return self.get_login_response(mxid=mxid, state=state)
|
||||
elif not user.puppet_whitelisted:
|
||||
return self.get_login_response(mxid=user.mxid, error="You are not whitelisted.",
|
||||
status=403)
|
||||
return self.get_login_response(
|
||||
mxid=user.mxid, error="You are not whitelisted.", status=403
|
||||
)
|
||||
await user.ensure_started()
|
||||
if not await user.is_logged_in():
|
||||
return self.get_login_response(mxid=user.mxid, state=state)
|
||||
@@ -91,8 +100,9 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
return self.get_login_response(mxid=user.mxid, human_tg_id=user.human_tg_id)
|
||||
|
||||
async def get_matrix_login(self, request: web.Request) -> web.Response:
|
||||
mxid = self.verify_token(request.rel_url.query.get("token", None),
|
||||
endpoint="/matrix-login")
|
||||
mxid = self.verify_token(
|
||||
request.rel_url.query.get("token", None), endpoint="/matrix-login"
|
||||
)
|
||||
if not mxid:
|
||||
return self.get_mx_login_response(status=401, state="invalid-token")
|
||||
user = await User.get_by_mxid(mxid, create=False) if mxid else None
|
||||
@@ -100,12 +110,14 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
if not user:
|
||||
return self.get_mx_login_response(mxid=mxid)
|
||||
elif not user.puppet_whitelisted:
|
||||
return self.get_mx_login_response(mxid=user.mxid, error="You are not whitelisted.",
|
||||
status=403)
|
||||
return self.get_mx_login_response(
|
||||
mxid=user.mxid, error="You are not whitelisted.", status=403
|
||||
)
|
||||
await user.ensure_started()
|
||||
if not await user.is_logged_in():
|
||||
return self.get_mx_login_response(mxid=user.mxid, status=403,
|
||||
error="You are not logged in to Telegram.")
|
||||
return self.get_mx_login_response(
|
||||
mxid=user.mxid, status=403, error="You are not logged in to Telegram."
|
||||
)
|
||||
|
||||
puppet = await Puppet.get_by_tgid(user.tgid)
|
||||
if puppet.is_real_user:
|
||||
@@ -113,24 +125,50 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
|
||||
return self.get_mx_login_response(mxid=user.mxid)
|
||||
|
||||
def get_login_response(self, status: int = 200, state: str = "", username: str = "",
|
||||
phone: str = "", human_tg_id: str = "", mxid: str = "",
|
||||
message: str = "", error: str = "", errcode: str = "") -> web.Response:
|
||||
return web.Response(status=status, content_type="text/html",
|
||||
text=self.login.render(human_tg_id=human_tg_id, state=state,
|
||||
error=error, message=message, mxid=mxid))
|
||||
def get_login_response(
|
||||
self,
|
||||
status: int = 200,
|
||||
state: str = "",
|
||||
username: str = "",
|
||||
phone: str = "",
|
||||
human_tg_id: str = "",
|
||||
mxid: str = "",
|
||||
message: str = "",
|
||||
error: str = "",
|
||||
errcode: str = "",
|
||||
) -> web.Response:
|
||||
return web.Response(
|
||||
status=status,
|
||||
content_type="text/html",
|
||||
text=self.login.render(
|
||||
human_tg_id=human_tg_id, state=state, error=error, message=message, mxid=mxid
|
||||
),
|
||||
)
|
||||
|
||||
def get_mx_login_response(self, status: int = 200, state: str = "", username: str = "",
|
||||
phone: str = "", human_tg_id: str = "", mxid: str = "",
|
||||
message: str = "", error: str = "", errcode: str = ""
|
||||
) -> web.Response:
|
||||
return web.Response(status=status, content_type="text/html",
|
||||
text=self.mx_login.render(human_tg_id=human_tg_id, state=state,
|
||||
error=error, message=message, mxid=mxid))
|
||||
def get_mx_login_response(
|
||||
self,
|
||||
status: int = 200,
|
||||
state: str = "",
|
||||
username: str = "",
|
||||
phone: str = "",
|
||||
human_tg_id: str = "",
|
||||
mxid: str = "",
|
||||
message: str = "",
|
||||
error: str = "",
|
||||
errcode: str = "",
|
||||
) -> web.Response:
|
||||
return web.Response(
|
||||
status=status,
|
||||
content_type="text/html",
|
||||
text=self.mx_login.render(
|
||||
human_tg_id=human_tg_id, state=state, error=error, message=message, mxid=mxid
|
||||
),
|
||||
)
|
||||
|
||||
async def post_matrix_login(self, request: web.Request) -> web.Response:
|
||||
mxid = self.verify_token(request.rel_url.query.get("token", None),
|
||||
endpoint="/matrix-login")
|
||||
mxid = self.verify_token(
|
||||
request.rel_url.query.get("token", None), endpoint="/matrix-login"
|
||||
)
|
||||
if not mxid:
|
||||
return self.get_mx_login_response(status=401, state="invalid-token")
|
||||
|
||||
@@ -138,19 +176,21 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
|
||||
user = await User.get_and_start_by_mxid(mxid)
|
||||
if not user.puppet_whitelisted:
|
||||
return self.get_mx_login_response(mxid=user.mxid, error="You are not whitelisted.",
|
||||
status=403)
|
||||
return self.get_mx_login_response(
|
||||
mxid=user.mxid, error="You are not whitelisted.", status=403
|
||||
)
|
||||
elif not await user.is_logged_in():
|
||||
return self.get_mx_login_response(mxid=user.mxid, status=403,
|
||||
error="You are not logged in to Telegram.")
|
||||
return self.get_mx_login_response(
|
||||
mxid=user.mxid, status=403, error="You are not logged in to Telegram."
|
||||
)
|
||||
mode = data.get("mode", "access_token")
|
||||
if mode == "password":
|
||||
return await self.post_matrix_password(user, data["value"])
|
||||
elif mode == "access_token":
|
||||
return await self.post_matrix_token(user, data["value"])
|
||||
return self.get_mx_login_response(mxid=user.mxid, status=400,
|
||||
error="You must provide an access token or "
|
||||
"password.")
|
||||
return self.get_mx_login_response(
|
||||
mxid=user.mxid, status=400, error="You must provide an access token or password."
|
||||
)
|
||||
|
||||
async def post_login(self, request: web.Request) -> web.Response:
|
||||
mxid = self.verify_token(request.rel_url.query.get("token", None), endpoint="/login")
|
||||
@@ -159,10 +199,11 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
|
||||
data = await request.post()
|
||||
|
||||
user = await User.get_by_mxid(mxid).ensure_started(even_if_no_session=True)
|
||||
user = await User.get_and_start_by_mxid(mxid, even_if_no_session=True)
|
||||
if not user.puppet_whitelisted:
|
||||
return self.get_login_response(mxid=user.mxid, error="You are not whitelisted.",
|
||||
status=403)
|
||||
return self.get_login_response(
|
||||
mxid=user.mxid, error="You are not whitelisted.", status=403
|
||||
)
|
||||
elif await user.is_logged_in():
|
||||
return self.get_login_response(mxid=user.mxid, human_tg_id=user.human_tg_id)
|
||||
|
||||
@@ -176,11 +217,14 @@ class PublicBridgeWebsite(AuthAPI):
|
||||
try:
|
||||
code = int(data["code"].strip())
|
||||
except ValueError:
|
||||
return self.get_login_response(mxid=user.mxid, state="code", status=400,
|
||||
errcode="phone_code_invalid",
|
||||
error="Phone code must be a number.")
|
||||
resp = await self.post_login_code(user, code,
|
||||
password_in_data="password" in data)
|
||||
return self.get_login_response(
|
||||
mxid=user.mxid,
|
||||
state="code",
|
||||
status=400,
|
||||
errcode="phone_code_invalid",
|
||||
error="Phone code must be a number.",
|
||||
)
|
||||
resp = await self.post_login_code(user, code, password_in_data="password" in data)
|
||||
if resp or "password" not in data:
|
||||
return resp
|
||||
elif "password" not in data:
|
||||
|
||||
Reference in New Issue
Block a user