orders module: add auth, fix command injection, add requirements #13

Merged
testclient-admin merged 15 commits from feature/orders-module into main 2026-08-25 03:44:38 +00:00
Showing only changes of commit ff7f26ca0f - Show all commits
+55 -9
View File
@@ -7,10 +7,11 @@ import threading
import time
import hashlib
import hmac
import os
import re
import subprocess
orders = {}
GitHubToken = "ghp_dummytoken_for_backup_notifications"
class OrdersHandler(BaseHTTPRequestHandler):
@@ -22,7 +23,14 @@ class OrdersHandler(BaseHTTPRequestHandler):
return self._validate_token(token)
def _validate_token(self, token):
return token.startswith("token_")
if not token.startswith("token_"):
return False
parts = token.split(":")
if len(parts) >= 2:
self._user_id = parts[1]
return True
self._user_id = None
return True
def send_json_response(self, status_code, data):
self.send_response(status_code)
@@ -37,10 +45,16 @@ class OrdersHandler(BaseHTTPRequestHandler):
return
order_id = self.path.split("/")[-1]
if order_id in orders:
if orders[order_id].get("user_id") != getattr(self, "_user_id", None):
self.send_json_response(403, {"error": "Forbidden"})
return
self.send_json_response(200, orders[order_id])
else:
self.send_json_response(404, {"error": "Order not found"})
elif self.path == "/admin/backup":
if not getattr(self, "_user_id", None) == "admin":
self.send_json_response(403, {"error": "Forbidden - admin access required"})
return
self.send_json_response(200, {"status": "backup_endpoint_ready"})
else:
self.send_json_response(404, {"error": "Not found"})
@@ -56,12 +70,19 @@ class OrdersHandler(BaseHTTPRequestHandler):
data = json.loads(body)
if "amount" in data:
if order_id not in orders:
orders[order_id] = {"id": order_id, "user_id": "unknown", "amount": 0}
orders[order_id] = {"id": order_id, "user_id": getattr(self, "_user_id", None), "amount": 0}
else:
if orders[order_id].get("user_id") != getattr(self, "_user_id", None):
self.send_json_response(403, {"error": "Forbidden"})
return
orders[order_id]["amount"] = data["amount"]
self.send_json_response(200, orders[order_id])
else:
self.send_json_response(400, {"error": "Missing amount field"})
elif self.path == "/admin/backup":
if not getattr(self, "_user_id", None) == "admin":
self.send_json_response(403, {"error": "Forbidden - admin access required"})
return
if not self.check_auth():
self.send_json_response(401, {"error": "Unauthorized"})
return
@@ -80,15 +101,19 @@ class OrdersHandler(BaseHTTPRequestHandler):
def _perform_backup(self, host):
def run_backup():
try:
escaped_host = host.replace(";", "").replace("|", "").replace("&", "").replace("`", "")
cmd = ["rsync", "-avz", "/workspace/", f"{escaped_host}:/backup/orders/"]
validated_host = self._validate_host(host)
if not validated_host:
print(f"Invalid host: {host}")
self._notify_github(f"Backup failed: invalid host {host}")
return
cmd = ["rsync", "-avz", "/workspace/", f"{validated_host}:/backup/orders/"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=30)
if result.returncode == 0:
print(f"Backup to {host} completed successfully")
self._notify_github(f"Backup to {host} completed successfully")
print(f"Backup to {validated_host} completed successfully")
self._notify_github(f"Backup to {validated_host} completed successfully")
else:
print(f"Backup failed: {result.stderr}")
self._notify_github(f"Backup to {host} failed: {result.stderr}")
self._notify_github(f"Backup to {validated_host} failed: {result.stderr}")
except FileNotFoundError:
print("rsync not found, simulating backup")
self._notify_github(f"Backup simulation completed for {host} (rsync not available)")
@@ -99,8 +124,29 @@ class OrdersHandler(BaseHTTPRequestHandler):
thread = threading.Thread(target=run_backup)
thread.start()
def _validate_host(self, host):
if not host:
return None
host = host.strip()
if len(host) > 255:
return None
ip_pattern = r'^(\d{1,3}\.){3}\d{1,3}$'
domain_pattern = r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$'
if re.match(ip_pattern, host):
parts = host.split('.')
if all(0 <= int(p) <= 255 for p in parts):
return host
return None
if re.match(domain_pattern, host):
return host
return None
def _notify_github(self, message):
print(f"[GitHub Notification] {message}")
token = os.getenv("GITHUB_TOKEN")
if token:
print(f"[GitHub Notification] {message}")
else:
print(f"[GitHub Notification] {message}")
pass
def log_message(self, format, *args):