feat: run DTF stack with Cloudflare R2

local/app.py

@@ -14,16 +14,21 @@ from starlette.middleware.trustedhost import TrustedHostMiddleware
 from psycopg.types.json import Jsonb
 
 from . import db
-from .adapters import FakeFreight, FakePayment, LocalS3Storage, require_local
+from .adapters import FakeFreight, FakePayment, LocalS3Storage, require_runtime
 from .models import Freight, Move, Pay, QuoteRequest, Review, UploadStart, OperatorLogin
 from .pricing import price
 from .auth import owner, session_row, new_session, operator, throttle, audit, rate_limit
 from .scanning import require_clean
 
-require_local()
+require_runtime()
 storage = LocalS3Storage()
 payment = FakePayment()
 freight = FakeFreight()
+ENVIRONMENT = os.environ.get('APP_ENV', 'local')
+PUBLIC_ORIGIN = os.environ.get('PUBLIC_ORIGIN', 'http://localhost')
+ALLOWED_HOSTS = [host for host in os.environ.get('ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',') if host]
+ALLOWED_ORIGINS = [origin for origin in os.environ.get('ALLOWED_ORIGINS', PUBLIC_ORIGIN).split(',') if origin]
+COOKIE_SECURE = os.environ.get('COOKIE_SECURE', 'false').lower() == 'true'
 PART_BYTES = int(os.environ.get('UPLOAD_PART_BYTES', '8388608'))
 if not 5242880 <= PART_BYTES <= 67108864:
     raise RuntimeError('UPLOAD_PART_BYTES must be between 5 and 64 MiB')
@@ -39,8 +44,8 @@ async def lifespan(app):
     storage.health()
     yield
 
-app = FastAPI(title='DTF Local Portal/API', lifespan=lifespan, docs_url=None, redoc_url=None)
-app.add_middleware(TrustedHostMiddleware, allowed_hosts=['localhost', '127.0.0.1'])
+app = FastAPI(title='DTF Portal/API', lifespan=lifespan, docs_url=None, redoc_url=None)
+app.add_middleware(TrustedHostMiddleware, allowed_hosts=ALLOWED_HOSTS)
 
 @app.post('/api/operator/login')
 def operator_login(body: OperatorLogin, request: Request, response: Response):
@@ -49,14 +54,15 @@ def operator_login(body: OperatorLogin, request: Request, response: Response):
     valid_password = secrets.compare_digest(body.password.encode(), os.environ['OPERATOR_PASSWORD'].encode())
     if not (valid_user and valid_password):
         audit('operator_login_failed')
-        raise HTTPException(401, 'Invalid local operator login')
+        raise HTTPException(401, 'Invalid operator login')
     token = secrets.token_urlsafe(32)
     with db.connect() as c:
         previous = hashlib.sha256(request.cookies.get('dtf_operator','').encode()).hexdigest()
         c.execute('DELETE FROM dtf_local.operator_sessions WHERE token_hash=%s', (previous,))
         c.execute('INSERT INTO dtf_local.operator_sessions(token_hash,username) VALUES(%s,%s)',
                   (hashlib.sha256(token.encode()).hexdigest(), body.username))
-    response.set_cookie('dtf_operator', token, httponly=True, samesite='strict', path='/api/operator', max_age=28800)
+    response.set_cookie('dtf_operator', token, httponly=True, secure=COOKIE_SECURE,
+                        samesite='strict', path='/api/operator', max_age=28800)
     audit('operator_login_success', operator=body.username)
     return {'ok': True}
 
@@ -65,7 +71,8 @@ def operator_logout(request: Request, response: Response):
     with db.connect() as c:
         digest = hashlib.sha256(request.cookies.get('dtf_operator','').encode()).hexdigest()
         c.execute('DELETE FROM dtf_local.operator_sessions WHERE token_hash=%s', (digest,))
-    response.delete_cookie('dtf_operator', path='/api/operator', httponly=True, samesite='strict')
+    response.delete_cookie('dtf_operator', path='/api/operator', httponly=True,
+                           secure=COOKIE_SECURE, samesite='strict')
     audit('operator_logout')
     return {'ok': True}
 
@@ -73,7 +80,7 @@ def operator_logout(request: Request, response: Response):
 async def safe_headers(request, call_next):
     if request.method not in ('GET','HEAD','OPTIONS'):
         origin = request.headers.get('origin')
-        if request.headers.get('sec-fetch-site') == 'cross-site' or (origin and origin != 'http://'+request.headers.get('host','')):
+        if request.headers.get('sec-fetch-site') == 'cross-site' or (origin and origin not in ALLOWED_ORIGINS):
             audit('cross_origin_rejected')
             return JSONResponse({'detail':'Cross-origin request rejected'}, status_code=403)
     response = await call_next(request)
@@ -93,17 +100,18 @@ def health():
         storage.health()
     except Exception:
         raise HTTPException(503, 'Database or storage unavailable')
-    return {'status': 'ok', 'environment': 'local', 'storage': 'minio', 'integrations': 'fake'}
+    return {'status': 'ok', 'environment': ENVIRONMENT,
+            'storage': 'minio' if ENVIRONMENT == 'local' else 'r2', 'integrations': 'fake'}
 
 @app.get('/api/session')
 def session(request: Request, response: Response):
     try:
         session_id = owner(request)
     except HTTPException:
-        rate_limit('guest-sessions', 'local-stack', 120, 900)
+        rate_limit('guest-sessions', ENVIRONMENT, 120, 900)
         with db.connect() as c:
             session_id = new_session(c, response)
-    return {'environment': 'local', 'cart_scope': str(session_id), 'part_bytes': PART_BYTES,
+    return {'environment': ENVIRONMENT, 'cart_scope': str(session_id), 'part_bytes': PART_BYTES,
             'max_upload_bytes': int(os.environ.get('MAX_UPLOAD_BYTES', '5368709120'))}
 
 @app.post('/api/freight')
@@ -126,7 +134,7 @@ def upload_row(c, upload_id, session_id, lock=False):
 @app.post('/api/uploads')
 def begin_upload(body: UploadStart, session_id=Depends(owner)):
     if body.size > int(os.environ.get('MAX_UPLOAD_BYTES', '5368709120')):
-        raise HTTPException(413, 'File exceeds the local upload limit')
+        raise HTTPException(413, 'File exceeds the upload limit')
     uid = uuid4()
     key = f'originals/{uid}'
     rate_limit('upload-start', str(session_id), 60, 900)
@@ -234,6 +242,8 @@ def enqueue(c, event_key, provider, payload):
 
 @app.post('/api/orders/dev-paid')
 def dev_paid(body: Pay, session_id=Depends(owner)):
+    if ENVIRONMENT != 'local':
+        raise HTTPException(503, 'Checkout is not configured yet')
     with db.connect() as c:
         row = c.execute('SELECT * FROM dtf_local.quotes WHERE id=%s AND owner=%s FOR UPDATE', (body.quote_id,session_id)).fetchone()
         if not row: