Logger and docker-compose.yml update
This commit is contained in:
+1
-8
@@ -105,14 +105,7 @@ async def on_startup_configured(dispatcher: Dispatcher):
|
|||||||
telegram_webhook_url_to_set = getattr(settings,
|
telegram_webhook_url_to_set = getattr(settings,
|
||||||
'TELEGRAM_WEBHOOK_BASE_URL', None)
|
'TELEGRAM_WEBHOOK_BASE_URL', None)
|
||||||
if telegram_webhook_url_to_set:
|
if telegram_webhook_url_to_set:
|
||||||
if settings.BOT_TOKEN in telegram_webhook_url_to_set:
|
full_telegram_webhook_url = f"{str(telegram_webhook_url_to_set).rstrip('/')}/{settings.BOT_TOKEN}"
|
||||||
logging.error(
|
|
||||||
f"CRITICAL SECURITY RISK: Bot token detected in TELEGRAM_WEBHOOK_BASE_URL ('{telegram_webhook_url_to_set}'). "
|
|
||||||
"This is a major security vulnerability. Webhook will NOT be set."
|
|
||||||
)
|
|
||||||
full_telegram_webhook_url = "ERROR_URL_TOKEN_DETECTED"
|
|
||||||
else:
|
|
||||||
full_telegram_webhook_url = f"{str(telegram_webhook_url_to_set).rstrip('/')}/{settings.BOT_TOKEN}"
|
|
||||||
|
|
||||||
logging.info(
|
logging.info(
|
||||||
f"STARTUP: Attempting to set Telegram webhook to: {full_telegram_webhook_url if full_telegram_webhook_url != 'ERROR_URL_TOKEN_DETECTED' else 'HIDDEN DUE TO TOKEN'}"
|
f"STARTUP: Attempting to set Telegram webhook to: {full_telegram_webhook_url if full_telegram_webhook_url != 'ERROR_URL_TOKEN_DETECTED' else 'HIDDEN DUE TO TOKEN'}"
|
||||||
|
|||||||
+2
-1
@@ -12,9 +12,10 @@ services:
|
|||||||
- ./locales:/app/locales
|
- ./locales:/app/locales
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
postgres:
|
remnawave-tg-shop-db:
|
||||||
image: postgres:17
|
image: postgres:17
|
||||||
container_name: remnawave-tg-shop-db
|
container_name: remnawave-tg-shop-db
|
||||||
|
hostname: remnawave-tg-shop-db
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
Reference in New Issue
Block a user