Merge remote-tracking branch 'origin/master'

Author: EvieePy

docker-compose.yaml

@@ -2,27 +2,27 @@ version: "3.7"
 
 services:
   api:
-    image: python:3.9.1-buster
-    build: mystbin/rest
+    build: mystbin/backend
     ports:
       - 127.0.0.1:5557:9000/tcp
     volumes:
       - ./mystbin/database/schema.sql:/etc/schema.sql:ro
       - ./config.json:/usr/src/app/config.json:ro
-    container_name: "staging-api"
+    container_name: "mystbin-api"
     networks:
       main:
         ipv4_address: 172.25.0.11
     depends_on:
       - database
 
   database:
-    image: postgres:13-alpine
+    image: postgres:14-alpine
     ports:
       - 127.0.0.1:5558:5432
-    container_name: "staging-database"
+    container_name: "mystbin-database"
     volumes:
       - postgresdata:/var/lib/postgresql/data/pgdata
+      - ./mystbin/database/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
     environment:
       POSTGRES_DB: mystbin
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
@@ -40,7 +40,7 @@ services:
       - ./config.json:/app/config.json:ro
     ports:
       - 127.0.0.1:5559:3000
-    container_name: "staging-frontend"
+    container_name: "mystbin-frontend"
     build: ./mystbin/frontend
     depends_on:
       - api

mystbin/backend/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.9.1-buster
+FROM python:3.9-slim
 
 WORKDIR /usr/src/app
 
 COPY . ./
 RUN pip install --no-cache-dir -U -r requirements.txt
 ENV ISDOCKER=true
 
-CMD ["python", "main.py"]
+CMD ["python", "-m", "uvicorn", "app:app", "--host", "0.0.0.0", "--port", "9000"]

mystbin/backend/main.py

@@ -1,11 +1,12 @@
+from __future__ import annotations
+
 import argparse
 import json
 import os
 import pathlib
 import sys
 from typing import cast
 
-
 import uvicorn
 from uvicorn.supervisors import Multiprocess
 
@@ -26,6 +27,7 @@ def get_config() -> dict[str, dict[str, int | str]]:
 
     return data
 
+
 if __name__ == "__main__":
     cfg = get_config()
     port = cast(int, cfg["site"]["backend_port"])
@@ -35,7 +37,7 @@ def get_config() -> dict[str, dict[str, int | str]]:
     parser.add_argument("--workers", "-w", nargs=1, default=os.cpu_count() or 1)
 
     ns = parser.parse_args(sys.argv[1:])
-    
+
     use_workers: bool = not ns.no_workers
     use_cli: bool = not ns.no_cli
     worker_count: int = ns.workers

mystbin/backend/requirements.txt

@@ -10,8 +10,8 @@ sentry-sdk==1.5.3
 starlette-prometheus==0.9.0
 typing-extensions==4.0.1
 ujson==5.1.0
-uvicorn[standard]==0.17.0
+uvicorn[standard]==0.18.0
 yarl
 aioconsole
 tabulate
-aioredis>2<3
+aioredis>2<3

mystbin/backend/routers/admin.py

@@ -21,8 +21,8 @@
 import datetime
 import pathlib
 import subprocess
-from hmac import HMAC, compare_digest
 from hashlib import sha256
+from hmac import HMAC, compare_digest
 from typing import Dict, Optional, Union
 
 import psutil
@@ -257,14 +257,14 @@ async def release_hook(request: MystbinRequest):
     with open(config) as f:
         config = ujson.load(f)
 
-    SECRET = config['github_secret'].encode()
+    SECRET = config["github_secret"].encode()
 
-    received_sign = request.headers.get('X-Hub-Signature-256').split('sha256=')[-1].strip()
+    received_sign = request.headers.get("X-Hub-Signature-256").split("sha256=")[-1].strip()
     expected_sign = HMAC(key=SECRET, msg=await request.body(), digestmod=sha256).hexdigest()
     if not compare_digest(received_sign, expected_sign):
         return UJSONResponse({"error": "Unauthorized"}, status_code=401)
 
-    command = 'cd /root/MystBin/; git pull;'
+    command = "cd /root/MystBin/; git pull;"
     subprocess.run(command, stdout=subprocess.PIPE, shell=True)
 
     return Response(status_code=200)

mystbin/backend/utils/db.py

@@ -16,6 +16,8 @@
 You should have received a copy of the GNU General Public License
 along with MystBin.  If not, see <https://www.gnu.org/licenses/>.
 """
+from __future__ import annotations
+
 import asyncio
 import datetime
 import difflib
@@ -269,7 +271,7 @@ async def put_paste(
                         resp["id"],
                         page.content,
                         page.filename,
-                        page.content.count("\n") + 1, # add an extra for line 1
+                        page.content.count("\n") + 1,  # add an extra for line 1
                     )
                 )