Nikolay Tatarinov
d5da265b5f
All checks were successful
CI / lint-and-test (push) Successful in 24s
- Introduced a new utility function `safe_urlopen` to ensure only allowed URL schemes (http, https) are opened, enhancing security against path traversal vulnerabilities. - Updated the `run.py` and `calendar_ics.py` files to utilize `safe_urlopen` for HTTP requests, improving error handling and security. - Added `HTTP_HOST` configuration to the settings, allowing dynamic binding of the HTTP server host. - Revised the `.env.example` file to include the new `HTTP_HOST` variable with a description. - Enhanced tests for `safe_urlopen` to validate behavior with disallowed URL schemes and ensure proper integration in existing functionality.
91 lines
2.7 KiB
Python
91 lines
2.7 KiB
Python
"""Application entry point: build bot Application, run HTTP server + polling."""
|
|
|
|
import asyncio
|
|
import json
|
|
import logging
|
|
import threading
|
|
import urllib.request
|
|
|
|
from telegram.ext import ApplicationBuilder
|
|
|
|
from duty_teller import config
|
|
from duty_teller.config import require_bot_token
|
|
from duty_teller.handlers import group_duty_pin, register_handlers
|
|
from duty_teller.utils.http_client import safe_urlopen
|
|
|
|
logging.basicConfig(
|
|
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
|
|
level=logging.INFO,
|
|
)
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _set_default_menu_button_webapp() -> None:
|
|
if not (config.MINI_APP_BASE_URL and config.BOT_TOKEN):
|
|
return
|
|
menu_url = (config.MINI_APP_BASE_URL.rstrip("/") + "/app/").strip()
|
|
if not menu_url.startswith("https://"):
|
|
return
|
|
payload = {
|
|
"menu_button": {
|
|
"type": "web_app",
|
|
"text": "Calendar",
|
|
"web_app": {"url": menu_url},
|
|
}
|
|
}
|
|
req = urllib.request.Request(
|
|
f"https://api.telegram.org/bot{config.BOT_TOKEN}/setChatMenuButton",
|
|
data=json.dumps(payload).encode(),
|
|
headers={"Content-Type": "application/json"},
|
|
method="POST",
|
|
)
|
|
try:
|
|
with safe_urlopen(req, timeout=10) as resp:
|
|
if resp.status == 200:
|
|
logger.info("Default menu button set to Web App: %s", menu_url)
|
|
else:
|
|
logger.warning("setChatMenuButton returned %s", resp.status)
|
|
except Exception as e:
|
|
logger.warning("Could not set menu button: %s", e)
|
|
|
|
|
|
def _run_uvicorn(web_app, port: int) -> None:
|
|
import uvicorn
|
|
|
|
loop = asyncio.new_event_loop()
|
|
asyncio.set_event_loop(loop)
|
|
server = uvicorn.Server(
|
|
uvicorn.Config(web_app, host=config.HTTP_HOST, port=port, log_level="info"),
|
|
)
|
|
loop.run_until_complete(server.serve())
|
|
|
|
|
|
def main() -> None:
|
|
"""Build the bot and FastAPI, start uvicorn in a thread, run polling."""
|
|
require_bot_token()
|
|
# Optional: set bot menu button to open the Miniapp. Uncomment to enable:
|
|
# _set_default_menu_button_webapp()
|
|
app = (
|
|
ApplicationBuilder()
|
|
.token(config.BOT_TOKEN)
|
|
.post_init(group_duty_pin.restore_group_pin_jobs)
|
|
.build()
|
|
)
|
|
register_handlers(app)
|
|
|
|
from duty_teller.api.app import app as web_app
|
|
|
|
t = threading.Thread(
|
|
target=_run_uvicorn,
|
|
args=(web_app, config.HTTP_PORT),
|
|
daemon=True,
|
|
)
|
|
t.start()
|
|
|
|
if config.MINI_APP_SKIP_AUTH:
|
|
logger.warning(
|
|
"MINI_APP_SKIP_AUTH is set — API auth disabled (insecure); use only for dev"
|
|
)
|
|
logger.info("Bot starting (polling)... HTTP API on port %s", config.HTTP_PORT)
|
|
app.run_polling(allowed_updates=["message", "my_chat_member"])
|