ticket #75 attempt 1

devplacepy/main.py

@@ -4,12 +4,13 @@ import asyncio
 import fcntl
 import logging
 import os
+import re
 import time
 from collections import defaultdict
 from contextlib import asynccontextmanager, contextmanager
 from pathlib import Path
 from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi.responses import HTMLResponse, RedirectResponse, Response
 from fastapi.staticfiles import StaticFiles
 from fastapi.exceptions import RequestValidationError
 from starlette.middleware.gzip import GZipMiddleware
@@ -611,6 +612,22 @@ async def response_timing(request: Request, call_next):
     return response
 
 
+_KNOWN_CRAWLERS = re.compile(
+    r"(google.*read.*aloud|googlebot|bingbot|slurp|duckduckbot|baiduspider|yandexbot)",
+    re.IGNORECASE,
+)
+_AUTH_GATED_PATHS = frozenset({"/messages", "/notifications", "/game", "/admin"})
+
+
+@app.middleware("http")
+async def crawler_detection(request: Request, call_next):
+    if request.method == "GET" and request.url.path in _AUTH_GATED_PATHS:
+        ua = request.headers.get("user-agent", "")
+        if _KNOWN_CRAWLERS.search(ua):
+            return Response(status_code=204)
+    return await call_next(request)
+
+
 app.add_middleware(GZipMiddleware, minimum_size=512, compresslevel=5)
 
 

devplacepy/routers/seo.py

@@ -17,6 +17,7 @@ async def robots_txt(request: Request):
 Disallow: /auth/
 Disallow: /messages/
 Disallow: /notifications/
+Disallow: /game/
 Disallow: /votes/
 Disallow: /avatar/
 Disallow: /follow/

devplacepy/static/css/devii.css

@@ -115,6 +115,7 @@ devii-terminal.devii-state-fullscreen .devii-window {
 }
 
 devii-terminal.devii-state-normal .devii-window {
+  resize: both;
 }
 devii-terminal.devii-state-normal .devii-titlebar {
   cursor: move;

devplacepy/static/js/DeviiTerminal.js

@@ -86,7 +86,6 @@ export class DeviiTerminal {
     }
 
     _canOpenOnGesture() {
-        if (this.element && this.element.state !== "closed") return false;
         if (document.querySelector(".modal-overlay.visible")) return false;
         if (document.querySelector(".dialog-overlay.visible")) return false;
         if (document.querySelector(".context-menu.visible")) return false;

devplacepy/static/js/components/FloatingWindow.js

@@ -297,8 +297,8 @@ export default class FloatingWindow extends Component {
     if (!this.geometry) return;
     const g = this.geometry;
     const safeHeight = this._safeViewport.height;
-    g.width = Math.max(320, Math.min(g.width, window.innerWidth - 16));
+    g.width = Math.min(g.width, window.innerWidth - 16);
-    g.height = Math.max(220, Math.min(g.height, safeHeight - 16));
+    g.height = Math.min(g.height, safeHeight - 16);
     g.left = Math.max(8, Math.min(g.left, window.innerWidth - g.width - 8));
     g.top = Math.max(8, Math.min(g.top, safeHeight - g.height - 8));
   }
@@ -409,8 +409,8 @@ export default class FloatingWindow extends Component {
     this._ro = new ResizeObserver(() => {
       if (this.state === "normal" && this.geometry && !this._drag) {
         const rect = this.win.getBoundingClientRect();
-        this.geometry.width = Math.max(320, Math.round(rect.width));
+        this.geometry.width = Math.round(rect.width);
-        this.geometry.height = Math.max(220, Math.round(rect.height));
+        this.geometry.height = Math.round(rect.height);
         this._persistGeometry();
       }
       this._syncControls();

tests/api/robotstxt.py

@@ -196,7 +196,8 @@ def test_robots_txt_exists(app_server):
     assert "Sitemap:" in r.text
 
 
-def test_robots_disallows_admin_and_uploads(app_server):
+def test_robots_disallows_auth_gated_paths(app_server):
     r = requests.get(f"{BASE_URL}/robots.txt")
-    assert "Disallow: /admin/" in r.text
+    required = ["/auth/", "/game/", "/messages/", "/notifications/", "/admin/", "/uploads/"]
-    assert "Disallow: /uploads/" in r.text
+    for path in required:
+        assert f"Disallow: {path}" in r.text, f"Missing Disallow: {path}"

tests/api/test_crawler_middleware.py

@@ -0,0 +1,50 @@
+# retoor <retoor@molodetz.nl>
+
+import requests
+from tests.conftest import BASE_URL
+
+
+def test_bot_blocked_on_auth_path(app_server):
+    headers = {"User-Agent": "Google-Read-Aloud"}
+    r = requests.get(f"{BASE_URL}/messages", headers=headers)
+    assert r.status_code == 204
+    assert r.content == b""
+
+
+def test_bot_blocked_on_game_path(app_server):
+    headers = {"User-Agent": "Google-Read-Aloud"}
+    r = requests.get(f"{BASE_URL}/game", headers=headers)
+    assert r.status_code == 204
+    assert r.content == b""
+
+
+def test_bot_blocked_on_admin_path(app_server):
+    headers = {"User-Agent": "Google-Read-Aloud"}
+    r = requests.get(f"{BASE_URL}/admin", headers=headers)
+    assert r.status_code == 204
+    assert r.content == b""
+
+
+def test_bot_not_blocked_on_public_path(app_server):
+    headers = {"User-Agent": "Google-Read-Aloud"}
+    r = requests.get(f"{BASE_URL}/", headers=headers)
+    assert r.status_code == 200
+
+
+def test_normal_user_not_blocked(app_server):
+    r = requests.get(f"{BASE_URL}/messages", allow_redirects=False)
+    assert r.status_code == 303
+
+
+def test_known_crawler_user_agent_variants(app_server):
+    ua_list = [
+        "Googlebot",
+        "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)",
+        "bingbot/2.0; +http://www.bing.com/bingbot.htm",
+        "Mozilla/5.0 (compatible; DuckDuckBot-Https/1.1; ...)",
+        "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)",
+    ]
+    for ua in ua_list:
+        headers = {"User-Agent": ua}
+        r = requests.get(f"{BASE_URL}/admin", headers=headers)
+        assert r.status_code == 204, f"Expected 204 for UA: {ua}"